X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4c2740ec0f18a2e657d53377031fc2dfce974f08..10d878a9ea0b6bf66c469afe265735721c81a1f7:/src/common/imagjpeg.cpp diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp index 776a84482b..4db84ee61b 100644 --- a/src/common/imagjpeg.cpp +++ b/src/common/imagjpeg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imagjpeg.cpp +// Name: src/common/imagjpeg.cpp // Purpose: wxImage JPEG handler // Author: Vaclav Slavik // RCS-ID: $Id$ @@ -7,33 +7,30 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "imagjpeg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#include "wx/defs.h" - #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" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" + #include "wx/intl.h" + #include "wx/bitmap.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__) || (defined(__WATCOMC__) && __WATCOMC__ < 1200)) +#if defined(__WXMSW__) && (defined(__MWERKS__) || defined(__DIGITALMARS__)) #define HAVE_BOOLEAN #include "wx/msw/wrapwin.h" #endif @@ -48,7 +45,6 @@ extern "C" #include "wx/filefn.h" #include "wx/wfstream.h" -#include "wx/intl.h" #include "wx/module.h" // For memcpy @@ -167,12 +163,22 @@ CPP_METHODDEF(void) wx_error_exit (j_common_ptr cinfo) /* Always display the message. */ /* We could postpone this until after returning, if we chose. */ - if (cinfo->err->output_message) (*cinfo->err->output_message) (cinfo); + (*cinfo->err->output_message) (cinfo); /* Return control to the setjmp point */ longjmp(myerr->setjmp_buffer, 1); } +/* + * This will replace the standard output_message method when the user + * wants us to be silent (verbose==false). We must have such method instead of + * simply using NULL for cinfo->err->output_message because it's called + * unconditionally from within libjpeg when there's "garbage input". + */ +CPP_METHODDEF(void) wx_ignore_message (j_common_ptr WXUNUSED(cinfo)) +{ +} + void wx_jpeg_io_src( j_decompress_ptr cinfo, wxInputStream& infile ) { wx_src_ptr src; @@ -195,6 +201,21 @@ void wx_jpeg_io_src( j_decompress_ptr cinfo, wxInputStream& infile ) src->pub.term_source = wx_term_source; } +static inline void wx_cmyk_to_rgb(unsigned char* rgb, const unsigned char* cmyk) +{ + register int k = 255 - cmyk[3]; + register int k2 = cmyk[3]; + register int c; + + c = k + k2 * (255 - cmyk[0]) / 255; + rgb[0] = (unsigned char)((c > 255) ? 0 : (255 - c)); + + c = k + k2 * (255 - cmyk[1]) / 255; + rgb[1] = (unsigned char)((c > 255) ? 0 : (255 - c)); + + c = k + k2 * (255 - cmyk[2]) / 255; + rgb[2] = (unsigned char)((c > 255) ? 0 : (255 - c)); +} // temporarily disable the warning C4611 (interaction between '_setjmp' and // C++ object destruction is non-portable) - I don't see any dtors here @@ -206,15 +227,14 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos { struct jpeg_decompress_struct cinfo; struct wx_error_mgr jerr; - JSAMPARRAY tempbuf; unsigned char *ptr; - unsigned stride; image->Destroy(); cinfo.err = jpeg_std_error( &jerr.pub ); jerr.pub.error_exit = wx_error_exit; - if (!verbose) cinfo.err->output_message=NULL; + if (!verbose) + cinfo.err->output_message = wx_ignore_message; /* Establish the setjmp return context for wx_error_exit to use. */ if (setjmp(jerr.setjmp_buffer)) { @@ -232,7 +252,19 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos jpeg_create_decompress( &cinfo ); wx_jpeg_io_src( &cinfo, stream ); jpeg_read_header( &cinfo, TRUE ); - cinfo.out_color_space = JCS_RGB; + + int bytesPerPixel; + if ((cinfo.out_color_space == JCS_CMYK) || (cinfo.out_color_space == JCS_YCCK)) + { + cinfo.out_color_space = JCS_CMYK; + bytesPerPixel = 4; + } + else // all the rest is treated as RGB + { + cinfo.out_color_space = JCS_RGB; + bytesPerPixel = 3; + } + jpeg_start_decompress( &cinfo ); image->Create( cinfo.image_width, cinfo.image_height ); @@ -243,15 +275,31 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos } image->SetMask( false ); ptr = image->GetData(); - 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 ) { + unsigned stride = cinfo.output_width * bytesPerPixel; + JSAMPARRAY 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 ); - ptr += stride; + if (cinfo.out_color_space == JCS_RGB) + { + memcpy( ptr, tempbuf[0], stride ); + ptr += stride; + } + else // CMYK + { + const unsigned char* inptr = (const unsigned char*) tempbuf[0]; + for (size_t i = 0; i < cinfo.output_width; i++) + { + wx_cmyk_to_rgb(ptr, inptr); + ptr += 3; + inptr += 4; + } + } } + jpeg_finish_decompress( &cinfo ); jpeg_destroy_decompress( &cinfo ); return true; @@ -327,7 +375,8 @@ bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo cinfo.err = jpeg_std_error(&jerr.pub); jerr.pub.error_exit = wx_error_exit; - if (!verbose) cinfo.err->output_message=NULL; + if (!verbose) + cinfo.err->output_message = wx_ignore_message; /* Establish the setjmp return context for wx_error_exit to use. */ if (setjmp(jerr.setjmp_buffer)) @@ -424,9 +473,3 @@ bool wxJPEGHandler::DoCanRead( wxInputStream& stream ) #endif // wxUSE_STREAMS #endif // wxUSE_LIBJPEG - - - - - -