X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/95ee0ac83bdbd235d2094bd4e638a9dfd49f5583..4f9297b0eead20a0bfee71df18e0d8f0cbc402fb:/src/common/imagpng.cpp diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 11655cf352..8272a0d383 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -7,30 +7,29 @@ // 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 "image.h" +#pragma implementation "imagpng.h" #endif -*/ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop +#endif + +#ifndef WX_PRECOMP + #include "wx/defs.h" #endif -#include "wx/image.h" +#if wxUSE_LIBPNG + +#include "wx/imagpng.h" #include "wx/bitmap.h" #include "wx/debug.h" #include "wx/log.h" #include "wx/app.h" -#if wxUSE_LIBPNG -#include "../png/png.h" -#endif +#include "png.h" #include "wx/filefn.h" #include "wx/wfstream.h" #include "wx/intl.h" @@ -53,92 +52,125 @@ // wxPNGHandler //----------------------------------------------------------------------------- +IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler) + #if wxUSE_LIBPNG -#if !USE_SHARED_LIBRARIES -IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler) +#if defined(__VISAGECPP__) +#define LINKAGEMODE _Optlink +#else +#define LINKAGEMODE #endif - -#if wxUSE_STREAMS -static void _PNG_stream_reader( png_structp png_ptr, png_bytep data, png_size_t length ) +static void LINKAGEMODE _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 _PNG_stream_writer( png_structp png_ptr, png_bytep data, png_size_t length ) +static void LINKAGEMODE _PNG_stream_writer( png_structp png_ptr, png_bytep data, png_size_t length ) { ((wxOutputStream*) png_get_io_ptr( png_ptr )) -> Write(data, length); } -bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream ) +// 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)) +{ +#ifdef USE_FAR_KEYWORD + { + jmp_buf jmpbuf; + png_memcpy(jmpbuf,png_ptr->jmpbuf,sizeof(jmp_buf)); + longjmp(jmpbuf, 1); + } +#else + longjmp(png_ptr->jmpbuf, 1); +#endif +} + +void +LINKAGEMODE png_silent_warning(png_structp WXUNUSED(png_ptr), png_const_charp WXUNUSED(message)) +{ +} + +// 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...) - + unsigned char **lines; unsigned int i; png_infop info_ptr = (png_infop) NULL; - + image->Destroy(); - + png_structp png_ptr = png_create_read_struct( PNG_LIBPNG_VER_STRING, (voidp) NULL, (png_error_ptr) NULL, (png_error_ptr) NULL ); if (!png_ptr) goto error_nolines; - + + // the file example.c explain how to guess if the stream is a png image + if (!verbose) png_set_error_fn(png_ptr, (png_voidp)NULL, png_silent_error, png_silent_warning); + info_ptr = png_create_info_struct( png_ptr ); if (!info_ptr) goto error_nolines; - + if (setjmp(png_ptr->jmpbuf)) goto error_nolines; - + if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) goto error_nolines; - + png_set_read_fn( png_ptr, &stream, _PNG_stream_reader); - + png_uint_32 width,height; int bit_depth,color_type,interlace_type; - + png_read_info( png_ptr, info_ptr ); png_get_IHDR( png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, (int*) NULL, (int*) NULL ); - + if (color_type == PNG_COLOR_TYPE_PALETTE) png_set_expand( png_ptr ); - + png_set_strip_16( png_ptr ); png_set_packing( png_ptr ); if (png_get_valid( png_ptr, info_ptr, PNG_INFO_tRNS)) 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] ); goto error; } } - + // loaded successfully! { 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) || @@ -195,11 +227,11 @@ bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream ) } } } - + for ( unsigned int j = 0; j < height; j++ ) free( lines[j] ); free( lines ); - + if (transp) { image->SetMaskColour( 255, 0, 255 ); @@ -209,24 +241,25 @@ bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream ) image->SetMask( FALSE ); } } - + return TRUE; 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() ) { image->Destroy(); } - + if ( lines ) { free( lines ); } - + if ( png_ptr ) { if ( info_ptr ) @@ -240,8 +273,7 @@ bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream ) return FALSE; } - -bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream ) +bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose ) { { png_structp png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); @@ -249,26 +281,28 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream ) { return FALSE; } - + + 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) { png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); return FALSE; } - + if (setjmp(png_ptr->jmpbuf)) { png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); return FALSE; } - + png_set_write_fn( png_ptr, &stream, _PNG_stream_writer, NULL); - + png_set_IHDR( png_ptr, info_ptr, image->GetWidth(), image->GetHeight(), 8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - + png_color_8 sig_bit; sig_bit.red = 8; sig_bit.green = 8; @@ -278,14 +312,14 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream ) png_write_info( png_ptr, info_ptr ); png_set_shift( png_ptr, &sig_bit ); png_set_packing( png_ptr ); - + unsigned char *data = (unsigned char *)malloc( image->GetWidth()*4 ); if (!data) { png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); return FALSE; } - + for (int y = 0; y < image->GetHeight(); y++) { unsigned char *ptr = image->GetData() + (y * image->GetWidth() * 3); @@ -294,30 +328,42 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream ) 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; png_write_rows( png_ptr, &row_ptr, 1 ); } - + free(data); png_write_end( png_ptr, info_ptr ); png_destroy_write_struct( &png_ptr, (png_infopp)&info_ptr ); } return TRUE; } -#endif // wxUSE_STREAMS -#endif +#ifdef __VISUALC__ + #pragma warning(default:4611) +#endif /* VC++ */ + +bool wxPNGHandler::DoCanRead( wxInputStream& stream ) +{ + unsigned char hdr[4]; + + stream.Read(&hdr, 4); + stream.SeekI(-4, wxFromCurrent); + return (hdr[0] == 0x89 && hdr[1] == 'P' && hdr[2] == 'N' && hdr[3] == 'G'); +} -// wxUSE_LIBPNG +#endif // wxUSE_STREAMS +#endif // wxUSE_LIBPNG