X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4efa72179eeb3a99fa90c7d4bc6762eac0342fb..c267759c8f0d9d8954b2cc883c868b23ff1ca9ee:/src/common/imagpng.cpp diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 501f901e6b..bb081b809a 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 @@ -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" // ---------------------------------------------------------------------------- @@ -278,6 +279,7 @@ FindMaskColour(unsigned char **lines, png_uint_32 width, png_uint_32 height, r2 = *p++; g2 = *p++; b2 = *p++; + ++p; // jump over alpha wxImageHistogramEntry& entry = h[wxImageHistogram:: MakeKey(r2, g2, b2)]; @@ -383,8 +385,8 @@ void CopyDataFromPNG(wxImage *image, if ( IsTransparent(a) ) { *ptrDst++ = rMask; - *ptrDst++ = bMask; *ptrDst++ = gMask; + *ptrDst++ = bMask; break; } // else: !transparent @@ -451,8 +453,8 @@ void CopyDataFromPNG(wxImage *image, if ( IsTransparent(a) ) { *ptrDst++ = rMask; - *ptrDst++ = bMask; *ptrDst++ = gMask; + *ptrDst++ = bMask; break; } else // !transparent @@ -507,13 +509,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; @@ -540,9 +545,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 ); @@ -580,6 +582,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 @@ -602,6 +627,9 @@ error: if ( lines ) { + for ( unsigned int n = 0; n < height; n++ ) + free( lines[n] ); + free( lines ); } @@ -717,6 +745,36 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos iElements++; } + if ( iBitDepth == 16 ) + iElements *= 2; + + // save the image resolution if we have it + int resX, resY; + switch ( GetResolutionFromOptions(*image, &resX, &resY) ) + { + case wxIMAGE_RESOLUTION_INCHES: + { + const double INCHES_IN_METER = 10000.0 / 254; + resX = int(resX * INCHES_IN_METER); + resY = int(resY * INCHES_IN_METER); + } + break; + + case wxIMAGE_RESOLUTION_CM: + resX *= 100; + resY *= 100; + break; + + case wxIMAGE_RESOLUTION_NONE: + break; + + default: + wxFAIL_MSG( _T("unsupported image resolution units") ); + } + + if ( resX && resY ) + png_set_pHYs( png_ptr, info_ptr, resX, resY, PNG_RESOLUTION_METER ); + png_set_sBIT( png_ptr, info_ptr, &sig_bit ); png_write_info( png_ptr, info_ptr ); png_set_shift( png_ptr, &sig_bit ); @@ -735,9 +793,15 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos int iHeight = image->GetHeight(); int iWidth = image->GetWidth(); - unsigned char uchMaskRed = bHasMask ? image->GetMaskRed() : 0; - unsigned char uchMaskGreen = bHasMask ? image->GetMaskGreen() : 0; - unsigned char uchMaskBlue = bHasMask ? image->GetMaskBlue() : 0; + unsigned char uchMaskRed = 0, uchMaskGreen = 0, uchMaskBlue = 0; + + if ( bHasMask ) + { + uchMaskRed = image->GetMaskRed(); + uchMaskGreen = image->GetMaskGreen(); + uchMaskBlue = image->GetMaskBlue(); + } + unsigned char *pColors = image->GetData(); for (int y = 0; y != iHeight; ++y) @@ -757,36 +821,34 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos case wxPNG_TYPE_COLOUR: *pData++ = uchRed; - if (iBitDepth > 8) + if ( iBitDepth == 16 ) *pData++ = 0; *pData++ = uchGreen; - if (iBitDepth > 8) + if ( iBitDepth == 16 ) *pData++ = 0; *pData++ = uchBlue; - if (iBitDepth > 8) + 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); - uiColor >>= (16 - iBitDepth); - if (iBitDepth > 8) - { - *pData++ = (unsigned char)((uiColor >> 8) & 0xFF); - *pData++ = (unsigned char)(uiColor & 0xFF); - } else { + + *pData++ = (unsigned char)((uiColor >> 8) & 0xFF); + if ( iBitDepth == 16 ) *pData++ = (unsigned char)(uiColor & 0xFF); - } } break; case wxPNG_TYPE_GREY_RED: *pData++ = uchRed; - if (iBitDepth > 8) + if ( iBitDepth == 16 ) *pData++ = 0; break; } @@ -806,7 +868,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos } *pData++ = uchAlpha; - if (iBitDepth > 8) + if ( iBitDepth == 16 ) *pData++ = 0; } }