X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e854ed477efa1efdb17d2c9ae74d11b2c5e111e9..e330eb461962fc89d1650d912a5a63eb2f0c02d3:/src/common/imagpng.cpp diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 7370823ed9..d4c1cdb59f 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -11,10 +11,6 @@ // declarations // ============================================================================ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "imagpng.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -23,25 +19,25 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/defs.h" + #pragma hdrstop #endif #if wxUSE_IMAGE && wxUSE_LIBPNG #include "wx/imagpng.h" -#include "wx/bitmap.h" -#include "wx/debug.h" -#include "wx/log.h" -#include "wx/app.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" + #include "wx/bitmap.h" + #include "wx/module.h" +#endif + #include "png.h" #include "wx/filefn.h" #include "wx/wfstream.h" #include "wx/intl.h" -#include "wx/module.h" +#include "wx/palette.h" // For memcpy #include @@ -109,7 +105,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler) #if wxUSE_STREAMS #ifndef PNGLINKAGEMODE - #ifdef __WATCOMC__ + #if defined(__WATCOMC__) && ( defined(__WXMSW__) || defined(__WXMGL__) ) // we need an explicit cdecl for Watcom, at least according to // // http://sf.net/tracker/index.php?func=detail&aid=651492&group_id=9863&atid=109863 @@ -172,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); } -// 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 PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message) { @@ -188,6 +176,19 @@ PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp 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 png_ptr, png_const_charp message) +{ + wx_png_warning(NULL, message); + + // we're not using libpng built-in jump buffer (see comment before + // wxPNGInfoStruct above) so we have to return ourselves, otherwise libpng + // would just abort + longjmp(WX_PNG_INFO(png_ptr)->jmpbuf, 1); +} + } // extern "C" // ---------------------------------------------------------------------------- @@ -287,7 +288,7 @@ FindMaskColour(unsigned char **lines, png_uint_32 width, png_uint_32 height, } } - if ( !h.FindFirstUnusedColour(&rMask, &gMask, &bMask, rMask, gMask, bMask) ) + if ( !h.FindFirstUnusedColour(&rMask, &gMask, &bMask) ) { wxLogWarning(_("Too many colours in PNG, the image may be slightly blurred.")); @@ -435,14 +436,8 @@ void CopyDataFromPNG(wxImage *image, if ( transparency == Transparency_Mask ) { - if ( IsTransparent( a ) && ( ! ( rMask || gMask || bMask ) ) ) - { - rMask = r; - gMask = g; - bMask = b; - - FindMaskColour(lines, width, height, rMask, gMask, bMask ); - } + FindMaskColour(lines, width, height, + rMask, gMask, bMask); } else // transparency == Transparency_Alpha { @@ -513,13 +508,16 @@ wxPNGHandler::LoadFile(wxImage *image, bool verbose, int WXUNUSED(index)) { - // VZ: as this function uses setjmp() the only fool proof error handling + // 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 = NULL; png_infop info_ptr = (png_infop) NULL; wxPNGInfoStruct wxinfo; + png_uint_32 i, width, height = 0; + int bit_depth, color_type, interlace_type; + wxinfo.verbose = verbose; wxinfo.stream.in = &stream; @@ -546,9 +544,6 @@ wxPNGHandler::LoadFile(wxImage *image, if (setjmp(wxinfo.jmpbuf)) goto error; - png_uint_32 i, 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 ); @@ -586,6 +581,29 @@ wxPNGHandler::LoadFile(wxImage *image, png_read_image( png_ptr, lines ); png_read_end( png_ptr, info_ptr ); + +#if wxUSE_PALETTE + if (color_type == PNG_COLOR_TYPE_PALETTE) + { + const size_t ncolors = info_ptr->num_palette; + unsigned char* r = new unsigned char[ncolors]; + unsigned char* g = new unsigned char[ncolors]; + unsigned char* b = new unsigned char[ncolors]; + + for (size_t j = 0; j < ncolors; j++) + { + r[j] = info_ptr->palette[j].red; + g[j] = info_ptr->palette[j].green; + b[j] = info_ptr->palette[j].blue; + } + + image->SetPalette(wxPalette(ncolors, r, g, b)); + delete[] r; + delete[] g; + delete[] b; + } +#endif // wxUSE_PALETTE + png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL ); // loaded successfully, now init wxImage with this data @@ -608,6 +626,9 @@ error: if ( lines ) { + for ( unsigned int n = 0; n < height; n++ ) + free( lines[n] ); + free( lines ); } @@ -670,51 +691,160 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos // explanation why this line is mandatory png_set_write_fn( png_ptr, &wxinfo, wx_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); + const int iColorType = image->HasOption(wxIMAGE_OPTION_PNG_FORMAT) + ? image->GetOptionInt(wxIMAGE_OPTION_PNG_FORMAT) + : wxPNG_TYPE_COLOUR; + const int iBitDepth = image->HasOption(wxIMAGE_OPTION_PNG_BITDEPTH) + ? image->GetOptionInt(wxIMAGE_OPTION_PNG_BITDEPTH) + : 8; + + wxASSERT_MSG( iBitDepth == 8 || iBitDepth == 16, + _T("PNG bit depth must be 8 or 16") ); + + bool bHasAlpha = image->HasAlpha(); + bool bHasMask = image->HasMask(); + bool bUseAlpha = bHasAlpha || bHasMask; + + int iPngColorType; + if ( iColorType==wxPNG_TYPE_COLOUR ) + { + iPngColorType = bUseAlpha ? PNG_COLOR_TYPE_RGB_ALPHA + : PNG_COLOR_TYPE_RGB; + } + else + { + iPngColorType = bUseAlpha ? PNG_COLOR_TYPE_GRAY_ALPHA + : PNG_COLOR_TYPE_GRAY; + } + + png_set_IHDR( png_ptr, info_ptr, image->GetWidth(), image->GetHeight(), + iBitDepth, iPngColorType, + PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, + PNG_FILTER_TYPE_BASE); + int iElements; png_color_8 sig_bit; - sig_bit.red = 8; - sig_bit.green = 8; - sig_bit.blue = 8; - sig_bit.alpha = 8; + + if ( iPngColorType & PNG_COLOR_MASK_COLOR ) + { + sig_bit.red = + sig_bit.green = + sig_bit.blue = (png_byte)iBitDepth; + iElements = 3; + } + else // grey + { + sig_bit.gray = (png_byte)iBitDepth; + iElements = 1; + } + + if ( iPngColorType & PNG_COLOR_MASK_ALPHA ) + { + sig_bit.alpha = (png_byte)iBitDepth; + iElements++; + } + + if ( iBitDepth == 16 ) + iElements *= 2; + png_set_sBIT( png_ptr, info_ptr, &sig_bit ); 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) + unsigned char * + data = (unsigned char *)malloc( image->GetWidth() * iElements ); + if ( !data ) { png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); return false; } - for (int y = 0; y < image->GetHeight(); y++) + unsigned char * + pAlpha = (unsigned char *)(bHasAlpha ? image->GetAlpha() : NULL); + int iHeight = image->GetHeight(); + int iWidth = image->GetWidth(); + + unsigned char uchMaskRed = 0, uchMaskGreen = 0, uchMaskBlue = 0; + + if ( bHasMask ) { - unsigned char *ptr = image->GetData() + (y * image->GetWidth() * 3); - for (int x = 0; x < image->GetWidth(); x++) + uchMaskRed = image->GetMaskRed(); + uchMaskGreen = image->GetMaskGreen(); + uchMaskBlue = image->GetMaskBlue(); + } + + unsigned char *pColors = image->GetData(); + + for (int y = 0; y != iHeight; ++y) + { + unsigned char *pData = data; + for (int x = 0; x != iWidth; x++) { - data[(x << 2) + 0] = *ptr++; - data[(x << 2) + 1] = *ptr++; - data[(x << 2) + 2] = *ptr++; - if ( image->HasAlpha() ) - { - data[(x << 2) + 3] = image->GetAlpha(x, y); - } - else if (( !image->HasMask() ) || \ - (data[(x << 2) + 0] != image->GetMaskRed()) || \ - (data[(x << 2) + 1] != image->GetMaskGreen()) || \ - (data[(x << 2) + 2] != image->GetMaskBlue())) + unsigned char uchRed = *pColors++; + unsigned char uchGreen = *pColors++; + unsigned char uchBlue = *pColors++; + + switch ( iColorType ) { - data[(x << 2) + 3] = 255; + default: + wxFAIL_MSG( _T("unknown wxPNG_TYPE_XXX") ); + // fall through + + case wxPNG_TYPE_COLOUR: + *pData++ = uchRed; + if ( iBitDepth == 16 ) + *pData++ = 0; + *pData++ = uchGreen; + if ( iBitDepth == 16 ) + *pData++ = 0; + *pData++ = uchBlue; + if ( iBitDepth == 16 ) + *pData++ = 0; + break; + + case wxPNG_TYPE_GREY: + { + // where do these coefficients come from? maybe we + // should have image options for them as well? + unsigned uiColor = + (unsigned) (76.544*(unsigned)uchRed + + 150.272*(unsigned)uchGreen + + 36.864*(unsigned)uchBlue); + + *pData++ = (unsigned char)((uiColor >> 8) & 0xFF); + if ( iBitDepth == 16 ) + *pData++ = (unsigned char)(uiColor & 0xFF); + } + break; + + case wxPNG_TYPE_GREY_RED: + *pData++ = uchRed; + if ( iBitDepth == 16 ) + *pData++ = 0; + break; } - else + + if ( bUseAlpha ) { - data[(x << 2) + 3] = 0; + unsigned char uchAlpha = 255; + if ( bHasAlpha ) + uchAlpha = *pAlpha++; + + if ( bHasMask ) + { + if ( (uchRed == uchMaskRed) + && (uchGreen == uchMaskGreen) + && (uchBlue == uchMaskBlue) ) + uchAlpha = 0; + } + + *pData++ = uchAlpha; + if ( iBitDepth == 16 ) + *pData++ = 0; } } + png_bytep row_ptr = data; png_write_rows( png_ptr, &row_ptr, 1 ); }