made SetFirstItem() work again (patch 1445170)

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

diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index 42b995aae9b664f0eacbe676ba1f53dd8b48d68b..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$
 // Purpose:     wxImage JPEG handler
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$


@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 // 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.
 //     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
     #define HAVE_BOOLEAN
     #include "wx/msw/wrapwin.h"
 #endif


@@ -356,8 +352,8 @@ bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
     // 'Quality' is a number between 0 (terrible) and 100 (very good).
     // The default (in jcparam.c, jpeg_set_defaults) is 75,
     // and force_baseline is TRUE.
     // 'Quality' is a number between 0 (terrible) and 100 (very good).
     // The default (in jcparam.c, jpeg_set_defaults) is 75,
     // and force_baseline is TRUE.

-    if (image->HasOption(wxT("quality")))
-        jpeg_set_quality(&cinfo, image->GetOptionInt(wxT("quality")), TRUE);
+    if (image->HasOption(wxIMAGE_OPTION_QUALITY))
+        jpeg_set_quality(&cinfo, image->GetOptionInt(wxIMAGE_OPTION_QUALITY), TRUE);

 
     // set the resolution fields in the output file
     UINT16 resX,
 
     // set the resolution fields in the output file
     UINT16 resX,


@@ -365,13 +361,13 @@ bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
     if ( image->HasOption(wxIMAGE_OPTION_RESOLUTIONX) &&
          image->HasOption(wxIMAGE_OPTION_RESOLUTIONY) )
     {
     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 =
     }
     else if ( image->HasOption(wxIMAGE_OPTION_RESOLUTION) )
     {
         resX =

-        resY = image->GetOptionInt(wxIMAGE_OPTION_RESOLUTION);
+        resY = (UINT16)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTION);

     }
     else
     {
     }
     else
     {


@@ -424,9 +420,3 @@ bool wxJPEGHandler::DoCanRead( wxInputStream& stream )
 #endif   // wxUSE_STREAMS
 
 #endif   // wxUSE_LIBJPEG
 #endif   // wxUSE_STREAMS
 
 #endif   // wxUSE_LIBJPEG

-
-
-
-
-
-