get rid of several dozen of warnings when using g++ >= 4.2 about string literals...

[wxWidgets.git] / src / common / imagbmp.cpp

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index 76d453272589a2cd4dc18fb9ff0b000ac18a0fe0..66718fc518fb63bd974134aeeb4b9c4e4669527f 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -38,12 +38,6 @@
 // For memcpy
 #include <string.h>
 
-#ifdef __SALFORDC__
-#ifdef FAR
-#undef FAR
-#endif
-#endif
-
 //-----------------------------------------------------------------------------
 // wxBMPHandler
 //-----------------------------------------------------------------------------
@@ -200,8 +194,8 @@ bool wxBMPHandler::SaveDib(wxImage *image,
 
         case wxIMAGE_RESOLUTION_INCHES:
             // convert resolution in inches to resolution in centimeters
-            hres *= 100*mm2inches;
-            vres *= 100*mm2inches;
+            hres = (wxUint32)(100*mm2inches*hres);
+            vres = (wxUint32)(100*mm2inches*vres);
             // fall through to convert it to resolution in meters
 
         case wxIMAGE_RESOLUTION_CM: