[libpng17] Allow calling png_get_IHDR() with NULL arguments (Reuben Hawkins).

This commit is contained in:
Glenn Randers-Pehrson
2015-01-02 08:23:24 -06:00
parent ae31a1ebdb
commit 9c078fb7d2
5 changed files with 43 additions and 33 deletions

View File

@@ -1,6 +1,6 @@
libpng-manual.txt - A description on how to use and modify libpng
libpng version 1.7.0beta46 - January 1, 2015
libpng version 1.7.0beta46 - January 2, 2015
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2015 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
libpng versions 0.97, January 1998, through 1.7.0beta46 - January 1, 2015
libpng versions 0.97, January 1998, through 1.7.0beta46 - January 2, 2015
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2015 Glenn Randers-Pehrson
@@ -1266,16 +1266,17 @@ in until png_read_end() has read the chunk data following the image.
the PNG datastream is embedded in
a MNG-1.0 datastream)
Any or all of interlace_type, compression_type, or
filter_method can be NULL if you are
not interested in their values.
Any or all of color_tye, bit_depth, interlace_type,
compression_type, or filter_method can be NULL if you
are not interested in their values.
Note that png_get_IHDR() returns 32-bit data into
Note that png_get_IHDR() returns png_uint_32 data into
the application's width and height variables.
This is an unsafe situation if these are 16-bit
variables. In such situations, the
png_get_image_width() and png_get_image_height()
functions described below are safer.
variables, or if they are 32-bit variables on a 64-bit
platform. In such situations, the png_get_image_width()
and png_get_image_height() functions described below are
safer.
width = png_get_image_width(png_ptr,
info_ptr);
@@ -5320,7 +5321,7 @@ Other rules can be inferred by inspecting the libpng source.
XVII. Y2K Compliance in libpng
January 1, 2015
January 2, 2015
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.