diff options
author | Manuel Juliachs <manuel.juliachs@scilab.org> | 2011-05-05 10:44:11 +0200 |
---|---|---|
committer | Allan CORNET <allan.cornet@scilab.org> | 2011-05-05 11:34:11 +0200 |
commit | 26c6e02a6cd6e996d9a3a43404c585be0b1dd84f (patch) | |
tree | f173a1e6540834bca85724410471697db5dbffe5 | |
parent | 142bf19e7910d7726d3c975f91ec693e417843f0 (diff) | |
download | scilab-26c6e02a6cd6e996d9a3a43404c585be0b1dd84f.zip scilab-26c6e02a6cd6e996d9a3a43404c585be0b1dd84f.tar.gz |
Intel HD graphics drivers version warning removed (bug #7526,
which has been fixed).
Change-Id: I22d021b3d11cd2cc67f9134e26170b8ac0d06b15
-rw-r--r-- | scilab/modules/graphics/etc/graphics.start | 1 | ||||
-rw-r--r-- | scilab/modules/graphics/etc/intel_bug_7526.sce | 52 | ||||
-rw-r--r-- | scilab/modules/graphics/graphics.iss | 1 |
3 files changed, 0 insertions, 54 deletions
diff --git a/scilab/modules/graphics/etc/graphics.start b/scilab/modules/graphics/etc/graphics.start index 0bdb687..eb7a621 100644 --- a/scilab/modules/graphics/etc/graphics.start +++ b/scilab/modules/graphics/etc/graphics.start | |||
@@ -19,7 +19,6 @@ end | |||
19 | // ============================================================================= | 19 | // ============================================================================= |
20 | if getos() == "Windows" then | 20 | if getos() == "Windows" then |
21 | exec(SCI+"/modules/graphics/etc/nvidia_bug_7575.sce", -1); | 21 | exec(SCI+"/modules/graphics/etc/nvidia_bug_7575.sce", -1); |
22 | exec(SCI+"/modules/graphics/etc/intel_bug_7526.sce", -1); | ||
23 | end | 22 | end |
24 | 23 | ||
25 | // Add demo | 24 | // Add demo |
diff --git a/scilab/modules/graphics/etc/intel_bug_7526.sce b/scilab/modules/graphics/etc/intel_bug_7526.sce deleted file mode 100644 index 01e6085..0000000 --- a/scilab/modules/graphics/etc/intel_bug_7526.sce +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | ||
2 | // Copyright (C) 2011 - DIGITEO - Allan CORNET | ||
3 | // | ||
4 | // This file must be used under the terms of the CeCILL. | ||
5 | // This source file is licensed as described in the file COPYING, which | ||
6 | // you should have received as part of this distribution. The terms | ||
7 | // are also available at | ||
8 | // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt | ||
9 | |||
10 | // quick way to detect bug 7526 | ||
11 | |||
12 | function detect_bug_7526() | ||
13 | |||
14 | function WarningDriversIntel() | ||
15 | msg = ["Old Intel(R) HD Graphics drivers detected (bug #7526)."; | ||
16 | "Please update your video drivers:"; | ||
17 | "http://downloadcenter.intel.com/Detail_Desc.aspx?lang=eng&changeLang=true&DwnldId=19758"]; | ||
18 | warning(msg); | ||
19 | endfunction | ||
20 | |||
21 | function bOK = isIntelHD() | ||
22 | bOK = %f; | ||
23 | [dyninfo, statinfo] = getdebuginfo(); | ||
24 | videocard = dyninfo(grep(dyninfo, "Video card:")); | ||
25 | videocard = strsubst(videocard, "Video card:", ""); | ||
26 | bOK = grep(stripblanks(convstr(videocard, "u")), "INTEL(R) HD GRAPHICS") <> []; | ||
27 | endfunction | ||
28 | |||
29 | function bOK = isOldIntelHDDrivers() | ||
30 | |||
31 | bOK = %f; | ||
32 | [dyninfo, statinfo] = getdebuginfo(); | ||
33 | driversvideocard = dyninfo(grep(dyninfo, "Video card driver version:")); | ||
34 | driversvideocard = strsubst(driversvideocard, "Video card driver version:", ""); | ||
35 | ierr = execstr("[nbparams, driverVer1, driverVer2, driverVer3, driverVer4] = msscanf(driversvideocard, ""%d.%d.%d.%d"");", "errcatch"); | ||
36 | if ierr == 0 then | ||
37 | // revision < to 2279 does not work | ||
38 | if driverVer4 < 2279 then | ||
39 | bOK = %t; | ||
40 | end | ||
41 | end | ||
42 | endfunction | ||
43 | |||
44 | if getos() == "Windows" then | ||
45 | if isIntelHD() & isOldIntelHDDrivers() then | ||
46 | WarningDriversIntel(); | ||
47 | end | ||
48 | end | ||
49 | endfunction | ||
50 | |||
51 | detect_bug_7526(); | ||
52 | clear detect_bug_7526; | ||
diff --git a/scilab/modules/graphics/graphics.iss b/scilab/modules/graphics/graphics.iss index 9664dbf..022b3a7 100644 --- a/scilab/modules/graphics/graphics.iss +++ b/scilab/modules/graphics/graphics.iss | |||
@@ -33,7 +33,6 @@ Source: modules\{#GRAPHICS}\sci_gateway\{#GRAPHICS}_gateway.xml; DestDir: {app}\ | |||
33 | Source: modules\{#GRAPHICS}\etc\{#GRAPHICS}.quit; DestDir: {app}\modules\{#GRAPHICS}\etc; Components: {#COMPN_GRAPHICS} | 33 | Source: modules\{#GRAPHICS}\etc\{#GRAPHICS}.quit; DestDir: {app}\modules\{#GRAPHICS}\etc; Components: {#COMPN_GRAPHICS} |
34 | Source: modules\{#GRAPHICS}\etc\{#GRAPHICS}.start; DestDir: {app}\modules\{#GRAPHICS}\etc; Components: {#COMPN_GRAPHICS} | 34 | Source: modules\{#GRAPHICS}\etc\{#GRAPHICS}.start; DestDir: {app}\modules\{#GRAPHICS}\etc; Components: {#COMPN_GRAPHICS} |
35 | Source: modules\{#GRAPHICS}\etc\nvidia_bug_7575.sce; DestDir: {app}\modules\{#GRAPHICS}\etc; Components: {#COMPN_GRAPHICS} | 35 | Source: modules\{#GRAPHICS}\etc\nvidia_bug_7575.sce; DestDir: {app}\modules\{#GRAPHICS}\etc; Components: {#COMPN_GRAPHICS} |
36 | Source: modules\{#GRAPHICS}\etc\intel_bug_7526.sce; DestDir: {app}\modules\{#GRAPHICS}\etc; Components: {#COMPN_GRAPHICS} | ||
37 | ; | 36 | ; |
38 | ;Source: modules\{#GRAPHICS}\includes\*.h; DestDir: {app}\modules\{#GRAPHICS}\includes; Components: {#COMPN_GRAPHICS} | 37 | ;Source: modules\{#GRAPHICS}\includes\*.h; DestDir: {app}\modules\{#GRAPHICS}\includes; Components: {#COMPN_GRAPHICS} |
39 | ; | 38 | ; |