X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..4f9297b0eead20a0bfee71df18e0d8f0cbc402fb:/src/common/imagjpeg.cpp?ds=inline diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp index 245f8d911c..f985604631 100644 --- a/src/common/imagjpeg.cpp +++ b/src/common/imagjpeg.cpp @@ -7,10 +7,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -/* - We don't put pragma implement in this file because it is already present in - src/common/image.cpp -*/ +#ifdef __GNUG__ +#pragma implementation "imagjpeg.h" +#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -23,13 +22,16 @@ #if wxUSE_LIBJPEG -#include "wx/image.h" +#include "wx/imagjpeg.h" #include "wx/bitmap.h" #include "wx/debug.h" #include "wx/log.h" #include "wx/app.h" extern "C" { +#ifdef __WATCOMC__ + #define HAVE_BOOLEAN +#endif #include "jpeglib.h" } #include "wx/filefn.h" @@ -62,10 +64,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxJPEGHandler,wxImageHandler) //------------- JPEG Data Source Manager +#define JPEG_IO_BUFFER_SIZE 2048 + typedef struct { struct jpeg_source_mgr pub; /* public fields */ JOCTET* buffer; /* start of buffer */ + wxInputStream *stream; } my_source_mgr; typedef my_source_mgr * my_src_ptr; @@ -74,24 +79,46 @@ METHODDEF(void) my_init_source ( j_decompress_ptr WXUNUSED(cinfo) ) { } -METHODDEF(boolean) my_fill_input_buffer ( j_decompress_ptr WXUNUSED(cinfo) ) +METHODDEF(boolean) my_fill_input_buffer ( j_decompress_ptr cinfo ) { + my_src_ptr src = (my_src_ptr) cinfo->src; + + src->pub.next_input_byte = src->buffer; + src->pub.bytes_in_buffer = src->stream->Read(src->buffer, JPEG_IO_BUFFER_SIZE).LastRead(); + + if (src->pub.bytes_in_buffer == 0) // check for end-of-stream + { + // Insert a fake EOI marker + src->buffer[0] = 0xFF; + src->buffer[1] = JPEG_EOI; + src->pub.bytes_in_buffer = 2; + } return TRUE; } METHODDEF(void) my_skip_input_data ( j_decompress_ptr cinfo, long num_bytes ) { - my_src_ptr src = (my_src_ptr) cinfo->src; - - src->pub.next_input_byte += (size_t) num_bytes; - src->pub.bytes_in_buffer -= (size_t) num_bytes; + if (num_bytes > 0) + { + my_src_ptr src = (my_src_ptr) cinfo->src; + + while (num_bytes > (long)src->pub.bytes_in_buffer) + { + num_bytes -= (long) src->pub.bytes_in_buffer; + src->pub.fill_input_buffer(cinfo); + } + src->pub.next_input_byte += (size_t) num_bytes; + src->pub.bytes_in_buffer -= (size_t) num_bytes; + } } METHODDEF(void) my_term_source ( j_decompress_ptr cinfo ) { my_src_ptr src = (my_src_ptr) cinfo->src; - free (src->buffer); + if (src->pub.bytes_in_buffer > 0) + src->stream->SeekI(-(long)src->pub.bytes_in_buffer, wxFromCurrent); + delete[] src->buffer; } void jpeg_wxio_src( j_decompress_ptr cinfo, wxInputStream& infile ) @@ -105,10 +132,10 @@ void jpeg_wxio_src( j_decompress_ptr cinfo, wxInputStream& infile ) src = (my_src_ptr) cinfo->src; } src = (my_src_ptr) cinfo->src; - src->pub.bytes_in_buffer = infile.GetSize(); /* forces fill_input_buffer on first read */ - src->buffer = (JOCTET *) malloc (infile.GetSize()); - src->pub.next_input_byte = src->buffer; /* until buffer loaded */ - infile.Read(src->buffer, infile.GetSize()); + src->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */ + src->buffer = new JOCTET[JPEG_IO_BUFFER_SIZE]; + src->pub.next_input_byte = NULL; /* until buffer loaded */ + src->stream = &infile; src->pub.init_source = my_init_source; src->pub.fill_input_buffer = my_fill_input_buffer; @@ -146,7 +173,11 @@ my_error_exit (j_common_ptr cinfo) longjmp(myerr->setjmp_buffer, 1); } - +// temporarily disable the warning C4611 (interaction between '_setjmp' and +// C++ object destruction is non-portable) - I don't see any dtors here +#ifdef __VISUALC__ + #pragma warning(disable:4611) +#endif /* VC++ */ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) ) { @@ -202,10 +233,6 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos return TRUE; } - - - - typedef struct { struct jpeg_destination_mgr pub; @@ -298,6 +325,16 @@ bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo cinfo.input_components = 3; cinfo.in_color_space = JCS_RGB; jpeg_set_defaults(&cinfo); + + // TODO: 3rd parameter is force_baseline, what value should this be? + // Code says: "If force_baseline is TRUE, the computed quantization table entries + // are limited to 1..255 for JPEG baseline compatibility." + // '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); + jpeg_start_compress(&cinfo, TRUE); stride = cinfo.image_width * 3; /* JSAMPLEs per row in image_buffer */ @@ -312,6 +349,9 @@ bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo return TRUE; } +#ifdef __VISUALC__ + #pragma warning(default:4611) +#endif /* VC++ */ bool wxJPEGHandler::DoCanRead( wxInputStream& stream ) {