X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/999836aacade840a5d9a0cbb5fad7b1d4de62c93..6e76b35d73fb5a043fd39af266bd452a6e20a861:/src/common/imagpng.cpp diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index d0da8f6111..250fac506a 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -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); } @@ -540,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) @@ -667,7 +669,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos // 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,