X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/234fedd2d3f7bb618e1b640ca29ad73545c2129b..c2331d9b50dffbd3f2c0caf06b514fd4c96b3b94:/src/common/imagjpeg.cpp

diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index c10f764da4..86dfa2da77 100644
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -22,18 +22,19 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
+    #include "wx/bitmap.h"
+    #include "wx/module.h"
 #endif
 
-#include "wx/bitmap.h"
-
-// NB: Some compilers define boolean type in Windows headers
-//     (e.g. Watcom C++, but not Open Watcom).
-//     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__))
+// A hack based on one from tif_jpeg.c to overcome the problem on Windows
+// of rpcndr.h defining boolean with a different type to the jpeg headers.
+// 
+// This hack is only necessary for an external jpeg library, the builtin one
+// usually used on Windows doesn't use the type boolean, so always works.
+//
+#ifdef wxHACK_BOOLEAN
     #define HAVE_BOOLEAN
-    #include "wx/msw/wrapwin.h"
+    #define boolean wxHACK_BOOLEAN
 #endif
 
 extern "C"
@@ -44,9 +45,12 @@ extern "C"
     #include "jpeglib.h"
 }
 
+#ifndef HAVE_WXJPEG_BOOLEAN
+typedef boolean wxjpeg_boolean;
+#endif
+
 #include "wx/filefn.h"
 #include "wx/wfstream.h"
-#include "wx/module.h"
 
 // For memcpy
 #include <string.h>
@@ -96,11 +100,14 @@ typedef struct {
 
 typedef wx_source_mgr * wx_src_ptr;
 
+extern "C"
+{
+
 CPP_METHODDEF(void) wx_init_source ( j_decompress_ptr WXUNUSED(cinfo) )
 {
 }
 
-CPP_METHODDEF(boolean) wx_fill_input_buffer ( j_decompress_ptr cinfo )
+CPP_METHODDEF(wxjpeg_boolean) wx_fill_input_buffer ( j_decompress_ptr cinfo )
 {
     wx_src_ptr src = (wx_src_ptr) cinfo->src;
 
@@ -202,6 +209,8 @@ void wx_jpeg_io_src( j_decompress_ptr cinfo, wxInputStream& infile )
     src->pub.term_source = wx_term_source;
 }
 
+} // extern "C"
+
 static inline void wx_cmyk_to_rgb(unsigned char* rgb, const unsigned char* cmyk)
 {
     register int k = 255 - cmyk[3];
@@ -209,13 +218,13 @@ static inline void wx_cmyk_to_rgb(unsigned char* rgb, const unsigned char* cmyk)
     register int c;
 
     c = k + k2 * (255 - cmyk[0]) / 255;
-    rgb[0] = (c > 255) ? 0 : (255 - c);
+    rgb[0] = (unsigned char)((c > 255) ? 0 : (255 - c));
 
     c = k + k2 * (255 - cmyk[1]) / 255;
-    rgb[1] = (c > 255) ? 0 : (255 - c);
+    rgb[1] = (unsigned char)((c > 255) ? 0 : (255 - c));
 
     c = k + k2 * (255 - cmyk[2]) / 255;
-    rgb[2] = (c > 255) ? 0 : (255 - c);
+    rgb[2] = (unsigned char)((c > 255) ? 0 : (255 - c));
 }
 
 // temporarily disable the warning C4611 (interaction between '_setjmp' and
@@ -317,6 +326,9 @@ typedef wx_destination_mgr * wx_dest_ptr;
 
 #define OUTPUT_BUF_SIZE  4096    /* choose an efficiently fwrite'able size */
 
+extern "C"
+{
+
 CPP_METHODDEF(void) wx_init_destination (j_compress_ptr cinfo)
 {
     wx_dest_ptr dest = (wx_dest_ptr) cinfo->dest;
@@ -329,7 +341,7 @@ CPP_METHODDEF(void) wx_init_destination (j_compress_ptr cinfo)
     dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
 }
 
-CPP_METHODDEF(boolean) wx_empty_output_buffer (j_compress_ptr cinfo)
+CPP_METHODDEF(wxjpeg_boolean) wx_empty_output_buffer (j_compress_ptr cinfo)
 {
     wx_dest_ptr dest = (wx_dest_ptr) cinfo->dest;
 
@@ -365,6 +377,8 @@ GLOBAL(void) wx_jpeg_io_dest (j_compress_ptr cinfo, wxOutputStream& outfile)
     dest->stream = &outfile;
 }
 
+} // extern "C"
+
 bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )
 {
     struct jpeg_compress_struct cinfo;
@@ -410,37 +424,16 @@ bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
         jpeg_set_quality(&cinfo, image->GetOptionInt(wxIMAGE_OPTION_QUALITY), TRUE);
 
     // set the resolution fields in the output file
-    UINT16 resX,
-           resY;
-    if ( image->HasOption(wxIMAGE_OPTION_RESOLUTIONX) &&
-         image->HasOption(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 = (UINT16)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTION);
-    }
-    else
-    {
-        resX =
-        resY = 0;
-    }
-
-    if ( resX && resY )
+    int resX, resY;
+    wxImageResolution res = GetResolutionFromOptions(*image, &resX, &resY);
+    if ( res != wxIMAGE_RESOLUTION_NONE )
     {
         cinfo.X_density = resX;
         cinfo.Y_density = resY;
-    }
 
-    // sets the resolution unit field in the output file
-    // wxIMAGE_RESOLUTION_INCHES for inches
-    // wxIMAGE_RESOLUTION_CM for centimeters
-    if ( image->HasOption(wxIMAGE_OPTION_RESOLUTIONUNIT) )
-    {
-        cinfo.density_unit = (UINT8)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONUNIT);
+        // it so happens that wxIMAGE_RESOLUTION_INCHES/CM values are the same
+        // ones as used by libjpeg, so we can assign them directly
+        cinfo.density_unit = res;
     }
 
     jpeg_start_compress(&cinfo, TRUE);