Fix: import conversion detected colors marked as unused

stg · Jul 5, 2012 · 9a5e4a0 · 9a5e4a0
1 parent 8ff9e18
commit 9a5e4a0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/bin-win/gui.exe b/bin-win/gui.exe
diff --git a/gui/picture.c b/gui/picture.c
@@ -281,26 +281,31 @@ void picture_convert(uint8_t *p_data) {
     // full-color patterns
     for(y = 0; y < h_original; y += 2) {
       for(c = 0; c < MAX_COLORS; c++) {
-        for(x = 0; x < w; x++) {
-          FreeImage_GetPixelColor(dib, x, y, &quad);
-          FreeImage_GetPixelColor(dib, x, y + 1, &quad_two);
-          if(match(&quad, &color[c].color) || match(&quad_two, &color[c].color)) break;
-        }
-        if(x < w) {
+        if(color[c].used) {
           for(x = 0; x < w; x++) {
-            FreeImage_GetPixelColor(dib,x,y,&quad);
-            p_data[(h-(y_out+1))*w+x] = (match_color(&quad) == color[c].memo) ? color[c].memo : 0xFF;
+            FreeImage_GetPixelColor(dib, x, y, &quad);
+            FreeImage_GetPixelColor(dib, x, y + 1, &quad_two);
+            if(match(&quad, &color[c].color) || match(&quad_two, &color[c].color)) break;
           }
-          y_out++;
-          for(x = 0; x < w; x++) {
-            FreeImage_GetPixelColor(dib,x,y+1,&quad);
-            p_data[(h-(y_out+1))*w+x] = (match_color(&quad) == color[c].memo) ? color[c].memo : 0xFF;
+          if(x < w) {
+            for(x = 0; x < w; x++) {
+              FreeImage_GetPixelColor(dib,x,y,&quad);
+              p_data[(h-(y_out+1))*w+x] = (match_color(&quad) == color[c].memo) ? color[c].memo : 0xFF;
+            }
+            y_out++;
+            for(x = 0; x < w; x++) {
+              FreeImage_GetPixelColor(dib,x,y+1,&quad);
+              p_data[(h-(y_out+1))*w+x] = (match_color(&quad) == color[c].memo) ? color[c].memo : 0xFF;
+            }
+            y_out++;
           }
-          y_out++;
         }
       }
     }
   }
+#ifdef DEBUG
+  printf("conversion rows %i\n",y_out);
+#endif  
 }
 
 void picture_free() {

diff --git a/win-gui-make.bat b/win-gui-make.bat
@@ -5,5 +5,5 @@ rem echo [bin-win\gui_sdl12.exe] building sdl1.2 gui executable...
 rem gcc -g gui/*.c lib/src/*.c res/windows.res -I lib/include/ -mwindows -lmingw32 -lsdlmain -lsdl -lsetupapi -o bin-win\gui_sdl12.exe
 rem strip bin-win\gui_sdl12.exe
 echo [bin-win\gui.exe] building sdl2.0 gui executable...
-gcc -g gui/*.c lib/src/*.c res/windows.res -I lib/include/ -mwindows -lwinmm -lmingw32 -lsdl2main -lsdl2 -lsdl2.dll -lsetupapi -DSDL2 -lfreeimage -o bin-win\gui.exe
+gcc gui/*.c lib/src/*.c res/windows.res -I lib/include/ -mwindows -lwinmm -lmingw32 -lsdl2main -lsdl2 -lsdl2.dll -lsetupapi -DSDL2 -lfreeimage -o bin-win\gui.exe
 strip bin-win\gui.exe