From 5f5d6d637b1761907677917b6b4ec5755d2736d2 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 19 Mar 2011 09:30:41 -0500 Subject: [PATCH] [master] Fixed incorrect examples of callback prototypes in the manual, that were introduced in libpng-1.0.0. --- ANNOUNCE | 2 ++ CHANGES | 2 ++ libpng-1.4.6beta07.txt | 8 ++++---- libpng.3 | 8 ++++---- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index bb7d029d6..5f540413f 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -61,6 +61,8 @@ version 1.4.6beta07 [March 19, 2011] function prototypes in the manual. The row_info struct is png_row_infop. Added a request in the manual that applications do not use "png_" or "PNG_" to begin any of their own symbols. + Fixed incorrect examples of callback prototypes in the manual, that were + introduced in libpng-1.0.0. Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 215ecdbac..ca1e8620b 100644 --- a/CHANGES +++ b/CHANGES @@ -2773,6 +2773,8 @@ version 1.4.6beta07 [March 19, 2011] function prototypes in the manual. The row_info struct is png_row_infop. Added a request in the manual that applications do not use "png_" or "PNG_" to begin any of their own symbols. + Fixed incorrect examples of callback prototypes in the manual, that were + introduced in libpng-1.0.0. Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/libpng-1.4.6beta07.txt b/libpng-1.4.6beta07.txt index 40c792d93..4aeb7660d 100644 --- a/libpng-1.4.6beta07.txt +++ b/libpng-1.4.6beta07.txt @@ -278,7 +278,7 @@ Setting up callback code You can set up a callback function to handle any unknown chunks in the input stream. You must supply the function - read_chunk_callback(png_ptr ptr, + read_chunk_callback(png_structp png_ptr, png_unknown_chunkp chunk); { /* The unknown chunk structure contains your @@ -324,8 +324,8 @@ called after each row has been read, which you can use to control a progress meter or the like. It's demonstrated in pngtest.c. You must supply a function - void read_row_callback(png_ptr ptr, png_uint_32 row, - int pass); + void read_row_callback(png_structp png_ptr, + png_uint_32 row, int pass); { /* put your code here */ } @@ -1759,7 +1759,7 @@ called after each row has been written, which you can use to control a progress meter or the like. It's demonstrated in pngtest.c. You must supply a function - void write_row_callback(png_ptr, png_uint_32 row, + void write_row_callback(png_structp png_ptr, png_uint_32 row, int pass); { /* put your code here */ diff --git a/libpng.3 b/libpng.3 index 79d55079a..1206147a0 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1173,7 +1173,7 @@ instead of setting a flag to be acted upon later. You can set up a callback function to handle any unknown chunks in the input stream. You must supply the function - read_chunk_callback(png_ptr ptr, + read_chunk_callback(png_structp png_ptr, png_unknown_chunkp chunk); { /* The unknown chunk structure contains your @@ -1219,8 +1219,8 @@ called after each row has been read, which you can use to control a progress meter or the like. It's demonstrated in pngtest.c. You must supply a function - void read_row_callback(png_ptr ptr, png_uint_32 row, - int pass); + void read_row_callback(png_structp png_ptr, + png_uint_32 row, int pass); { /* put your code here */ } @@ -2654,7 +2654,7 @@ called after each row has been written, which you can use to control a progress meter or the like. It's demonstrated in pngtest.c. You must supply a function - void write_row_callback(png_ptr, png_uint_32 row, + void write_row_callback(png_structp png_ptr, png_uint_32 row, int pass); { /* put your code here */