X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ab6ee851ebc3200fa7d40381a06d27b4fac61d1..acc0ebd7a871124d4d6b36069340227e6c584f38:/src/common/imagpng.cpp?ds=inline diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 1815bcb1ba..cbbc10b261 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -7,10 +7,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -/* - We don't put pragma implement in this file because it is already present in - src/common/image.cpp -*/ +#ifdef __GNUG__ +#pragma implementation "imagpng.h" +#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -23,9 +22,9 @@ #include "wx/defs.h" #endif -#if wxUSE_LIBPNG +#if wxUSE_IMAGE && wxUSE_LIBPNG -#include "wx/image.h" +#include "wx/imagpng.h" #include "wx/bitmap.h" #include "wx/debug.h" #include "wx/log.h" @@ -53,24 +52,24 @@ // wxPNGHandler //----------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler) -#endif #if wxUSE_LIBPNG #if defined(__VISAGECPP__) -#define LINKAGEMODE _Optlink +#define PNGLINKAGEMODE _Optlink +#elif defined(__WATCOMC__) +#define PNGLINKAGEMODE _cdecl #else -#define LINKAGEMODE +#define PNGLINKAGEMODE #endif -static void LINKAGEMODE _PNG_stream_reader( png_structp png_ptr, png_bytep data, png_size_t length ) +static void PNGLINKAGEMODE _PNG_stream_reader( png_structp png_ptr, png_bytep data, png_size_t length ) { ((wxInputStream*) png_get_io_ptr( png_ptr )) -> Read(data, length); } -static void LINKAGEMODE _PNG_stream_writer( png_structp png_ptr, png_bytep data, png_size_t length ) +static void PNGLINKAGEMODE _PNG_stream_writer( png_structp png_ptr, png_bytep data, png_size_t length ) { ((wxOutputStream*) png_get_io_ptr( png_ptr )) -> Write(data, length); } @@ -78,7 +77,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 -LINKAGEMODE png_silent_error(png_structp png_ptr, png_const_charp WXUNUSED(message)) +PNGLINKAGEMODE png_silent_error(png_structp png_ptr, png_const_charp WXUNUSED(message)) { #ifdef USE_FAR_KEYWORD { @@ -92,11 +91,17 @@ LINKAGEMODE png_silent_error(png_structp png_ptr, png_const_charp WXUNUSED(messa } void -LINKAGEMODE png_silent_warning(png_structp WXUNUSED(png_ptr), png_const_charp WXUNUSED(message)) +PNGLINKAGEMODE png_silent_warning(png_structp WXUNUSED(png_ptr), png_const_charp WXUNUSED(message)) { } -bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose) +// temporarily disable the warning C4611 (interaction between '_setjmp' and +// C++ object destruction is non-portable) - I don't see any dtors here +#ifdef __VISUALC__ + #pragma warning(disable:4611) +#endif /* VC++ */ + +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...) @@ -144,18 +149,18 @@ bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose png_set_expand( png_ptr ); png_set_filler( png_ptr, 0xff, PNG_FILLER_AFTER ); - image->Create( width, height ); + image->Create( (int)width, (int)height ); if (!image->Ok()) goto error_nolines; - lines = (unsigned char **)malloc( height * sizeof(unsigned char *) ); + lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned char *)) ); if (lines == NULL) goto error_nolines; for (i = 0; i < height; i++) { - if ((lines[i] = (unsigned char *)malloc(width * (sizeof(unsigned char) * 4))) == NULL) + if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL) { for ( unsigned int n = 0; n < i; n++ ) free( lines[n] ); @@ -167,6 +172,7 @@ bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose { int transp = 0; png_read_image( png_ptr, lines ); + png_read_end( png_ptr, info_ptr ); png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL ); unsigned char *ptr = image->GetData(); if ((color_type == PNG_COLOR_TYPE_GRAY) || @@ -243,7 +249,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() ) { @@ -268,7 +275,6 @@ bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose return FALSE; } - bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose ) { { @@ -278,7 +284,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 +330,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,11 +353,15 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos return TRUE; } -bool wxPNGHandler::CanRead( wxInputStream& stream ) +#ifdef __VISUALC__ + #pragma warning(default:4611) +#endif /* VC++ */ + +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'); }