Fix minor typo in wxDV_VERT_RULES documentation.

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

diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index f14027cb78d4bd0ed122b7e051eef07a2e646759..88bcb4f313d4cdd54a4f2cfb8d1141ea8b003639 100644 (file)
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -17,6 +17,7 @@
 #if wxUSE_IMAGE && wxUSE_LIBJPEG
 
 #include "wx/imagjpeg.h"
 #if wxUSE_IMAGE && wxUSE_LIBJPEG
 
 #include "wx/imagjpeg.h"

+#include "wx/versioninfo.h"

 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"


@@ -28,7 +29,7 @@
 
 // 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.
 
 // 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.
 //
 // 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.
 //


@@ -251,10 +252,12 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
        * We need to clean up the JPEG object, close the input file, and return.
        */
       if (verbose)
        * We need to clean up the JPEG object, close the input file, and return.
        */
       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);
       (cinfo.src->term_source)(&cinfo);
       jpeg_destroy_decompress(&cinfo);

-      if (image->Ok()) image->Destroy();
+      if (image->IsOk()) image->Destroy();

       return false;
     }
 
       return false;
     }
 


@@ -288,7 +291,7 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
     jpeg_start_decompress( &cinfo );
 
     image->Create( cinfo.output_width, cinfo.output_height );
     jpeg_start_decompress( &cinfo );
 
     image->Create( cinfo.output_width, cinfo.output_height );

-    if (!image->Ok()) {
+    if (!image->IsOk()) {

         jpeg_finish_decompress( &cinfo );
         jpeg_destroy_decompress( &cinfo );
         return false;
         jpeg_finish_decompress( &cinfo );
         jpeg_destroy_decompress( &cinfo );
         return false;


@@ -331,6 +334,13 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
         image->SetOption(wxIMAGE_OPTION_RESOLUTIONUNIT, cinfo.density_unit);
     }
 
         image->SetOption(wxIMAGE_OPTION_RESOLUTIONUNIT, cinfo.density_unit);
     }
 

+    if ( cinfo.image_width != cinfo.output_width || cinfo.image_height != cinfo.output_height )
+    {
+        // save the original image size
+        image->SetOption(wxIMAGE_OPTION_ORIGINAL_WIDTH, cinfo.image_width);
+        image->SetOption(wxIMAGE_OPTION_ORIGINAL_HEIGHT, cinfo.image_height);
+    }
+

     jpeg_finish_decompress( &cinfo );
     jpeg_destroy_decompress( &cinfo );
     return true;
     jpeg_finish_decompress( &cinfo );
     jpeg_destroy_decompress( &cinfo );
     return true;


@@ -421,7 +431,9 @@ bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
          * We need to clean up the JPEG object, close the input file, and return.
          */
          if (verbose)
          * We need to clean up the JPEG object, close the input file, and return.
          */
          if (verbose)

+         {

             wxLogError(_("JPEG: Couldn't save image."));
             wxLogError(_("JPEG: Couldn't save image."));

+         }

          jpeg_destroy_compress(&cinfo);
          return false;
     }
          jpeg_destroy_compress(&cinfo);
          return false;
     }


@@ -479,7 +491,7 @@ bool wxJPEGHandler::DoCanRead( wxInputStream& stream )
 {
     unsigned char hdr[2];
 
 {
     unsigned char hdr[2];
 

-    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )     // it's ok to modify the stream position here

         return false;
 
     return hdr[0] == 0xFF && hdr[1] == 0xD8;
         return false;
 
     return hdr[0] == 0xFF && hdr[1] == 0xD8;


@@ -487,4 +499,9 @@ bool wxJPEGHandler::DoCanRead( wxInputStream& stream )
 
 #endif   // wxUSE_STREAMS
 
 
 #endif   // wxUSE_STREAMS
 

+/*static*/ wxVersionInfo wxJPEGHandler::GetLibraryVersionInfo()
+{
+    return wxVersionInfo("libjpeg", JPEG_LIB_VERSION/10, JPEG_LIB_VERSION%10);
+}
+

 #endif   // wxUSE_LIBJPEG
 #endif   // wxUSE_LIBJPEG