X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ecae80b250d073fb5d91f43e41c39336eb87af67..ecd20d4a916884895dcd8873a9f1156e34f4ac89:/src/common/imagbmp.cpp

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index 2b9e1b21c8..6e4168e0f0 100644
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -273,14 +273,16 @@ bool wxBMPHandler::SaveDib(wxImage *image,
     else if ( (format == wxBMP_8BPP_GREY) || (format == wxBMP_8BPP_RED) ||
               (format == wxBMP_1BPP_BW) )
     {
-        int i;
         rgbquad = new wxUint8 [palette_size*4];
 
-        for (i = 0; i < palette_size; i++)
+        for ( int i = 0; i < palette_size; i++ )
         {
-            // if 1BPP_BW then just 0 and 255 then exit
-            if (( i > 0) && (format == wxBMP_1BPP_BW)) i = 255;
-            rgbquad[i*4] = rgbquad[i*4+1] = rgbquad[i*4+2] = (wxUint8)i;
+            // if 1BPP_BW then the value should be either 0 or 255
+            wxUint8 c = (wxUint8)((i > 0) && (format == wxBMP_1BPP_BW) ? 255 : i);
+
+            rgbquad[i*4] =
+            rgbquad[i*4+1] =
+            rgbquad[i*4+2] = c;
             rgbquad[i*4+3] = 0;
         }
     }