From 218de4b02eedfa076bf0bfc1e6420b440fea05c6 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Thu, 15 Oct 2015 14:47:08 +0200 Subject: [PATCH] Custom error functions for PNG --- include/Core/PNG.h | 4 ++++ src/game/Core/PNG.cpp | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/include/Core/PNG.h b/include/Core/PNG.h index 994a5bc..b36b444 100644 --- a/include/Core/PNG.h +++ b/include/Core/PNG.h @@ -33,6 +33,10 @@ class PNG : public Image public: PNG(std::string path); ~PNG(); + +private: + static void pngErrorFunction(); + static void pngWarningFunction(); }; } diff --git a/src/game/Core/PNG.cpp b/src/game/Core/PNG.cpp index a295f03..c72462b 100755 --- a/src/game/Core/PNG.cpp +++ b/src/game/Core/PNG.cpp @@ -37,7 +37,7 @@ dd::PNG::PNG(std::string path) } // Initialize libpng - png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); + png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, (png_error_ptr)&PNG::pngErrorFunction, (png_error_ptr)&PNG::pngErrorFunction); if (!png_ptr) { LOG_ERROR("libpng: Failed to initialze png_struct"); png_destroy_read_struct(&png_ptr, nullptr, nullptr); @@ -110,4 +110,14 @@ dd::PNG::~PNG() if (Data) { delete[] Data; } -} \ No newline at end of file +} + +void dd::PNG::lpngErrorFunction() +{ + +} + +void dd::PNG::lpngWarningFunction() +{ + +}