Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inherit wx_error_mgr from jpeg_error_mgr instead of embedding the latter in the former (part of #9803)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-01 14:29:33 +00:00
parent b97d1013cf
commit 87d4e2710b
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/common/imagjpeg.cpp
View File

@@ -148,14 +148,11 @@ CPP_METHODDEF(void) wx_term_source ( j_decompress_ptr cinfo )
// JPEG error manager: // JPEG error manager:
struct wx_error_mgr { struct wx_error_mgr : jpeg_error_mgr
struct jpeg_error_mgr pub; /* "public" fields */ {
jmp_buf setjmp_buffer; /* for return to caller */ 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: * Here's the routine that will replace the standard error_exit method:
*/ */
@@ -163,14 +160,14 @@ typedef struct wx_error_mgr * wx_error_ptr;
CPP_METHODDEF(void) wx_error_exit (j_common_ptr cinfo) CPP_METHODDEF(void) wx_error_exit (j_common_ptr cinfo)
{ {
/* cinfo->err really points to a wx_error_mgr struct, so coerce pointer */ /* 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. */ /* Always display the message. */
/* We could postpone this until after returning, if we chose. */ /* We could postpone this until after returning, if we chose. */
(*cinfo->err->output_message) (cinfo); (*cinfo->err->output_message) (cinfo);
/* Return control to the setjmp point */ /* Return control to the setjmp point */
longjmp(myerr->setjmp_buffer, 1); longjmp(jerr->setjmp_buffer, 1);
} }
/* /*
@@ -232,12 +229,12 @@ static inline void wx_cmyk_to_rgb(unsigned char* rgb, const unsigned char* cmyk)
bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) ) bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )
{ {
struct jpeg_decompress_struct cinfo; struct jpeg_decompress_struct cinfo;
struct wx_error_mgr jerr; wx_error_mgr jerr;
unsigned char *ptr; unsigned char *ptr;
image->Destroy(); image->Destroy();
cinfo.err = jpeg_std_error( &jerr.pub ); cinfo.err = jpeg_std_error( &jerr );
jerr.pub.error_exit = wx_error_exit; jerr.error_exit = wx_error_exit;
if (!verbose) if (!verbose)
cinfo.err->output_message = wx_ignore_message; cinfo.err->output_message = wx_ignore_message;
@@ -389,13 +386,13 @@ GLOBAL(void) wx_jpeg_io_dest (j_compress_ptr cinfo, wxOutputStream& outfile)
bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose ) bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )
{ {
struct jpeg_compress_struct cinfo; struct jpeg_compress_struct cinfo;
struct wx_error_mgr jerr; wx_error_mgr jerr;
JSAMPROW row_pointer[1]; /* pointer to JSAMPLE row[s] */ JSAMPROW row_pointer[1]; /* pointer to JSAMPLE row[s] */
JSAMPLE *image_buffer; JSAMPLE *image_buffer;
int stride; /* physical row width in image buffer */ int stride; /* physical row width in image buffer */
cinfo.err = jpeg_std_error(&jerr.pub); cinfo.err = jpeg_std_error(&jerr);
jerr.pub.error_exit = wx_error_exit; jerr.error_exit = wx_error_exit;
if (!verbose) if (!verbose)
cinfo.err->output_message = wx_ignore_message; cinfo.err->output_message = wx_ignore_message;