Slider Updates

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

diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index 3078d705288e2006bab51efa83ad825583855353..c2525bae43fcf288e561e5f091b17f3e87aea94c 100644 (file)
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -20,17 +20,28 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_LIBJPEG
+#if wxUSE_IMAGE && wxUSE_LIBJPEG

 
 #include "wx/imagjpeg.h"
 #include "wx/bitmap.h"
 #include "wx/debug.h"
 #include "wx/log.h"
 #include "wx/app.h"
 
 #include "wx/imagjpeg.h"
 #include "wx/bitmap.h"
 #include "wx/debug.h"
 #include "wx/log.h"
 #include "wx/app.h"

+
+// NB: Some compilers define boolean type in Windows headers (e.g. Watcom C++).
+//     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(__WATCOMC__))
+    #define HAVE_BOOLEAN
+    #include <windows.h>
+#endif
+

 extern "C"
 {
     #include "jpeglib.h"
 }
 extern "C"
 {
     #include "jpeglib.h"
 }

+

 #include "wx/filefn.h"
 #include "wx/wfstream.h"
 #include "wx/intl.h"
 #include "wx/filefn.h"
 #include "wx/wfstream.h"
 #include "wx/intl.h"


@@ -42,13 +53,25 @@ extern "C"
 #include <setjmp.h>
 
 #ifdef __SALFORDC__
 #include <setjmp.h>
 
 #ifdef __SALFORDC__

-#ifdef FAR

 #undef FAR
 #endif
 #undef FAR
 #endif

-#endif

 
 

