X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ce5a3a853f2eaa7fe58e494aa0605918531ff3b..85e5bb6a953e5dffd5c52d907b4ca0767a544bcc:/src/common/imagbmp.cpp?ds=sidebyside

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index b4e8208c47..02d6d6ecca 100644
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imagbmp.cpp
+// Name:        src/common/imagbmp.cpp
 // Purpose:     wxImage BMP,ICO and CUR handlers
 // Author:      Robert Roebling, Chris Elliott
 // RCS-ID:      $Id$
@@ -7,26 +7,23 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "imagbmp.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
-
 #if wxUSE_IMAGE
 
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+#endif
+
 #include "wx/imagbmp.h"
 #include "wx/bitmap.h"
 #include "wx/debug.h"
-#include "wx/log.h"
-#include "wx/app.h"
 #include "wx/filefn.h"
 #include "wx/wfstream.h"
 #include "wx/intl.h"
@@ -278,7 +275,7 @@ bool wxBMPHandler::SaveDib(wxImage *image,
         for ( int i = 0; i < palette_size; i++ )
         {
             // if 1BPP_BW then the value should be either 0 or 255
-            wxUint8 c = (i > 0) && (format == wxBMP_1BPP_BW) ? 255 : i;
+            wxUint8 c = (wxUint8)((i > 0) && (format == wxBMP_1BPP_BW) ? 255 : i);
 
             rgbquad[i*4] =
             rgbquad[i*4+1] =
@@ -1023,7 +1020,7 @@ bool wxICOHandler::SaveFile(wxImage *image,
         return false;
     }
 
-    int images = 1; // only generate one image
+    const int images = 1; // only generate one image
 
     // VS: This is a hack of sort - since ICO and CUR files are almost
     //     identical, we have all the meat in wxICOHandler and check for
@@ -1051,7 +1048,7 @@ bool wxICOHandler::SaveFile(wxImage *image,
 
     // for each iamage write a description ICONDIRENTRY:
     ICONDIRENTRY icondirentry;
-    for (int i = 0; i < images; i++)
+    for (int img = 0; img < images; img++)
     {
         wxImage mask;