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

prefix symbols with wx_ to reduce risk of collision

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-01-30 12:20:40 +00:00
parent 1481b2adb2
commit e9b964cfe5
2 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/imagpng.cpp
View File

@@ -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,