diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-11-09 10:49:12 -0600 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-11-09 10:49:12 -0600 |
commit | ec3f94987458831a00481735f9096bc9a82229bb (patch) | |
tree | 5139deb940ce1d4e50d0b453b4e09a41d6ec3c21 /contrib/gregbook | |
parent | 884297323dcd3c453d4b0c52025f48bb2ca74c63 (diff) | |
download | libpng-ec3f94987458831a00481735f9096bc9a82229bb.tar.gz |
[devel] Fixed some deprecated usages in the contrib directory.
Diffstat (limited to 'contrib/gregbook')
-rw-r--r-- | contrib/gregbook/readpng2.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/contrib/gregbook/readpng2.c b/contrib/gregbook/readpng2.c index 0874b0a1c..2ee6b681f 100644 --- a/contrib/gregbook/readpng2.c +++ b/contrib/gregbook/readpng2.c @@ -159,7 +159,7 @@ void readpng2_version_info(void) int readpng2_check_sig(uch *sig, int num) { - return (!png_sig_cmp(sig, 0, num)); + return !png_sig_cmp(sig, 0, num); } @@ -379,6 +379,7 @@ static void readpng2_info_callback(png_structp png_ptr, png_infop info_ptr) { mainprog_info *mainprog_ptr; int color_type, bit_depth; + png_uint_32 width, height; double gamma; @@ -414,8 +415,10 @@ static void readpng2_info_callback(png_structp png_ptr, png_infop info_ptr) /* this is just like in the non-progressive case */ - png_get_IHDR(png_ptr, info_ptr, &mainprog_ptr->width, - &mainprog_ptr->height, &bit_depth, &color_type, NULL, NULL, NULL); + png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, + NULL, NULL, NULL); + mainprog_ptr->width = (ulg)width; + mainprog_ptr->height = (ulg)height; /* since we know we've read all of the PNG file's "header" (i.e., up |