Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/imagpng.cpp
View File

@@ -111,8 +111,8 @@ void
PNGLINKAGEMODE wx_png_error(png_structp png_ptr, png_const_charp message)
{
wxPNGInfoStruct *info = WX_PNG_INFO(png_ptr);
if ( info->verbose )
wxLogError(wxString(message));
if (info->verbose)
wxLogError( wxString::FromAscii(message) );
#ifdef USE_FAR_KEYWORD
{
@@ -129,8 +129,8 @@ void
PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message)
{
wxPNGInfoStruct *info = WX_PNG_INFO(png_ptr);
if ( info->verbose )
wxLogWarning(wxString(message));
if (info->verbose)
wxLogWarning( wxString::FromAscii(message) );
}
} // extern "C"
@@ -188,6 +188,10 @@ bool wxPNGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
if (color_type == PNG_COLOR_TYPE_PALETTE)
png_set_expand( png_ptr );
// Fix for Bug [ 439207 ] Monochrome PNG images come up black
if (bit_depth < 8)
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))