fix from Robert

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

diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index b8f642502fd357e51ff0d132ad4a3994ffb19ea3..f985604631f44cd36ff3297623a35c95b116e052 100644 (file)
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-/*
-   We don't put pragma implement in this file because it is already present in
-   src/common/image.cpp
-

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "image.h"
+#pragma implementation "imagjpeg.h"

 #endif
 #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"


@@ -23,16 +18,22 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include "wx/image.h"
+#include "wx/defs.h"
+
+#if wxUSE_LIBJPEG
+
+#include "wx/imagjpeg.h"

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

-#if wxUSE_LIBJPEG
-extern "C" {
-#include <jpeglib.h>
-}
+extern "C"
+{
+#ifdef __WATCOMC__
+    #define HAVE_BOOLEAN

 #endif
 #endif

+    #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"


@@ -57,65 +58,85 @@ extern "C" {
 // wxJPEGHandler
 //-----------------------------------------------------------------------------
 
 // wxJPEGHandler
 //-----------------------------------------------------------------------------
 

-#if wxUSE_LIBJPEG
-
-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxJPEGHandler,wxImageHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxJPEGHandler,wxImageHandler)

-#endif

 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

-

 //------------- JPEG Data Source Manager
 
 //------------- JPEG Data Source Manager
 

+#define JPEG_IO_BUFFER_SIZE   2048
+

 typedef struct {
     struct jpeg_source_mgr pub;   /* public fields */
 typedef struct {
     struct jpeg_source_mgr pub;   /* public fields */

-    
+

     JOCTET* buffer;               /* start of buffer */
     JOCTET* buffer;               /* start of buffer */

+    wxInputStream *stream;

 } my_source_mgr;
 
 typedef my_source_mgr * my_src_ptr;
 
 } my_source_mgr;
 
 typedef my_source_mgr * my_src_ptr;
 

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

 {
 }
 
 METHODDEF(boolean) my_fill_input_buffer ( j_decompress_ptr cinfo )
 {
 {
 }
 
 METHODDEF(boolean) my_fill_input_buffer ( j_decompress_ptr cinfo )
 {

+    my_src_ptr src = (my_src_ptr) cinfo->src;
+
+    src->pub.next_input_byte = src->buffer;
+    src->pub.bytes_in_buffer = src->stream->Read(src->buffer, JPEG_IO_BUFFER_SIZE).LastRead();
+
+    if (src->pub.bytes_in_buffer == 0) // check for end-of-stream
+    {
+        // Insert a fake EOI marker
+        src->buffer[0] = 0xFF;
+        src->buffer[1] = JPEG_EOI;
+        src->pub.bytes_in_buffer = 2;
+    }

     return TRUE;
 }
 
 METHODDEF(void) my_skip_input_data ( j_decompress_ptr cinfo, long num_bytes )
 {
     return TRUE;
 }
 
 METHODDEF(void) my_skip_input_data ( j_decompress_ptr cinfo, long num_bytes )
 {

-    my_src_ptr src = (my_src_ptr) cinfo->src;
-    
-    src->pub.next_input_byte += (size_t) num_bytes;
-    src->pub.bytes_in_buffer -= (size_t) num_bytes;
+    if (num_bytes > 0)
+    {
+        my_src_ptr src = (my_src_ptr) cinfo->src;
+
+        while (num_bytes > (long)src->pub.bytes_in_buffer) 
+        {
+            num_bytes -= (long) src->pub.bytes_in_buffer;
+            src->pub.fill_input_buffer(cinfo);
+        }
+        src->pub.next_input_byte += (size_t) num_bytes;
+        src->pub.bytes_in_buffer -= (size_t) num_bytes;
+    }

 }
 
 METHODDEF(void) my_term_source ( j_decompress_ptr cinfo )
 {
     my_src_ptr src = (my_src_ptr) cinfo->src;
 }
 
 METHODDEF(void) my_term_source ( j_decompress_ptr cinfo )
 {
     my_src_ptr src = (my_src_ptr) cinfo->src;

-    
-    free (src->buffer);
+
+    if (src->pub.bytes_in_buffer > 0)
+        src->stream->SeekI(-(long)src->pub.bytes_in_buffer, wxFromCurrent);
+    delete[] src->buffer;

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

-    
-    if (cinfo->src == NULL) {  /* first time for this JPEG object? */
+
+    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;
         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 = infile.StreamSize(); /* forces fill_input_buffer on first read */
-    src->buffer = (JOCTET *) malloc (infile.StreamSize());
-    src->pub.next_input_byte = src->buffer; /* until buffer loaded */
-    infile.Read(src->buffer, infile.StreamSize());
-    
+    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.init_source = my_init_source;
     src->pub.fill_input_buffer = my_fill_input_buffer;
     src->pub.skip_input_data = my_skip_input_data;


@@ -127,9 +148,9 @@ void jpeg_wxio_src( j_decompress_ptr cinfo, wxInputStream& infile )
 // JPEG error manager:
 
 struct my_error_mgr {
 // JPEG error manager:
 
 struct my_error_mgr {

-  struct jpeg_error_mgr pub;   /* "public" fields */
+  struct jpeg_error_mgr pub;    /* "public" fields */

 
 

-  jmp_buf setjmp_buffer;       /* for return to caller */
+  jmp_buf setjmp_buffer;    /* for return to caller */

 };
 
 typedef struct my_error_mgr * my_error_ptr;
 };
 
 typedef struct my_error_mgr * my_error_ptr;


@@ -146,32 +167,39 @@ my_error_exit (j_common_ptr cinfo)
 
   /* Always display the message. */
   /* We could postpone this until after returning, if we chose. */
 
   /* Always display the message. */
   /* We could postpone this until after returning, if we chose. */

-  (*cinfo->err->output_message) (cinfo);
+  if (cinfo->err->output_message) (*cinfo->err->output_message) (cinfo);

 
   /* Return control to the setjmp point */
   longjmp(myerr->setjmp_buffer, 1);
 }
 
 
   /* Return control to the setjmp point */
   longjmp(myerr->setjmp_buffer, 1);
 }
 

+// 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 wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )

 {
     struct jpeg_decompress_struct cinfo;
     struct my_error_mgr jerr;
     JSAMPARRAY tempbuf;
     unsigned char *ptr;
     unsigned stride;
 {
     struct jpeg_decompress_struct cinfo;
     struct my_error_mgr jerr;
     JSAMPARRAY tempbuf;
     unsigned char *ptr;
     unsigned stride;

-    
+

     image->Destroy();
     cinfo.err = jpeg_std_error( &jerr.pub );
     jerr.pub.error_exit = my_error_exit;
 
     image->Destroy();
     cinfo.err = jpeg_std_error( &jerr.pub );
     jerr.pub.error_exit = my_error_exit;
 

+    if (!verbose) cinfo.err->output_message=NULL;
+

     /* Establish the setjmp return context for my_error_exit to use. */
     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.
        */
     /* Establish the setjmp return context for my_error_exit to use. */
     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.
        */

-      wxLogError(_("Couldn't load a JPEG image - probably file is corrupted."));
+      if (verbose) 
+        wxLogError(_("JPEG: Couldn't load - file is probably corrupted."));

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


@@ -182,7 +210,7 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream )
     jpeg_read_header( &cinfo, TRUE );
     cinfo.out_color_space = JCS_RGB;
     jpeg_start_decompress( &cinfo );
     jpeg_read_header( &cinfo, TRUE );
     cinfo.out_color_space = JCS_RGB;
     jpeg_start_decompress( &cinfo );

-    
+

     image->Create( cinfo.image_width, cinfo.image_height );
     if (!image->Ok()) {
         jpeg_finish_decompress( &cinfo );
     image->Create( cinfo.image_width, cinfo.image_height );
     if (!image->Ok()) {
         jpeg_finish_decompress( &cinfo );


@@ -194,7 +222,7 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream )
     stride = cinfo.output_width * 3;
     tempbuf = (*cinfo.mem->alloc_sarray)
         ((j_common_ptr) &cinfo, JPOOL_IMAGE, stride, 1 );
     stride = cinfo.output_width * 3;
     tempbuf = (*cinfo.mem->alloc_sarray)
         ((j_common_ptr) &cinfo, JPOOL_IMAGE, stride, 1 );

-    
+

     while ( cinfo.output_scanline < cinfo.output_height ) {
         jpeg_read_scanlines( &cinfo, tempbuf, 1 );
         memcpy( ptr, tempbuf[0], stride );
     while ( cinfo.output_scanline < cinfo.output_height ) {
         jpeg_read_scanlines( &cinfo, tempbuf, 1 );
         memcpy( ptr, tempbuf[0], stride );


@@ -205,25 +233,21 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream )
     return TRUE;
 }
 
     return TRUE;
 }
 

-
-
-
-

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

-    
+

     wxOutputStream *stream;
     JOCTET * buffer;
 } my_destination_mgr;
 
 typedef my_destination_mgr * my_dest_ptr;
 
     wxOutputStream *stream;
     JOCTET * buffer;
 } my_destination_mgr;
 
 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)
 {
     my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
 
 METHODDEF(void) init_destination (j_compress_ptr cinfo)
 {
     my_dest_ptr dest = (my_dest_ptr) cinfo->dest;

-    
+

     /* Allocate the output buffer --- it will be released when done with image */
     dest->buffer = (JOCTET *)
         (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
     /* Allocate the output buffer --- it will be released when done with image */
     dest->buffer = (JOCTET *)
         (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,


@@ -235,7 +259,7 @@ METHODDEF(void) init_destination (j_compress_ptr cinfo)
 METHODDEF(boolean) empty_output_buffer (j_compress_ptr cinfo)
 {
     my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
 METHODDEF(boolean) empty_output_buffer (j_compress_ptr cinfo)
 {
     my_dest_ptr dest = (my_dest_ptr) cinfo->dest;

-    
+

     dest->stream->Write(dest->buffer, OUTPUT_BUF_SIZE);
     dest->pub.next_output_byte = dest->buffer;
     dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
     dest->stream->Write(dest->buffer, OUTPUT_BUF_SIZE);
     dest->pub.next_output_byte = dest->buffer;
     dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;


@@ -254,13 +278,13 @@ METHODDEF(void) term_destination (j_compress_ptr cinfo)
 GLOBAL(void) jpeg_wxio_dest (j_compress_ptr cinfo, wxOutputStream& outfile)
 {
     my_dest_ptr dest;
 GLOBAL(void) jpeg_wxio_dest (j_compress_ptr cinfo, wxOutputStream& outfile)
 {
     my_dest_ptr dest;

-    
-    if (cinfo->dest == NULL) { /* first time for this JPEG object? */
+
+    if (cinfo->dest == NULL) {    /* first time for this JPEG object? */

         cinfo->dest = (struct jpeg_destination_mgr *)
             (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
             sizeof(my_destination_mgr));
     }
         cinfo->dest = (struct jpeg_destination_mgr *)
             (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
             sizeof(my_destination_mgr));
     }

-    
+

     dest = (my_dest_ptr) cinfo->dest;
     dest->pub.init_destination = init_destination;
     dest->pub.empty_output_buffer = empty_output_buffer;
     dest = (my_dest_ptr) cinfo->dest;
     dest->pub.init_destination = init_destination;
     dest->pub.empty_output_buffer = empty_output_buffer;


@@ -268,38 +292,52 @@ GLOBAL(void) jpeg_wxio_dest (j_compress_ptr cinfo, wxOutputStream& outfile)
     dest->stream = &outfile;
 }
 
     dest->stream = &outfile;
 }
 

-bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream )
+bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )

 {
     struct jpeg_compress_struct cinfo;
     struct my_error_mgr jerr;
 {
     struct jpeg_compress_struct cinfo;
     struct my_error_mgr jerr;

-    JSAMPROW row_pointer[1];   /* pointer to JSAMPLE row[s] */
+    JSAMPROW row_pointer[1];    /* pointer to JSAMPLE row[s] */

     JSAMPLE *image_buffer;
     JSAMPLE *image_buffer;

-    int stride;                        /* physical row width in image buffer */
-    
+    int stride;                /* physical row width in image buffer */
+

     cinfo.err = jpeg_std_error(&jerr.pub);
     jerr.pub.error_exit = my_error_exit;
 
     cinfo.err = jpeg_std_error(&jerr.pub);
     jerr.pub.error_exit = my_error_exit;
 

+    if (!verbose) cinfo.err->output_message=NULL;
+

     /* Establish the setjmp return context for my_error_exit to use. */
     /* Establish the setjmp return context for my_error_exit to use. */

-    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.
-       */
-      wxLogError(_("Couldn't save a JPEG image - probably file is corrupted."));
-      jpeg_destroy_compress(&cinfo);
-      return FALSE;
+    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 (verbose) 
+            wxLogError(_("JPEG: Couldn't save image."));
+         jpeg_destroy_compress(&cinfo);
+         return FALSE;

     }
 
     jpeg_create_compress(&cinfo);
     jpeg_wxio_dest(&cinfo, stream);
     }
 
     jpeg_create_compress(&cinfo);
     jpeg_wxio_dest(&cinfo, stream);

-    
+

     cinfo.image_width = image->GetWidth();
     cinfo.image_height = image->GetHeight();
     cinfo.input_components = 3;
     cinfo.in_color_space = JCS_RGB;
     jpeg_set_defaults(&cinfo);
     cinfo.image_width = image->GetWidth();
     cinfo.image_height = image->GetHeight();
     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);
     jpeg_start_compress(&cinfo, TRUE);

-    
-    stride = cinfo.image_width * 3;    /* JSAMPLEs per row in image_buffer */
+
+    stride = cinfo.image_width * 3;    /* JSAMPLEs per row in image_buffer */

     image_buffer = image->GetData();
     while (cinfo.next_scanline < cinfo.image_height) {
         row_pointer[0] = &image_buffer[cinfo.next_scanline * stride];
     image_buffer = image->GetData();
     while (cinfo.next_scanline < cinfo.image_height) {
         row_pointer[0] = &image_buffer[cinfo.next_scanline * stride];


@@ -307,15 +345,26 @@ bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream )
     }
     jpeg_finish_compress(&cinfo);
     jpeg_destroy_compress(&cinfo);
     }
     jpeg_finish_compress(&cinfo);
     jpeg_destroy_compress(&cinfo);

-    
+

     return TRUE;
 }
     return TRUE;
 }

-#endif // wxUSE_STREAMS

 
 

-#endif
+#ifdef __VISUALC__
+    #pragma warning(default:4611)
+#endif /* VC++ */
+
+bool wxJPEGHandler::DoCanRead( wxInputStream& stream )
+{
+    unsigned char hdr[2];
+
+    stream.Read(&hdr, 2);
+    stream.SeekI(-2, wxFromCurrent);
+    return (hdr[0] == 0xFF && hdr[1] == 0xD8);
+}

 
 

-// wxUSE_LIBJPEG
+#endif   // wxUSE_STREAMS

 
 

+#endif   // wxUSE_LIBJPEG