From 0e4cbf40096b7137836f43bc61e2d2b6405639dc Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Thu, 15 Oct 2015 14:50:23 +0200 Subject: [PATCH] Custom libpng error handlers --- include/Core/PNG.h | 4 ++-- src/game/Core/PNG.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/Core/PNG.h b/include/Core/PNG.h index b36b444..ff45bb1 100644 --- a/include/Core/PNG.h +++ b/include/Core/PNG.h @@ -35,8 +35,8 @@ public: ~PNG(); private: - static void pngErrorFunction(); - static void pngWarningFunction(); + static void pngErrorFunction(png_structp png_ptr, png_const_charp error_msg); + static void pngWarningFunction(png_structp png_ptr, png_const_charp warning_msg); }; } diff --git a/src/game/Core/PNG.cpp b/src/game/Core/PNG.cpp index c72462b..7034559 100755 --- a/src/game/Core/PNG.cpp +++ b/src/game/Core/PNG.cpp @@ -112,12 +112,12 @@ dd::PNG::~PNG() } } -void dd::PNG::lpngErrorFunction() +void dd::PNG::pngErrorFunction(png_structp png_ptr, png_const_charp error_msg) { - + LOG_WARNING("%s", error_msg); } -void dd::PNG::lpngWarningFunction() +void dd::PNG::pngWarningFunction(png_structp png_ptr, png_const_charp warning_msg) { - + LOG_WARNING("%s", warning_msg); }