X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d19ce8c49127a8550a784b4d54464c81003a102b..b53aea81d2e102224b452ef5bf7aee1132f37c6f:/src/common/imagpng.cpp?ds=sidebyside diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 44c21654ec..474221ae11 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -148,19 +148,19 @@ struct wxPNGInfoStruct extern "C" { -void PNGLINKAGEMODE wx_PNG_stream_reader( png_structp png_ptr, png_bytep data, - png_size_t length ) +static 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 wx_PNG_stream_writer( png_structp png_ptr, png_bytep data, - png_size_t length ) +static 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); } -void +static void PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message) { wxPNGInfoStruct *info = png_ptr ? WX_PNG_INFO(png_ptr) : NULL; @@ -170,7 +170,7 @@ PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message) // from pngerror.c // so that the libpng doesn't send anything on stderr -void +static void PNGLINKAGEMODE wx_png_error(png_structp png_ptr, png_const_charp message) { wx_png_warning(NULL, message); @@ -538,7 +538,7 @@ wxPNGHandler::LoadFile(wxImage *image, goto error; 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 ); + png_get_IHDR( png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL ); if (color_type == PNG_COLOR_TYPE_PALETTE) png_set_expand( png_ptr );