#include "wx/module.h"
#endif
-// NB: Some compilers define boolean type in Windows headers
-// (e.g. Watcom C++, but not some Open Watcom versions).
-// 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__) && !wxONLY_WATCOM_EARLIER_THAN(1,6)))
+// 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"
// 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 : 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. */
(*cinfo->err->output_message) (cinfo);
/* Return control to the setjmp point */
- longjmp(myerr->setjmp_buffer, 1);
+ longjmp(jerr->setjmp_buffer, 1);
}
/*
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];
bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )
{
struct jpeg_decompress_struct cinfo;
- struct wx_error_mgr jerr;
+ wx_error_mgr jerr;
unsigned char *ptr;
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;
}
}
+ // 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;
#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 = wx_ignore_message;
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);
projects / wxWidgets.git / blobdiff