diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-09-27 00:43:15 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-09-27 00:43:15 -0500 |
| commit | ad81c1f6d02d362df0747a8aebe20bdf7bf6d3d9 (patch) | |
| tree | 9bda95ccca6a8ea45734320126d6ecff82631524 | |
| parent | 078391d07776b101e80323b02214f66dd943c9dc (diff) | |
| download | tde-ad81c1f6d02d362df0747a8aebe20bdf7bf6d3d9.tar.gz tde-ad81c1f6d02d362df0747a8aebe20bdf7bf6d3d9.zip | |
Commit these two GIT hashes to the TQt4 branch
078391d07776b101e80323b02214f66dd943c9dc
437b7e59d85fffbd584ecdd50e9a52a5940e6414
| -rw-r--r-- | experimental/tqtinterface/qt4/plugins/src/inputmethods/xim/xim.pro | 1 | ||||
| -rw-r--r-- | experimental/tqtinterface/qt4/src/kernel/tqjpegio.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/experimental/tqtinterface/qt4/plugins/src/inputmethods/xim/xim.pro b/experimental/tqtinterface/qt4/plugins/src/inputmethods/xim/xim.pro index 9a65291f1..994f0d443 100644 --- a/experimental/tqtinterface/qt4/plugins/src/inputmethods/xim/xim.pro +++ b/experimental/tqtinterface/qt4/plugins/src/inputmethods/xim/xim.pro @@ -6,6 +6,7 @@ INCLUDEPATH += . CONFIG += qt warn_on debug plugin target.path += $$plugins.path/inputmethods INSTALLS += target +DEFINES += QT_NO_XINERAMA # Input HEADERS += qximinputcontext.h \ diff --git a/experimental/tqtinterface/qt4/src/kernel/tqjpegio.cpp b/experimental/tqtinterface/qt4/src/kernel/tqjpegio.cpp index dbaa301f9..1f3ffd88b 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqjpegio.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqjpegio.cpp @@ -203,13 +203,13 @@ void read_jpeg_image(TQImageIO* 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(TQ_OS_UNIXWARE) (void) jpeg_read_header(&cinfo, B_TRUE); |