#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__))
+
+#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>
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;
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
{
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 );
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;
#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;
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