diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-09-27 00:08:59 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-09-27 00:08:59 -0500 |
| commit | 437b7e59d85fffbd584ecdd50e9a52a5940e6414 (patch) | |
| tree | 8fd38cd92a2f17f17d2c25ee0c75d9bcc9ca7fef | |
| parent | d89ad4b5ec2547b3a54c04bb55553756abc63178 (diff) | |
| download | tde-437b7e59d85fffbd584ecdd50e9a52a5940e6414.tar.gz tde-437b7e59d85fffbd584ecdd50e9a52a5940e6414.zip | |
Fix Qt3 libjpeg silent crash if compiled library version does not match the shared library version present on the local system
Thanks to "Fat-Zer" for the patch!
| -rw-r--r-- | main/dependencies/qt3/src/kernel/qjpegio.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/dependencies/qt3/src/kernel/qjpegio.cpp b/main/dependencies/qt3/src/kernel/qjpegio.cpp index 2c7556eea..5d2a1b18f 100644 --- a/main/dependencies/qt3/src/kernel/qjpegio.cpp +++ b/main/dependencies/qt3/src/kernel/qjpegio.cpp @@ -203,13 +203,13 @@ void read_jpeg_image(QImageIO* iio) struct my_jpeg_source_mgr *iod_src = new my_jpeg_source_mgr(iio); struct my_error_mgr jerr; + cinfo.err = jpeg_std_error(&jerr); + jerr.error_exit = my_error_exit; + jpeg_create_decompress(&cinfo); cinfo.src = iod_src; - cinfo.err = jpeg_std_error(&jerr); - jerr.error_exit = my_error_exit; - if (!setjmp(jerr.setjmp_buffer)) { #if defined(Q_OS_UNIXWARE) (void) jpeg_read_header(&cinfo, B_TRUE); |