[Scummvm-git-logs] scummvm master -> 54c2b1aaec8373debdd6a96da7a9c505795ab3e5

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
54c2b1aaec IMAGE: Print source of callback messages. Change PNG warning into debug.


Commit: 54c2b1aaec8373debdd6a96da7a9c505795ab3e5
    https://github.com/scummvm/scummvm/commit/54c2b1aaec8373debdd6a96da7a9c505795ab3e5
Author: Paweł Kołodziejski (aquadran at users.sourceforge.net)
Date: 2021-02-13T12:31:16+01:00

Commit Message:
IMAGE: Print source of callback messages. Change PNG warning into debug.

Changed paths:
    image/jpeg.cpp
    image/png.cpp


diff --git a/image/jpeg.cpp b/image/jpeg.cpp
index 89e40ddf05..dabf7c8483 100644
--- a/image/jpeg.cpp
+++ b/image/jpeg.cpp
@@ -172,7 +172,7 @@ void errorExit(j_common_ptr cinfo) {
 	(*cinfo->err->format_message)(cinfo, buffer);
 	// This function is not allowed to return to the caller, thus we simply
 	// error out with our error handling here.
-	error("%s", buffer);
+	error("libjpeg: %s", buffer);
 }
 
 void outputMessage(j_common_ptr cinfo) {
diff --git a/image/png.cpp b/image/png.cpp
index 5a4fad2dab..734f2b0be3 100644
--- a/image/png.cpp
+++ b/image/png.cpp
@@ -34,6 +34,7 @@
 #include "graphics/pixelformat.h"
 #include "graphics/surface.h"
 
+#include "common/debug.h"
 #include "common/array.h"
 #include "common/stream.h"
 
@@ -73,11 +74,11 @@ Graphics::PixelFormat PNGDecoder::getByteOrderRgbaPixelFormat() const {
 #ifdef USE_PNG
 // libpng-error-handling:
 void pngError(png_structp pngptr, png_const_charp errorMsg) {
-	error("%s", errorMsg);
+	error("libpng: %s", errorMsg);
 }
 
 void pngWarning(png_structp pngptr, png_const_charp warningMsg) {
-	warning("%s", warningMsg);
+	debug(3, "libpng: %s", warningMsg);
 }
 
 // libpng-I/O-helpers: