X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3daed0276256f54a82f4f4c028bc69f66a7b47b..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/common/imagpng.cpp?ds=sidebyside diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index a2f0c435ed..132655980c 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -278,7 +278,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,7 +324,7 @@ 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 (( !image->HasMask() ) || \ + if (( !image->HasMask() ) || \ (data[(x << 2) + 0] != image->GetMaskRed()) || \ (data[(x << 2) + 1] != image->GetMaskGreen()) || \ (data[(x << 2) + 2] != image->GetMaskBlue())) @@ -347,7 +347,7 @@ 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];