-#ifdef __WXMSW__
-#include <windows.h>
+// ----------------------------------------------------------------------------
+// types
+// ----------------------------------------------------------------------------
+
+// the standard definition of METHODDEF(type) from jmorecfg.h is "static type"
+// which means that we can't declare the method functions as extern "C" - the
+// compiler (rightfully) complains about the multiple storage classes in
+// declaration
+//
+// so we only add extern "C" when using our own, modified, jmorecfg.h - and use
+// whatever we have in the system headers if this is what we use hoping that it
+// should be ok (can't do anything else)
+#ifdef JPEG_METHOD_LINKAGE
+    #define CPP_METHODDEF(type) extern "C" METHODDEF(type)
+#else // not using our jmorecfg.h header
+    #define CPP_METHODDEF(type) METHODDEF(type)

 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -72,11 +95,11 @@ typedef struct {
 
 typedef my_source_mgr * my_src_ptr;
 
 
 typedef my_source_mgr * my_src_ptr;
 

-METHODDEF(void) my_init_source ( j_decompress_ptr WXUNUSED(cinfo) )
+CPP_METHODDEF(void) my_init_source ( j_decompress_ptr WXUNUSED(cinfo) )

 {
 }
 
 {
 }
 

-METHODDEF(boolean) my_fill_input_buffer ( j_decompress_ptr cinfo )
+CPP_METHODDEF(boolean) my_fill_input_buffer ( j_decompress_ptr cinfo )

 {
     my_src_ptr src = (my_src_ptr) cinfo->src;
 
 {
     my_src_ptr src = (my_src_ptr) cinfo->src;
 


@@ -93,13 +116,13 @@ METHODDEF(boolean) my_fill_input_buffer ( j_decompress_ptr cinfo )
     return TRUE;
 }
 
     return TRUE;
 }
 

-METHODDEF(void) my_skip_input_data ( j_decompress_ptr cinfo, long num_bytes )
+CPP_METHODDEF(void) my_skip_input_data ( j_decompress_ptr cinfo, long num_bytes )

 {
     if (num_bytes > 0)
     {
         my_src_ptr src = (my_src_ptr) cinfo->src;
 
 {
     if (num_bytes > 0)
     {
         my_src_ptr src = (my_src_ptr) cinfo->src;
 

-        while (num_bytes > (long)src->pub.bytes_in_buffer) 
+        while (num_bytes > (long)src->pub.bytes_in_buffer)

         {
             num_bytes -= (long) src->pub.bytes_in_buffer;
             src->pub.fill_input_buffer(cinfo);
         {
             num_bytes -= (long) src->pub.bytes_in_buffer;
             src->pub.fill_input_buffer(cinfo);


@@ -109,38 +132,15 @@ METHODDEF(void) my_skip_input_data ( j_decompress_ptr cinfo, long num_bytes )
     }
 }
 
     }
 }
 

-METHODDEF(void) my_term_source ( j_decompress_ptr cinfo )
+CPP_METHODDEF(void) my_term_source ( j_decompress_ptr cinfo )

 {
     my_src_ptr src = (my_src_ptr) cinfo->src;
 
     if (src->pub.bytes_in_buffer > 0)
 {
     my_src_ptr src = (my_src_ptr) cinfo->src;
 
     if (src->pub.bytes_in_buffer > 0)

-        src->stream->SeekI(-src->pub.bytes_in_buffer, wxFromCurrent);
+        src->stream->SeekI(-(long)src->pub.bytes_in_buffer, wxFromCurrent);

     delete[] src->buffer;
 }
 
     delete[] src->buffer;
 }
 

-void jpeg_wxio_src( j_decompress_ptr cinfo, wxInputStream& infile )
-{
-    my_src_ptr src;
-
-    if (cinfo->src == NULL) {    /* first time for this JPEG object? */
-        cinfo->src = (struct jpeg_source_mgr *)
-            (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-            sizeof(my_source_mgr));
-        src = (my_src_ptr) cinfo->src;
-    }
-    src = (my_src_ptr) cinfo->src;
-    src->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */
-    src->buffer = new JOCTET[JPEG_IO_BUFFER_SIZE];
-    src->pub.next_input_byte = NULL; /* until buffer loaded */
-    src->stream = &infile;
-
-    src->pub.init_source = my_init_source;
-    src->pub.fill_input_buffer = my_fill_input_buffer;
-    src->pub.skip_input_data = my_skip_input_data;
-    src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
-    src->pub.term_source = my_term_source;
-}
-

 
 // JPEG error manager:
 
 
 // JPEG error manager:
 


@@ -156,8 +156,7 @@ typedef struct my_error_mgr * my_error_ptr;
  * Here's the routine that will replace the standard error_exit method:
  */
 
  * Here's the routine that will replace the standard error_exit method:
  */
 

-METHODDEF(void)
-my_error_exit (j_common_ptr cinfo)
+CPP_METHODDEF(void) my_error_exit (j_common_ptr cinfo)

 {
   /* cinfo->err really points to a my_error_mgr struct, so coerce pointer */
   my_error_ptr myerr = (my_error_ptr) cinfo->err;
 {
   /* cinfo->err really points to a my_error_mgr struct, so coerce pointer */
   my_error_ptr myerr = (my_error_ptr) cinfo->err;


@@ -170,7 +169,35 @@ my_error_exit (j_common_ptr cinfo)
   longjmp(myerr->setjmp_buffer, 1);
 }
 
   longjmp(myerr->setjmp_buffer, 1);
 }
 

+void jpeg_wxio_src( j_decompress_ptr cinfo, wxInputStream& infile )
+{
+    my_src_ptr src;

 
 

+    if (cinfo->src == NULL) {    /* first time for this JPEG object? */
+        cinfo->src = (struct jpeg_source_mgr *)
+            (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+            sizeof(my_source_mgr));
+        src = (my_src_ptr) cinfo->src;
+    }
+    src = (my_src_ptr) cinfo->src;
+    src->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */
+    src->buffer = new JOCTET[JPEG_IO_BUFFER_SIZE];
+    src->pub.next_input_byte = NULL; /* until buffer loaded */
+    src->stream = &infile;
+
+    src->pub.init_source = my_init_source;
+    src->pub.fill_input_buffer = my_fill_input_buffer;
+    src->pub.skip_input_data = my_skip_input_data;
+    src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
+    src->pub.term_source = my_term_source;
+}
+
+
+// temporarily disable the warning C4611 (interaction between '_setjmp' and
+// C++ object destruction is non-portable) - I don't see any dtors here
+#ifdef __VISUALC__
+    #pragma warning(disable:4611)
+#endif /* VC++ */

 
 bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )
 {
 
 bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )
 {


@@ -191,8 +218,9 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
       /* If we get here, the JPEG code has signaled an error.
        * We need to clean up the JPEG object, close the input file, and return.
        */
       /* If we get here, the JPEG code has signaled an error.
        * We need to clean up the JPEG object, close the input file, and return.
        */

-      if (verbose) 
+      if (verbose)

         wxLogError(_("JPEG: Couldn't load - file is probably corrupted."));
         wxLogError(_("JPEG: Couldn't load - file is probably corrupted."));

+      (cinfo.src->term_source)(&cinfo);

       jpeg_destroy_decompress(&cinfo);
       if (image->Ok()) image->Destroy();
       return FALSE;
       jpeg_destroy_decompress(&cinfo);
       if (image->Ok()) image->Destroy();
       return FALSE;


@@ -226,10 +254,6 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
     return TRUE;
 }
 
     return TRUE;
 }
 

-
-
-
-

 typedef struct {
     struct jpeg_destination_mgr pub;
 
 typedef struct {
     struct jpeg_destination_mgr pub;
 


@@ -241,7 +265,7 @@ typedef my_destination_mgr * my_dest_ptr;
 
 #define OUTPUT_BUF_SIZE  4096    /* choose an efficiently fwrite'able size */
 
 
 #define OUTPUT_BUF_SIZE  4096    /* choose an efficiently fwrite'able size */
 

-METHODDEF(void) init_destination (j_compress_ptr cinfo)
+CPP_METHODDEF(void) init_destination (j_compress_ptr cinfo)

 {
     my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
 
 {
     my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
 


@@ -253,7 +277,7 @@ METHODDEF(void) init_destination (j_compress_ptr cinfo)
     dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
 }
 
     dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
 }
 

-METHODDEF(boolean) empty_output_buffer (j_compress_ptr cinfo)
+CPP_METHODDEF(boolean) empty_output_buffer (j_compress_ptr cinfo)

 {
     my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
 
 {
     my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
 


@@ -263,7 +287,7 @@ METHODDEF(boolean) empty_output_buffer (j_compress_ptr cinfo)
     return TRUE;
 }
 
     return TRUE;
 }
 

-METHODDEF(void) term_destination (j_compress_ptr cinfo)
+CPP_METHODDEF(void) term_destination (j_compress_ptr cinfo)

 {
     my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
     size_t datacount = OUTPUT_BUF_SIZE - dest->pub.free_in_buffer;
 {
     my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
     size_t datacount = OUTPUT_BUF_SIZE - dest->pub.free_in_buffer;


@@ -303,12 +327,12 @@ bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
     if (!verbose) cinfo.err->output_message=NULL;
 
     /* Establish the setjmp return context for my_error_exit to use. */
     if (!verbose) cinfo.err->output_message=NULL;
 
     /* Establish the setjmp return context for my_error_exit to use. */

-    if (setjmp(jerr.setjmp_buffer)) 
+    if (setjmp(jerr.setjmp_buffer))

     {
         /* If we get here, the JPEG code has signaled an error.
          * We need to clean up the JPEG object, close the input file, and return.
          */
     {
         /* If we get here, the JPEG code has signaled an error.
          * We need to clean up the JPEG object, close the input file, and return.
          */

-         if (verbose) 
+         if (verbose)

             wxLogError(_("JPEG: Couldn't save image."));
          jpeg_destroy_compress(&cinfo);
          return FALSE;
             wxLogError(_("JPEG: Couldn't save image."));
          jpeg_destroy_compress(&cinfo);
          return FALSE;


@@ -322,6 +346,16 @@ bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
     cinfo.input_components = 3;
     cinfo.in_color_space = JCS_RGB;
     jpeg_set_defaults(&cinfo);
     cinfo.input_components = 3;
     cinfo.in_color_space = JCS_RGB;
     jpeg_set_defaults(&cinfo);

+
+    // TODO: 3rd parameter is force_baseline, what value should this be?
+    // Code says: "If force_baseline is TRUE, the computed quantization table entries
+    // are limited to 1..255 for JPEG baseline compatibility."
+    // '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);
+

     jpeg_start_compress(&cinfo, TRUE);
 
     stride = cinfo.image_width * 3;    /* JSAMPLEs per row in image_buffer */
     jpeg_start_compress(&cinfo, TRUE);
 
     stride = cinfo.image_width * 3;    /* JSAMPLEs per row in image_buffer */


@@ -336,14 +370,18 @@ bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
     return TRUE;
 }
 
     return TRUE;
 }
 

+#ifdef __VISUALC__
+    #pragma warning(default:4611)
+#endif /* VC++ */

 
 bool wxJPEGHandler::DoCanRead( wxInputStream& stream )
 {
     unsigned char hdr[2];
 
 
 bool wxJPEGHandler::DoCanRead( wxInputStream& stream )
 {
     unsigned char hdr[2];
 

-    stream.Read(&hdr, 2);
-    stream.SeekI(-2, wxFromCurrent);
-    return (hdr[0] == 0xFF && hdr[1] == 0xD8);
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+        return FALSE;
+
+    return hdr[0] == 0xFF && hdr[1] == 0xD8;

 }
 
 #endif   // wxUSE_STREAMS
 }
 
 #endif   // wxUSE_STREAMS