AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redirect libjpeg messages via qWarning

Browse Source 
This allows us to catch spurious libjpeg warnings via the installation of a
message handler

Change-Id: I82f3257118b5fbdf66550be80e72f75e9a24d3c1
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Donald Carr 2012-02-14 21:55:48 +00:00 committed by Qt by Nokia
parent 6a5d1370b3
commit b9eb3715f5
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/image/qjpeghandler.cpp
View File

@ -106,6 +106,13 @@ static void my_error_exit (j_common_ptr cinfo)
longjmp(myerr->setjmp_buffer, 1);
}
static void my_output_message(j_common_ptr cinfo)
{
char buffer[JMSG_LENGTH_MAX];
(*cinfo->err->format_message)(cinfo, buffer);
qWarning("%s", buffer);
}
#if defined(Q_C_CALLBACKS)
}
#endif
@ -530,6 +537,7 @@ static bool write_jpeg_image(const QImage &image, QIODevice *device, int sourceQ
cinfo.err = jpeg_std_error(&jerr);
jerr.error_exit = my_error_exit;
jerr.output_message = my_output_message;
if (!setjmp(jerr.setjmp_buffer)) {
// WARNING:
@ -744,6 +752,7 @@ bool QJpegHandlerPrivate::readJpegHeader(QIODevice *device)
info.src = iod_src;
info.err = jpeg_std_error(&err);
err.error_exit = my_error_exit;
err.output_message = my_output_message;
if (!setjmp(err.setjmp_buffer)) {
#if defined(Q_OS_UNIXWARE)