summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Fedin <fedin-ilja2010@ya.ru>2023-01-29 19:58:45 +0400
committerIlya Fedin <fedin-ilja2010@ya.ru>2023-01-31 22:15:58 +0400
commitfe90f8aa45e792c386b1cba7121e58e3402a9a5d (patch)
treeeafd75c519f4f668e9e6149c7146259a3ff6b425
parent3575d2d02861771f209e0af645cceb3ca369420c (diff)
jpeg handler: log error message on fatal error
Original libjpeg's handler has output_message call. As Qt doesn't have it, it logs non-fatal error, but skips the fatal ones which are likely more important to be logged than the non-fatal ones. Pick-to: 6.5 Change-Id: Iebb94db4d56705322e7569445d240ca4a7ed8f4a Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
-rw-r--r--src/plugins/imageformats/jpeg/qjpeghandler.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
index 4e59ccb534..0d72ba01d0 100644
--- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp
+++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
@@ -49,6 +49,7 @@ extern "C" {
static void my_error_exit (j_common_ptr cinfo)
{
+ (*cinfo->err->output_message)(cinfo);
my_error_mgr* myerr = (my_error_mgr*) cinfo->err;
longjmp(myerr->setjmp_buffer, 1);
}