Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied patch 1411688

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-01-22 21:59:00 +00:00
parent dfea7acc19
commit ce61519034
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/imagpng.cpp
View File

@@ -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); 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 void
PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message) 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) ); 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" } // extern "C"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------