From 2cb633b915fefb25d5e34c8b317c727a002a7979 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 21 Jan 2011 08:31:29 -0600 Subject: [PATCH] [devel] In the manual, describe the png_get_IHDR() arguments in the right order. --- ANNOUNCE | 1 + CHANGES | 1 + libpng-manual.txt | 14 ++++++++------ libpng.3 | 14 ++++++++------ 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 7598e4a9f..f6449dec2 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -65,6 +65,7 @@ Version 1.5.1beta06 [January 20, 2011] end without returning anything. Version 1.5.1rc01 [January 21, 2011] + In the manual, describe the png_get_IHDR() arguments in the correct order. Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit diff --git a/CHANGES b/CHANGES index f8b50d8f6..d1f391545 100644 --- a/CHANGES +++ b/CHANGES @@ -3181,6 +3181,7 @@ Version 1.5.1beta06 [January 20, 2011] end without returning anything. Version 1.5.1rc01 [January 21, 2011] + In the manual, describe the png_get_IHDR() arguments in the correct order. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/libpng-manual.txt b/libpng-manual.txt index e1eaa0f80..240308329 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -748,15 +748,17 @@ in until png_read_end() has read the chunk data following the image. PNG_COLOR_MASK_COLOR PNG_COLOR_MASK_ALPHA + interlace_type - (PNG_INTERLACE_NONE or + PNG_INTERLACE_ADAM7) + + compression_type - (must be PNG_COMPRESSION_TYPE_BASE + for PNG 1.0) + filter_method - (must be PNG_FILTER_TYPE_BASE for PNG 1.0, and can also be PNG_INTRAPIXEL_DIFFERENCING if the PNG datastream is embedded in a MNG-1.0 datastream) - compression_type - (must be PNG_COMPRESSION_TYPE_BASE - for PNG 1.0) - interlace_type - (PNG_INTERLACE_NONE or - PNG_INTERLACE_ADAM7) Any or all of interlace_type, compression_type, or filter_method can be NULL if you are @@ -777,11 +779,11 @@ in until png_read_end() has read the chunk data following the image. info_ptr); color_type = png_get_color_type(png_ptr, info_ptr); - filter_method = png_get_filter_type(png_ptr, + interlace_type = png_get_interlace_type(png_ptr, info_ptr); compression_type = png_get_compression_type(png_ptr, info_ptr); - interlace_type = png_get_interlace_type(png_ptr, + filter_method = png_get_filter_type(png_ptr, info_ptr); channels = png_get_channels(png_ptr, info_ptr); diff --git a/libpng.3 b/libpng.3 index aa07d287f..77aba88ee 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1599,15 +1599,17 @@ in until png_read_end() has read the chunk data following the image. PNG_COLOR_MASK_COLOR PNG_COLOR_MASK_ALPHA + interlace_type - (PNG_INTERLACE_NONE or + PNG_INTERLACE_ADAM7) + + compression_type - (must be PNG_COMPRESSION_TYPE_BASE + for PNG 1.0) + filter_method - (must be PNG_FILTER_TYPE_BASE for PNG 1.0, and can also be PNG_INTRAPIXEL_DIFFERENCING if the PNG datastream is embedded in a MNG-1.0 datastream) - compression_type - (must be PNG_COMPRESSION_TYPE_BASE - for PNG 1.0) - interlace_type - (PNG_INTERLACE_NONE or - PNG_INTERLACE_ADAM7) Any or all of interlace_type, compression_type, or filter_method can be NULL if you are @@ -1628,11 +1630,11 @@ in until png_read_end() has read the chunk data following the image. info_ptr); color_type = png_get_color_type(png_ptr, info_ptr); - filter_method = png_get_filter_type(png_ptr, + interlace_type = png_get_interlace_type(png_ptr, info_ptr); compression_type = png_get_compression_type(png_ptr, info_ptr); - interlace_type = png_get_interlace_type(png_ptr, + filter_method = png_get_filter_type(png_ptr, info_ptr); channels = png_get_channels(png_ptr, info_ptr);