diff --git a/ANNOUNCE b/ANNOUNCE index 12583771e..bb7d029d6 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -57,6 +57,10 @@ version 1.4.6beta07 [March 19, 2011] ifdef out mask arrays in pngread.c when interlacing is not supported. Added attribute definition (warnings) for MSC_VER >= 1300 in pngconf.h Added -D_CRT_SECURE_NO_DEPRECATE to CFLAGS in makefile.vcwin32 + Fixed mistake in the descriptions of user read_transform and write_transform + 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. 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 c13fe2fab..215ecdbac 100644 --- a/CHANGES +++ b/CHANGES @@ -2769,6 +2769,10 @@ version 1.4.6beta07 [March 19, 2011] ifdef out mask arrays in pngread.c when interlacing is not supported. Added attribute definition (warnings) for MSC_VER >= 1300 in pngconf.h Added -D_CRT_SECURE_NO_DEPRECATE to CFLAGS in makefile.vcwin32 + Fixed mistake in the descriptions of user read_transform and write_transform + 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. 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.6beta06.txt b/libpng-1.4.6beta06.txt index 42a7aec67..40c792d93 100644 --- a/libpng-1.4.6beta06.txt +++ b/libpng-1.4.6beta06.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.6beta06 - March 19, 2011 + libpng version 1.4.6beta07 - March 19, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.6beta06 - March 19, 2011 + libpng versions 0.97, January 1998, through 1.4.6beta07 - March 19, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -905,7 +905,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.4.6beta06, not all possible expansions are supported. +As of libpng version 1.4.6beta07, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -1235,8 +1235,8 @@ with You must supply the function - void read_transform_fn(png_ptr ptr, row_info_ptr - row_info, png_bytep data) + void read_transform_fn(png_structp png_ptr, png_row_infop + row_info, png_bytep data) See pngtest.c for a working example. Your function will be called after all of the other transformations have been processed. @@ -2316,7 +2316,7 @@ with You must supply the function - void write_transform_fn(png_ptr ptr, row_info_ptr + void write_transform_fn(png_structp png_ptr, png_row_infop row_info, png_bytep data) See pngtest.c for a working example. Your function will be called @@ -3280,9 +3280,10 @@ above the comment that says /* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */ -The names of all exported functions and variables begin -with "png_", and all publicly visible C preprocessor -macros begin with "PNG_". +To avoid polluting the global namespace, the names of all exported +functions and variables begin with "png_", and all publicly visible C +preprocessor macros begin with "PNG_". We request that applications that +use libpng *not* begin any of their own symbols with either of these strings. We put a space after each comma and after each semicolon in "for" statments, and we put spaces before and after each @@ -3311,7 +3312,7 @@ Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.4.6beta06 are Y2K compliant. It is my belief that earlier +upward through 1.4.6beta07 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that diff --git a/libpng.3 b/libpng.3 index 14c008fb9..79d55079a 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "March 19, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6beta06 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6beta07 .SH SYNOPSIS \fI\fB @@ -895,7 +895,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.4.6beta06 - March 19, 2011 + libpng version 1.4.6beta07 - March 19, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -906,7 +906,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.6beta06 - March 19, 2011 + libpng versions 0.97, January 1998, through 1.4.6beta07 - March 19, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -1800,7 +1800,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.4.6beta06, not all possible expansions are supported. +As of libpng version 1.4.6beta07, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -2130,8 +2130,8 @@ with You must supply the function - void read_transform_fn(png_ptr ptr, row_info_ptr - row_info, png_bytep data) + void read_transform_fn(png_structp png_ptr, png_row_infop + row_info, png_bytep data) See pngtest.c for a working example. Your function will be called after all of the other transformations have been processed. @@ -3211,7 +3211,7 @@ with You must supply the function - void write_transform_fn(png_ptr ptr, row_info_ptr + void write_transform_fn(png_structp png_ptr, png_row_infop row_info, png_bytep data) See pngtest.c for a working example. Your function will be called @@ -4175,9 +4175,10 @@ above the comment that says /* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */ -The names of all exported functions and variables begin -with "png_", and all publicly visible C preprocessor -macros begin with "PNG_". +To avoid polluting the global namespace, the names of all exported +functions and variables begin with "png_", and all publicly visible C +preprocessor macros begin with "PNG_". We request that applications that +use libpng *not* begin any of their own symbols with either of these strings. We put a space after each comma and after each semicolon in "for" statments, and we put spaces before and after each @@ -4206,7 +4207,7 @@ Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.4.6beta06 are Y2K compliant. It is my belief that earlier +upward through 1.4.6beta07 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that @@ -4398,7 +4399,7 @@ the first widely used release: 1.4.5beta05-07 14 10405 14.so.14.5[.0] 1.4.5rc02-03 14 10405 14.so.14.5[.0] 1.4.5 14 10405 14.so.14.5[.0] - 1.4.6beta01-06 14 10406 14.so.14.6[.0] + 1.4.6beta01-07 14 10406 14.so.14.6[.0] 1.4.6rc01 14 10406 14.so.14.6[.0] Henceforth the source version will match the shared-library minor @@ -4455,7 +4456,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.6beta06 - March 19, 2011: +Libpng version 1.4.6beta07 - March 19, 2011: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4478,7 +4479,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.6beta06, March 19, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.4.6beta07, March 19, 2011, are Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors