X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0828c0875e1516e4bfc0aa5b0a84195a2ac92cca..696e1ea0b7cee1394693a0e507bbf49c9863952b:/src/common/imagpng.cpp diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 7609aae068..898bc0e522 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -57,7 +57,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler) #endif -#if wxUSE_STREAMS +#if wxUSE_LIBPNG #if defined(__VISAGECPP__) #define LINKAGEMODE _Optlink @@ -78,7 +78,7 @@ static void LINKAGEMODE _PNG_stream_writer( png_structp png_ptr, png_bytep data, // from pngerror.c // so that the libpng doesn't send anything on stderr void -png_silent_error(png_structp png_ptr, png_const_charp WXUNUSED(message)) +LINKAGEMODE png_silent_error(png_structp png_ptr, png_const_charp WXUNUSED(message)) { #ifdef USE_FAR_KEYWORD { @@ -92,11 +92,11 @@ png_silent_error(png_structp png_ptr, png_const_charp WXUNUSED(message)) } void -png_silent_warning(png_structp WXUNUSED(png_ptr), png_const_charp WXUNUSED(message)) +LINKAGEMODE png_silent_warning(png_structp WXUNUSED(png_ptr), png_const_charp WXUNUSED(message)) { } -bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose) +bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) ) { // VZ: as this function uses setjmp() the only fool proof error handling // method is to use goto (setjmp is not really C++ dtors friendly...) @@ -243,7 +243,8 @@ bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose error_nolines: lines = NULL; // called from before it was set error: - wxLogError(_("Couldn't load a PNG image - probably file is corrupted.")); + if (verbose) + wxLogError(_("Couldn't load a PNG image - file is corrupted or not enough memory.")); if ( image->Ok() ) { @@ -278,7 +279,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos return FALSE; } - if (!verbose) png_set_error_fn(png_ptr, (png_voidp)NULL, png_silent_error, png_silent_warning); + if (!verbose) png_set_error_fn(png_ptr, (png_voidp)NULL, png_silent_error, png_silent_warning); png_infop info_ptr = png_create_info_struct(png_ptr); if (info_ptr == NULL) @@ -324,15 +325,16 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos data[(x << 2) + 0] = *ptr++; data[(x << 2) + 1] = *ptr++; data[(x << 2) + 2] = *ptr++; - if ((data[(x << 2) + 0] == image->GetMaskRed()) && - (data[(x << 2) + 1] == image->GetMaskGreen()) && - (data[(x << 2) + 2] == image->GetMaskBlue())) + if (( !image->HasMask() ) || \ + (data[(x << 2) + 0] != image->GetMaskRed()) || \ + (data[(x << 2) + 1] != image->GetMaskGreen()) || \ + (data[(x << 2) + 2] != image->GetMaskBlue())) { - data[(x << 2) + 3] = 0; + data[(x << 2) + 3] = 255; } else { - data[(x << 2) + 3] = 255; + data[(x << 2) + 3] = 0; } } png_bytep row_ptr = data; @@ -346,18 +348,15 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos return TRUE; } -bool wxPNGHandler::CanRead( wxInputStream& stream ) +bool wxPNGHandler::DoCanRead( wxInputStream& stream ) { unsigned char hdr[4]; - - stream.Read(&hdr, 4); + + stream.Read(&hdr, 4); stream.SeekI(-4, wxFromCurrent); return (hdr[0] == 0x89 && hdr[1] == 'P' && hdr[2] == 'N' && hdr[3] == 'G'); } -#endif - // wxUSE_STREAMS - -#endif - // wxUSE_LIBPNG +#endif // wxUSE_STREAMS +#endif // wxUSE_LIBPNG