X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02761f6cd478e3c2c97cf6f93442747f7b029833..76015a6bb79156d8af1b5e8b4b8e46b4e192d18f:/src/common/imagjpeg.cpp?ds=sidebyside diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp index 31e069e53a..88bcb4f313 100644 --- a/src/common/imagjpeg.cpp +++ b/src/common/imagjpeg.cpp @@ -17,6 +17,7 @@ #if wxUSE_IMAGE && wxUSE_LIBJPEG #include "wx/imagjpeg.h" +#include "wx/versioninfo.h" #ifndef WX_PRECOMP #include "wx/log.h" @@ -26,14 +27,15 @@ #include "wx/module.h" #endif -// 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,6 +46,10 @@ extern "C" #include "jpeglib.h" } +#ifndef HAVE_WXJPEG_BOOLEAN +typedef boolean wxjpeg_boolean; +#endif + #include "wx/filefn.h" #include "wx/wfstream.h" @@ -52,10 +58,6 @@ extern "C" // For JPEG library error handling #include -#ifdef __SALFORDC__ -#undef FAR -#endif - // ---------------------------------------------------------------------------- // types // ---------------------------------------------------------------------------- @@ -95,11 +97,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; @@ -144,14 +149,11 @@ CPP_METHODDEF(void) wx_term_source ( j_decompress_ptr cinfo ) // JPEG error manager: -struct wx_error_mgr { - struct jpeg_error_mgr pub; /* "public" fields */ - +struct wx_error_mgr : public jpeg_error_mgr +{ jmp_buf setjmp_buffer; /* for return to caller */ }; -typedef struct wx_error_mgr * wx_error_ptr; - /* * Here's the routine that will replace the standard error_exit method: */ @@ -159,14 +161,14 @@ typedef struct wx_error_mgr * wx_error_ptr; CPP_METHODDEF(void) wx_error_exit (j_common_ptr cinfo) { /* cinfo->err really points to a wx_error_mgr struct, so coerce pointer */ - wx_error_ptr myerr = (wx_error_ptr) cinfo->err; + wx_error_mgr * const jerr = (wx_error_mgr *) cinfo->err; /* Always display the message. */ /* We could postpone this until after returning, if we chose. */ (*cinfo->err->output_message) (cinfo); /* Return control to the setjmp point */ - longjmp(myerr->setjmp_buffer, 1); + longjmp(jerr->setjmp_buffer, 1); } /* @@ -201,6 +203,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]; @@ -225,13 +229,19 @@ static inline void wx_cmyk_to_rgb(unsigned char* rgb, const unsigned char* cmyk) bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) ) { + wxCHECK_MSG( image, false, "NULL image pointer" ); + struct jpeg_decompress_struct cinfo; - struct wx_error_mgr jerr; + wx_error_mgr jerr; unsigned char *ptr; + // save this before calling Destroy() + const unsigned maxWidth = image->GetOptionInt(wxIMAGE_OPTION_MAX_WIDTH), + maxHeight = image->GetOptionInt(wxIMAGE_OPTION_MAX_HEIGHT); image->Destroy(); - cinfo.err = jpeg_std_error( &jerr.pub ); - jerr.pub.error_exit = wx_error_exit; + + cinfo.err = jpeg_std_error( &jerr ); + jerr.error_exit = wx_error_exit; if (!verbose) cinfo.err->output_message = wx_ignore_message; @@ -242,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) + { wxLogError(_("JPEG: Couldn't load - file is probably corrupted.")); + } (cinfo.src->term_source)(&cinfo); jpeg_destroy_decompress(&cinfo); - if (image->Ok()) image->Destroy(); + if (image->IsOk()) image->Destroy(); return false; } @@ -265,10 +277,21 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos bytesPerPixel = 3; } + // scale the picture to fit in the specified max size if necessary + if ( maxWidth > 0 || maxHeight > 0 ) + { + unsigned& scale = cinfo.scale_denom; + while ( (maxWidth && (cinfo.image_width / scale > maxWidth)) || + (maxHeight && (cinfo.image_height / scale > maxHeight)) ) + { + scale *= 2; + } + } + jpeg_start_decompress( &cinfo ); - image->Create( cinfo.image_width, cinfo.image_height ); - if (!image->Ok()) { + image->Create( cinfo.output_width, cinfo.output_height ); + if (!image->IsOk()) { jpeg_finish_decompress( &cinfo ); jpeg_destroy_decompress( &cinfo ); return false; @@ -300,6 +323,24 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos } } + // set up resolution if available: it's part of optional JFIF APP0 chunk + if ( cinfo.saw_JFIF_marker ) + { + image->SetOption(wxIMAGE_OPTION_RESOLUTIONX, cinfo.X_density); + image->SetOption(wxIMAGE_OPTION_RESOLUTIONY, cinfo.Y_density); + + // we use the same values for this option as libjpeg so we don't need + // any conversion here + 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; @@ -316,6 +357,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; @@ -328,7 +372,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; @@ -364,16 +408,18 @@ 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; - struct wx_error_mgr jerr; + wx_error_mgr jerr; JSAMPROW row_pointer[1]; /* pointer to JSAMPLE row[s] */ JSAMPLE *image_buffer; int stride; /* physical row width in image buffer */ - cinfo.err = jpeg_std_error(&jerr.pub); - jerr.pub.error_exit = wx_error_exit; + cinfo.err = jpeg_std_error(&jerr); + jerr.error_exit = wx_error_exit; if (!verbose) cinfo.err->output_message = wx_ignore_message; @@ -385,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) + { wxLogError(_("JPEG: Couldn't save image.")); + } jpeg_destroy_compress(&cinfo); return false; } @@ -409,37 +457,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); @@ -464,7 +491,7 @@ bool wxJPEGHandler::DoCanRead( wxInputStream& stream ) { 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; @@ -472,4 +499,9 @@ bool wxJPEGHandler::DoCanRead( wxInputStream& stream ) #endif // wxUSE_STREAMS +/*static*/ wxVersionInfo wxJPEGHandler::GetLibraryVersionInfo() +{ + return wxVersionInfo("libjpeg", JPEG_LIB_VERSION/10, JPEG_LIB_VERSION%10); +} + #endif // wxUSE_LIBJPEG