fixed __FUNCTION__ use in Unicode build (it's a variable, not a macro)

[wxWidgets.git] / src / common / imagpng.cpp

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index fcb4b0a0e6eb9c0d1a0c1c0d03af2595388c4157..98d19795727299251c4dc45607d47d0cd47e4364 100644 (file)
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -168,14 +168,6 @@ void PNGLINKAGEMODE wx_PNG_stream_writer( png_structp png_ptr, png_bytep data,
     WX_PNG_INFO(png_ptr)->stream.out->Write(data, length);
 }
 
-// from pngerror.c
-// so that the libpng doesn't send anything on stderr
-void
-PNGLINKAGEMODE wx_png_error(png_structp WXUNUSED(png_ptr), png_const_charp message)
-{
-    wxLogFatalError( wxString::FromAscii(message) );
-}
-
 void
 PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message)
 {
@@ -184,6 +176,17 @@ PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message)
         wxLogWarning( wxString::FromAscii(message) );
 }
 
+// from pngerror.c
+// so that the libpng doesn't send anything on stderr
+void
+PNGLINKAGEMODE wx_png_error(png_structp WXUNUSED(png_ptr), png_const_charp message)
+{
+    // JS: deliver it to wx_png_warning and don't perform any more actions:
+    // libpng will jump back to the calling function (LoadFile and SaveFile)
+    // and allow it to handle the error
+    wx_png_warning(NULL, message);
+}
+
 } // extern "C"
 
 // ----------------------------------------------------------------------------