/////////////////////////////////////////////////////////////////////////////
-// Name: imagjpeg.cpp
+// Name: src/common/imagjpeg.cpp
// Purpose: wxImage JPEG handler
// Author: Vaclav Slavik
// RCS-ID: $Id$
// 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
#include "wx/filefn.h"
#include "wx/wfstream.h"
-#include "wx/intl.h"
#include "wx/module.h"
// For memcpy
/* 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;
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
{
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)) {
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 );
}
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;
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))
// '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);
+ if (image->HasOption(wxIMAGE_OPTION_QUALITY))
+ 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;
+ }
- // sets the resolution fields in the output file
- if (image->HasOption(wxIMAGE_OPTION_RESOLUTION))
+ if ( resX && resY )
{
- cinfo.X_density =
- cinfo.Y_density = image->GetOptionInt(wxIMAGE_OPTION_RESOLUTION);
+ 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))
+ if ( image->HasOption(wxIMAGE_OPTION_RESOLUTIONUNIT) )
{
- cinfo.density_unit = image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONUNIT);
+ cinfo.density_unit = (UINT8)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONUNIT);
}
jpeg_start_compress(&cinfo, TRUE);
#endif // wxUSE_STREAMS
#endif // wxUSE_LIBJPEG
-
-
-
-
-
-
projects / wxWidgets.git / blobdiff