/////////////////////////////////////////////////////////////////////////////
-// Name: imagjpeg.cpp
+// Name: src/common/imagjpeg.cpp
// Purpose: wxImage JPEG handler
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Copyright: (c) Vaclav Slavik
-// Licence: wxWidgets licence
+// 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"
-
-// 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))
+
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+ #include "wx/app.h"
+ #include "wx/intl.h"
+ #include "wx/bitmap.h"
+ #include "wx/module.h"
+#endif
+
+// 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"
#include "jpeglib.h"
}
+#ifndef HAVE_WXJPEG_BOOLEAN
+typedef boolean wxjpeg_boolean;
+#endif
+
#include "wx/filefn.h"
#include "wx/wfstream.h"
-#include "wx/intl.h"
-#include "wx/module.h"
// For memcpy
#include <string.h>
// For JPEG library error handling
#include <setjmp.h>
-#ifdef __SALFORDC__
-#undef FAR
-#endif
-
// ----------------------------------------------------------------------------
// types
// ----------------------------------------------------------------------------
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;
// 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:
*/
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. */
- 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);
+ longjmp(jerr->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 )
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];
+ 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
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;
- JSAMPARRAY tempbuf;
+ wx_error_mgr jerr;
unsigned char *ptr;
- unsigned stride;
+ // 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;
- if (!verbose) cinfo.err->output_message=NULL;
+ cinfo.err = jpeg_std_error( &jerr );
+ jerr.error_exit = wx_error_exit;
+
+ 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)) {
(cinfo.src->term_source)(&cinfo);
jpeg_destroy_decompress(&cinfo);
if (image->Ok()) image->Destroy();
- return FALSE;
+ return false;
}
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;
+ }
+
+ // 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 );
+ image->Create( cinfo.output_width, cinfo.output_height );
if (!image->Ok()) {
jpeg_finish_decompress( &cinfo );
jpeg_destroy_decompress( &cinfo );
- return FALSE;
+ return false;
}
- image->SetMask( FALSE );
+ 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;
+ }
+ }
}
+
+ // 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);
+ }
+
jpeg_finish_decompress( &cinfo );
jpeg_destroy_decompress( &cinfo );
- return TRUE;
+ return true;
}
typedef struct {
#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;
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;
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=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))
if (verbose)
wxLogError(_("JPEG: Couldn't save image."));
jpeg_destroy_compress(&cinfo);
- return FALSE;
+ return false;
}
jpeg_create_compress(&cinfo);
// '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);
- // sets the resolution fields in the output file
- if (image->HasOption(wxIMAGE_OPTION_RESOLUTION))
+ // set the resolution fields in the output file
+ int resX, resY;
+ wxImageResolution res = GetResolutionFromOptions(*image, &resX, &resY);
+ if ( res != wxIMAGE_RESOLUTION_NONE )
{
- 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))
- {
- cinfo.density_unit = 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);
jpeg_finish_compress(&cinfo);
jpeg_destroy_compress(&cinfo);
- return TRUE;
+ return true;
}
#ifdef __VISUALC__
unsigned char hdr[2];
if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
- return FALSE;
+ return false;
return hdr[0] == 0xFF && hdr[1] == 0xD8;
}
#endif // wxUSE_STREAMS
#endif // wxUSE_LIBJPEG
-
-
-
-
-
-
projects / wxWidgets.git / blobdiff