[master] Removed some extraneous parentheses that appeared in pngrutil.c of

libpng-1.4.3bet01
This commit is contained in:
Glenn Randers-Pehrson 2010-11-20 14:47:36 -06:00
parent 175e21f5e1
commit 60ba227d57
3 changed files with 26 additions and 17 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.4.5rc01 - November 19, 2010 Libpng 1.4.5rc02 - November 20, 2010
This is not intended to be a public release. It will be replaced 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. within a few weeks by a public version or by another test version.
@ -9,20 +9,20 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a Source files with LF line endings (for Unix/Linux) and with a
"configure" script "configure" script
1.4.5rc01.tar.xz (LZMA-compressed, recommended) 1.4.5rc02.tar.xz (LZMA-compressed, recommended)
1.4.5rc01.tar.gz 1.4.5rc02.tar.gz
1.4.5rc01.tar.bz2 1.4.5rc02.tar.bz2
Source files with CRLF line endings (for Windows), without the Source files with CRLF line endings (for Windows), without the
"configure" script "configure" script
lp145r01.zip lp145r02.zip
lp145r01.7z lp145r02.7z
Other information: Other information:
1.4.5rc01-README.txt 1.4.5rc02-README.txt
1.4.5rc01-LICENSE.txt 1.4.5rc02-LICENSE.txt
Changes since the last public release (1.4.4): Changes since the last public release (1.4.4):
@ -46,6 +46,10 @@ version 1.4.5beta04 [November 8, 2010]
version 1.4.5rc01 [November 19, 2010] version 1.4.5rc01 [November 19, 2010]
No changes. No changes.
version 1.4.5rc02 [November 20, 2010]
Removed some extraneous parentheses that appeared in pngrutil.c of
libpng-1.4.3bet01
Send comments/corrections/commendations to glennrp at users.sourceforge.net Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit or to png-mng-implement at lists.sf.net (subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement). https://lists.sourceforge.net/lists/listinfo/png-mng-implement).

13
CHANGES
View File

@ -2700,10 +2700,15 @@ version 1.4.5beta04 [November 8, 2010]
version 1.4.5rc01 [November 19, 2010] version 1.4.5rc01 [November 19, 2010]
No changes. No changes.
Send comments/corrections/commendations to glennrp at users.sourceforge.net version 1.4.5rc02 [November 20, 2010]
or to png-mng-implement at lists.sf.net (subscription required; visit Removed some extraneous parentheses that appeared in pngrutil.c of
https://lists.sourceforge.net/lists/listinfo/png-mng-implement). libpng-1.4.3bet01
version 1.4.4-optipng [November 14, 2010]
Fixed atomicity of chunk header serialization (Cosmin)
Added test for io_state in pngtest.c (Cosmin)
Moved reading of file signature into png_read_sig (Cosmin)
Revised png_get_uint_32, png_get_int_32, png_get_uint_16 (Cosmin)
Glenn R-P
*/ } */ }
#endif #endif

View File

@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file /* pngrutil.c - utilities to read a PNG file
* *
* Last changed in libpng 1.4.4 [August 26, 2010] * Last changed in libpng 1.4.5 [November 20, 2010]
* Copyright (c) 1998-2010 Glenn Randers-Pehrson * Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@ -47,8 +47,8 @@ png_get_uint_32)(png_bytep buf)
* is no guarantee that a 'png_int_32' is exactly 32 bits, therefore * is no guarantee that a 'png_int_32' is exactly 32 bits, therefore
* the following code does a two's complement to native conversion. * the following code does a two's complement to native conversion.
*/ */
png_int_32 (PNGAPI png_int_32 PNGAPI
png_get_int_32)(png_bytep buf) png_get_int_32 (png_bytep buf)
{ {
png_uint_32 u = png_get_uint_32(buf); png_uint_32 u = png_get_uint_32(buf);
if ((u & 0x80000000) == 0) /* non-negative */ if ((u & 0x80000000) == 0) /* non-negative */
@ -59,8 +59,8 @@ png_get_int_32)(png_bytep buf)
} }
/* Grab an unsigned 16-bit integer from a buffer in big-endian format. */ /* Grab an unsigned 16-bit integer from a buffer in big-endian format. */
png_uint_16 (PNGAPI png_uint_16 PNGAPI
png_get_uint_16)(png_bytep buf) png_get_uint_16 (png_bytep buf)
{ {
png_uint_16 i = png_uint_16 i =
((png_uint_32)(*buf) << 8) + ((png_uint_32)(*buf) << 8) +