diff --git a/ANNOUNCE b/ANNOUNCE index ea5284442..1d34ce2d4 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.5rc02 - November 20, 2010 +Libpng 1.4.5rc02 - November 21, 2010 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -46,7 +46,7 @@ version 1.4.5beta04 [November 8, 2010] version 1.4.5rc01 [November 19, 2010] No changes. -version 1.4.5beta05 [November 20, 2010] +version 1.4.5beta05 [November 21, 2010] Removed some extraneous parentheses that appeared in pngrutil.c of libpng-1.4.3beta01 Revised png_get_uint_32, png_get_int_32, png_get_uint_16 (Cosmin) @@ -55,6 +55,11 @@ version 1.4.5beta05 [November 20, 2010] Added test for io_state in pngtest.c (Cosmin) Added "#!/bin/sh" at the top of contrib/pngminim/*/gather.sh scripts. +version 1.4.5beta06 [November 21, 2010] + Restored the parentheses in pngrutil.c; they are needed when the + png_get_*int_*() functions are compiled (i.e., when PNG_USE_READ_MACROS + is not defined). + Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement). diff --git a/CHANGES b/CHANGES index 07800af46..d1e309295 100644 --- a/CHANGES +++ b/CHANGES @@ -2701,13 +2701,21 @@ version 1.4.5rc01 [November 19, 2010] No changes. version 1.4.5beta05 [November 20, 2010] - Removed some extraneous parentheses that appeared in pngrutil.c of - libpng-1.4.3beta01 Revised png_get_uint_32, png_get_int_32, png_get_uint_16 (Cosmin) Moved reading of file signature into png_read_sig (Cosmin) Fixed atomicity of chunk header serialization (Cosmin) Added test for io_state in pngtest.c (Cosmin) Added "#!/bin/sh" at the top of contrib/pngminim/*/gather.sh scripts. +version 1.4.5beta06 [November 21, 2010] + Restored the parentheses in pngrutil.c; they are needed when the + png_get_*int_*() functions are compiled (i.e., when PNG_USE_READ_MACROS + is not defined). + +Send comments/corrections/commendations to glennrp at users.sourceforge.net +or to png-mng-implement at lists.sf.net (subscription required; visit +https://lists.sourceforge.net/lists/listinfo/png-mng-implement). + +Glenn R-P */ } #endif diff --git a/libpngpf.3 b/libpngpf.3 index e8b3329c9..6301fa0c6 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "November 20, 2010" +.TH LIBPNGPF 3 "November 21, 2010" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.5rc02 (private functions) @@ -581,32 +581,26 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.5rc02 \fI\fB -\fI\fB - \fBvoid png_read_push_finish_row (png_structp \fIpng_ptr\fP\fB);\fP \fI\fB +\fBvoid png_read_sig (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP + \fI\fB \fBvoid png_read_start_row (png_structp \fIpng_ptr\fP\fB);\fP \fI\fB -\fI\fB - \fBvoid png_read_transform_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP \fI\fB -\fI\fB - \fBvoid png_reset_crc (png_structp \fIpng_ptr\fP\fB);\fP \fI\fB -\fI\fB - \fBint png_set_text_2 (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_textp \fP\fItext_ptr\fP\fB, int \fInum_text\fP\fB);\fP \fI\fB diff --git a/pngrutil.c b/pngrutil.c index 001927aac..11cec08b1 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.4.5 [November 20, 2010] + * Last changed in libpng 1.4.5 [November 21, 2010] * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -32,8 +32,8 @@ png_get_uint_31(png_structp png_ptr, png_bytep buf) #ifndef PNG_USE_READ_MACROS /* Grab an unsigned 32-bit integer from a buffer in big-endian format. */ -png_uint_32 PNGAPI -png_get_uint_32(png_bytep buf) +png_uint_32 (PNGAPI +png_get_uint_32)(png_bytep buf) { png_uint_32 uval = png_get_uint_32(buf); if ((uval & 0x80000000L) == 0) /* non-negative */ @@ -48,8 +48,8 @@ png_get_uint_32(png_bytep buf) * is no guarantee that a 'png_int_32' is exactly 32 bits, therefore * the following code does a two's complement to native conversion. */ -png_int_32 PNGAPI -png_get_int_32(png_bytep buf) +png_int_32 (PNGAPI +png_get_int_32)(png_bytep buf) { png_uint_32 uval = png_get_uint_32(buf); if ((uval & 0x80000000L) == 0) /* non-negative */ @@ -60,8 +60,8 @@ png_get_int_32(png_bytep buf) } /* Grab an unsigned 16-bit integer from a buffer in big-endian format. */ -png_uint_16 PNGAPI -png_get_uint_16 (png_bytep buf) +png_uint_16 (PNGAPI +png_get_uint_16) (png_bytep buf) { unsigned int val = ((unsigned int)(*buf) << 8) +