mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[master] Restored the parentheses in pngrutil.c; they are needed when the

Browse Source 
png_get_*int_*() functions are compiled (i.e., when PNG_USE_READ_MACROS
is not defined).
This commit is contained in:
Glenn Randers-Pehrson 2010-11-20 21:41:51 -06:00
parent b4a5d88e0a
commit f320728911
4 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ANNOUNCE
View File

@ -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 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.
@ -46,7 +46,7 @@ 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.5beta05 [November 20, 2010] version 1.4.5beta05 [November 21, 2010]
Removed some extraneous parentheses that appeared in pngrutil.c of Removed some extraneous parentheses that appeared in pngrutil.c of
libpng-1.4.3beta01 libpng-1.4.3beta01
Revised png_get_uint_32, png_get_int_32, png_get_uint_16 (Cosmin) 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 test for io_state in pngtest.c (Cosmin)
Added "#!/bin/sh" at the top of contrib/pngminim/*/gather.sh scripts. 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 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).

12
CHANGES
View File

@ -2701,13 +2701,21 @@ version 1.4.5rc01 [November 19, 2010]
No changes. No changes.
version 1.4.5beta05 [November 20, 2010] 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) Revised png_get_uint_32, png_get_int_32, png_get_uint_16 (Cosmin)
Moved reading of file signature into png_read_sig (Cosmin) Moved reading of file signature into png_read_sig (Cosmin)
Fixed atomicity of chunk header serialization (Cosmin) Fixed atomicity of chunk header serialization (Cosmin)
Added test for io_state in pngtest.c (Cosmin) Added test for io_state in pngtest.c (Cosmin)
Added "#!/bin/sh" at the top of contrib/pngminim/*/gather.sh scripts. 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 #endif

12
libpngpf.3
View File

@ -1,4 +1,4 @@
.TH LIBPNGPF 3 "November 20, 2010" .TH LIBPNGPF 3 "November 21, 2010"
.SH NAME .SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.5rc02 libpng \- Portable Network Graphics (PNG) Reference Library 1.4.5rc02
(private functions) (private functions)
@ -581,32 +581,26 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.5rc02
\fI\fB \fI\fB
\fI\fB
\fBvoid png_read_push_finish_row (png_structp \fIpng_ptr\fP\fB);\fP \fBvoid png_read_push_finish_row (png_structp \fIpng_ptr\fP\fB);\fP
\fI\fB \fI\fB
\fBvoid png_read_sig (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
\fI\fB \fI\fB
\fBvoid png_read_start_row (png_structp \fIpng_ptr\fP\fB);\fP \fBvoid png_read_start_row (png_structp \fIpng_ptr\fP\fB);\fP
\fI\fB \fI\fB
\fI\fB
\fBvoid png_read_transform_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP \fBvoid png_read_transform_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP
\fI\fB \fI\fB
\fI\fB
\fBvoid png_reset_crc (png_structp \fIpng_ptr\fP\fB);\fP \fBvoid png_reset_crc (png_structp \fIpng_ptr\fP\fB);\fP
\fI\fB \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 \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 \fI\fB

14
pngrutil.c
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.5 [November 20, 2010] * Last changed in libpng 1.4.5 [November 21, 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.)
@ -32,8 +32,8 @@ png_get_uint_31(png_structp png_ptr, png_bytep buf)
#ifndef PNG_USE_READ_MACROS #ifndef PNG_USE_READ_MACROS
/* Grab an unsigned 32-bit integer from a buffer in big-endian format. */ /* Grab an unsigned 32-bit integer from a buffer in big-endian format. */
png_uint_32 PNGAPI png_uint_32 (PNGAPI
png_get_uint_32(png_bytep buf) png_get_uint_32)(png_bytep buf)
{ {
png_uint_32 uval = png_get_uint_32(buf); png_uint_32 uval = png_get_uint_32(buf);
if ((uval & 0x80000000L) == 0) /* non-negative */ 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 * 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 uval = png_get_uint_32(buf); png_uint_32 uval = png_get_uint_32(buf);
if ((uval & 0x80000000L) == 0) /* non-negative */ 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. */ /* 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)
{ {
unsigned int val = unsigned int val =
((unsigned int)(*buf) << 8) + ((unsigned int)(*buf) << 8) +