TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 07:48:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

pnmimagetypes: Fix compile error with some versions of png.h

Browse Source 
Some define these as macros, which interferes with these definitions
This commit is contained in:
rdb 2023-02-24 22:21:27 +01:00
parent 79ba760319
commit a5be6fa5ff
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
panda/src/pnmimagetypes/pnmFileTypePNG.cxx
View File

@ -453,8 +453,8 @@ png_read_data(png_structp png_ptr, png_bytep data, png_size_t length) {
* This is our own warning handler. It is called by the png library to issue * This is our own warning handler. It is called by the png library to issue
* a warning message. * a warning message.
*/ */
void PNMFileTypePNG::Reader:: void (PNMFileTypePNG::Reader::
png_warning(png_structp, png_const_charp warning_msg) { png_warning)(png_structp, png_const_charp warning_msg) {
pnmimage_png_cat.warning() pnmimage_png_cat.warning()
<< warning_msg << "\n"; << warning_msg << "\n";
} }
@ -463,8 +463,8 @@ png_warning(png_structp, png_const_charp warning_msg) {
* This is our own error handler. It is called by the png library to issue a * This is our own error handler. It is called by the png library to issue a
* fatal error message. * fatal error message.
*/ */
void PNMFileTypePNG::Reader:: void (PNMFileTypePNG::Reader::
png_error(png_structp png_ptr, png_const_charp error_msg) { png_error)(png_structp png_ptr, png_const_charp error_msg) {
pnmimage_png_cat.error() pnmimage_png_cat.error()
<< error_msg << "\n"; << error_msg << "\n";
@ -923,8 +923,8 @@ png_flush_data(png_structp png_ptr) {
* This is our own warning handler. It is called by the png library to issue * This is our own warning handler. It is called by the png library to issue
* a warning message. * a warning message.
*/ */
void PNMFileTypePNG::Writer:: void (PNMFileTypePNG::Writer::
png_warning(png_structp, png_const_charp warning_msg) { png_warning)(png_structp, png_const_charp warning_msg) {
pnmimage_png_cat.warning() pnmimage_png_cat.warning()
<< warning_msg << "\n"; << warning_msg << "\n";
} }
@ -933,8 +933,8 @@ png_warning(png_structp, png_const_charp warning_msg) {
* This is our own error handler. It is called by the png library to issue a * This is our own error handler. It is called by the png library to issue a
* fatal error message. * fatal error message.
*/ */
void PNMFileTypePNG::Writer:: void (PNMFileTypePNG::Writer::
png_error(png_structp png_ptr, png_const_charp error_msg) { png_error)(png_structp png_ptr, png_const_charp error_msg) {
pnmimage_png_cat.error() pnmimage_png_cat.error()
<< error_msg << "\n"; << error_msg << "\n";

8
panda/src/pnmimagetypes/pnmFileTypePNG.h
View File

@ -58,8 +58,8 @@ public:
static void png_read_data(png_structp png_ptr, png_bytep data, static void png_read_data(png_structp png_ptr, png_bytep data,
png_size_t length); png_size_t length);
static void png_error(png_structp png_ptr, png_const_charp error_msg); static void (png_error)(png_structp png_ptr, png_const_charp error_msg);
static void png_warning(png_structp png_ptr, png_const_charp warning_msg); static void (png_warning)(png_structp png_ptr, png_const_charp warning_msg);
png_structp _png; png_structp _png;
png_infop _info; png_infop _info;
@ -84,8 +84,8 @@ public:
png_size_t length); png_size_t length);
static void png_flush_data(png_structp png_ptr); static void png_flush_data(png_structp png_ptr);
static void png_error(png_structp png_ptr, png_const_charp error_msg); static void (png_error)(png_structp png_ptr, png_const_charp error_msg);
static void png_warning(png_structp png_ptr, png_const_charp warning_msg); static void (png_warning)(png_structp png_ptr, png_const_charp warning_msg);
png_structp _png; png_structp _png;
png_infop _info; png_infop _info;