X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/361f4288eb65063e2c6e1cfebbbf91667fce3c38..bd2e08d06528b2014a4acf878e91fee4696d0666:/src/common/imagpng.cpp

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 8acc531db2..0a5c3c4826 100644
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/imagepng.cpp
+// Name:        src/common/imagpng.cpp
 // Purpose:     wxImage PNG handler
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
@@ -42,12 +42,6 @@
 // For memcpy
 #include <string.h>
 
-#ifdef __SALFORDC__
-#ifdef FAR
-#undef FAR
-#endif
-#endif
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -63,8 +57,6 @@ enum Transparency
     Transparency_Alpha
 };
 
-static const double INCHES_IN_METER = 39.3700787;
-
 // ----------------------------------------------------------------------------
 // local functions
 // ----------------------------------------------------------------------------
@@ -755,8 +747,11 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
     switch ( GetResolutionFromOptions(*image, &resX, &resY) )
     {
         case wxIMAGE_RESOLUTION_INCHES:
-            resX *= INCHES_IN_METER;
-            resY *= INCHES_IN_METER;
+            {
+                const double INCHES_IN_METER = 10000.0 / 254;
+                resX = int(resX * INCHES_IN_METER);
+                resY = int(resY * INCHES_IN_METER);
+            }
             break;
 
         case wxIMAGE_RESOLUTION_CM: