fix for bug 1371386, with some minor mods and cleanup

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

diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index fed0d78859b8eca8616c7f53ac577faaad5dde6b..7e4dcedfba3da2ab2c512c4bb1b25db96a4bbfc4 100644 (file)
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imagjpeg.cpp
+// Name:        src/common/imagjpeg.cpp
 // Purpose:     wxImage JPEG handler
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "imagjpeg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -33,7 +29,7 @@
 //     This causes a conflict with jmorecfg.h header from libjpeg, so we have
 //     to make sure libjpeg won't try to define boolean itself. This is done by
 //     defining HAVE_BOOLEAN.
-#if defined(__WXMSW__) && (defined(__MWERKS__) || defined(__DIGITALMARS__) || (defined(__WATCOMC__) && __WATCOMC__ < 1200))
+#if defined(__WXMSW__) && (defined(__MWERKS__) || defined(__DIGITALMARS__))
     #define HAVE_BOOLEAN
     #include "wx/msw/wrapwin.h"
 #endif
@@ -365,13 +361,13 @@ bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
     if ( image->HasOption(wxIMAGE_OPTION_RESOLUTIONX) &&
          image->HasOption(wxIMAGE_OPTION_RESOLUTIONY) )
     {
-        resX = image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONX);
-        resY = image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONY);
+        resX = (UINT16)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONX);
+        resY = (UINT16)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONY);
     }
     else if ( image->HasOption(wxIMAGE_OPTION_RESOLUTION) )
     {
         resX =
-        resY = image->GetOptionInt(wxIMAGE_OPTION_RESOLUTION);
+        resY = (UINT16)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTION);
     }
     else
     {
@@ -424,9 +420,3 @@ bool wxJPEGHandler::DoCanRead( wxInputStream& stream )
 #endif   // wxUSE_STREAMS
 
 #endif   // wxUSE_LIBJPEG
-
-
-
-
-
-