X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36308e0e02bc392eaf9bdb34dbfec048b0d13c9f..9a35701127e3e8d2c7fb433d85c7b3954ccbfc9f:/src/common/imagpng.cpp diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 66e917422a..f3fe5cbce8 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -11,7 +11,7 @@ // declarations // ============================================================================ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "imagpng.h" #endif @@ -160,12 +160,14 @@ struct wxPNGInfoStruct extern "C" { -void PNGLINKAGEMODE _PNG_stream_reader( png_structp png_ptr, png_bytep data, png_size_t length ) +void PNGLINKAGEMODE wx_PNG_stream_reader( png_structp png_ptr, png_bytep data, + png_size_t length ) { WX_PNG_INFO(png_ptr)->stream.in->Read(data, length); } -void PNGLINKAGEMODE _PNG_stream_writer( png_structp png_ptr, png_bytep data, png_size_t length ) +void PNGLINKAGEMODE wx_PNG_stream_writer( png_structp png_ptr, png_bytep data, + png_size_t length ) { WX_PNG_INFO(png_ptr)->stream.out->Write(data, length); } @@ -220,14 +222,13 @@ CheckTransparency(unsigned char **lines, png_uint_32 x, png_uint_32 y, png_uint_32 w, png_uint_32 h, size_t numColBytes) { - // we start from (x + 1, y) - x++; - // suppose that a mask will suffice and check all the remaining alpha // values to see if it does for ( ; y < h; y++ ) { - unsigned const char *ptr = lines[y] + x; + // each pixel is numColBytes+1 bytes, offset into the current line by + // the current x position + unsigned const char *ptr = lines[y] + (x * (numColBytes + 1)); for ( png_uint_32 x2 = x; x2 < w; x2++ ) { @@ -320,7 +321,7 @@ bool wxPNGHandler::DoCanRead( wxInputStream& stream ) unsigned char hdr[4]; if ( !stream.Read(hdr, WXSIZEOF(hdr)) ) - return FALSE; + return false; return memcmp(hdr, "\211PNG", WXSIZEOF(hdr)) == 0; } @@ -461,25 +462,27 @@ void CopyDataFromPNG(wxImage *image, case Transparency_Mask: if ( IsTransparent(a) ) { - // if we couldn't find a unique colour for the mask, we - // can have real pixels with the same value as the mask - // and it's better to slightly change their colour than - // to make them transparent - if ( r == rMask && g == gMask && b == bMask ) - { - r++; - } - *ptrDst++ = rMask; *ptrDst++ = bMask; *ptrDst++ = gMask; break; } - // else: !transparent - - // must be opaque then as otherwise we shouldn't be - // using the mask at all - wxASSERT_MSG( IsOpaque(a), _T("logic error") ); + else // !transparent + { + // must be opaque then as otherwise we shouldn't be + // using the mask at all + wxASSERT_MSG( IsOpaque(a), _T("logic error") ); + + // if we couldn't find a unique colour for the + // mask, we can have real pixels with the same + // value as the mask and it's better to slightly + // change their colour than to make them + // transparent + if ( r == rMask && g == gMask && b == bMask ) + { + r++; + } + } // fall through @@ -539,7 +542,7 @@ wxPNGHandler::LoadFile(wxImage *image, // NB: please see the comment near wxPNGInfoStruct declaration for // explanation why this line is mandatory - png_set_read_fn( png_ptr, &wxinfo, _PNG_stream_reader); + png_set_read_fn( png_ptr, &wxinfo, wx_PNG_stream_reader); info_ptr = png_create_info_struct( png_ptr ); if (!info_ptr) @@ -567,7 +570,7 @@ wxPNGHandler::LoadFile(wxImage *image, png_set_expand( png_ptr ); png_set_filler( png_ptr, 0xff, PNG_FILLER_AFTER ); - image->Create( (int)width, (int)height ); + image->Create((int)width, (int)height, false /* no need to init pixels */); if (!image->Ok()) goto error; @@ -597,7 +600,7 @@ wxPNGHandler::LoadFile(wxImage *image, free( lines[i] ); free( lines ); - return TRUE; + return true; error: if (verbose) @@ -623,7 +626,7 @@ error: else png_destroy_read_struct( &png_ptr, (png_infopp) NULL, (png_infopp) NULL ); } - return FALSE; + return false; } // ---------------------------------------------------------------------------- @@ -642,7 +645,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos { if (verbose) wxLogError(_("Couldn't save PNG image.")); - return FALSE; + return false; } png_set_error_fn(png_ptr, (png_voidp)NULL, wx_png_error, wx_png_warning); @@ -653,7 +656,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); if (verbose) wxLogError(_("Couldn't save PNG image.")); - return FALSE; + return false; } if (setjmp(wxinfo.jmpbuf)) @@ -661,12 +664,12 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); if (verbose) wxLogError(_("Couldn't save PNG image.")); - return FALSE; + return false; } // NB: please see the comment near wxPNGInfoStruct declaration for // explanation why this line is mandatory - png_set_write_fn( png_ptr, &wxinfo, _PNG_stream_writer, NULL); + 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, @@ -686,7 +689,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos if (!data) { png_destroy_write_struct( &png_ptr, (png_infopp)NULL ); - return FALSE; + return false; } for (int y = 0; y < image->GetHeight(); y++) @@ -697,7 +700,11 @@ 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->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())) @@ -717,7 +724,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos png_write_end( png_ptr, info_ptr ); png_destroy_write_struct( &png_ptr, (png_infopp)&info_ptr ); - return TRUE; + return true; } #ifdef __VISUALC__