Commit these two GIT hashes to the TQt4 branch

078391d077
437b7e59d8
v3.5.13-sru
Timothy Pearson 13 years ago
parent 078391d077
commit ad81c1f6d0

@ -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 \

@ -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);

Loading…
Cancel
Save