diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2014-03-06 12:35:04 -0600 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2014-03-06 13:15:45 -0600 |
commit | 1cc02f0395aa85e71927c5a45b4bc8091a7d9ef8 (patch) | |
tree | 3ca04025157dc47c8f82e90925941e167f7b3519 /contrib/gregbook/readpng2.c | |
parent | a710317d2f9cb1e154861c000ee1cc1c70794a85 (diff) | |
download | libpng-1cc02f0395aa85e71927c5a45b4bc8091a7d9ef8.tar.gz |
[master] Imported from libpng-1.6.10.tarbaserock/mikedrake/update-chunksbaserock/mikedrake/libpng-upgrade
Diffstat (limited to 'contrib/gregbook/readpng2.c')
-rw-r--r-- | contrib/gregbook/readpng2.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/contrib/gregbook/readpng2.c b/contrib/gregbook/readpng2.c index e179db71e..e6a132eca 100644 --- a/contrib/gregbook/readpng2.c +++ b/contrib/gregbook/readpng2.c @@ -69,6 +69,7 @@ static void readpng2_row_callback(png_structp png_ptr, png_bytep new_row, png_uint_32 row_num, int pass); static void readpng2_end_callback(png_structp png_ptr, png_infop info_ptr); static void readpng2_error_handler(png_structp png_ptr, png_const_charp msg); +static void readpng2_warning_handler(png_structp png_ptr, png_const_charp msg); @@ -104,7 +105,7 @@ int readpng2_init(mainprog_info *mainprog_ptr) /* could also replace libpng warning-handler (final NULL), but no need: */ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, mainprog_ptr, - readpng2_error_handler, NULL); + readpng2_error_handler, readpng2_warning_handler); if (!png_ptr) return 4; /* out of memory */ @@ -467,7 +468,11 @@ void readpng2_cleanup(mainprog_info *mainprog_ptr) } - +static void readpng2_warning_handler(png_structp png_ptr, png_const_charp msg) +{ + fprintf(stderr, "readpng2 libpng warning: %s\n", msg); + fflush(stderr); +} static void readpng2_error_handler(png_structp png_ptr, png_const_charp msg) |