cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[devel] Trying a different PNG_UNUSED macro.

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2011-01-27 09:37:34 -06:00
parent 0012e9cd54
commit 2774238722
5 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.5.1beta10 - January 27, 2011 Libpng 1.5.1beta11 - January 27, 2011
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.5.1beta10.tar.xz (LZMA-compressed, recommended) 1.5.1beta11.tar.xz (LZMA-compressed, recommended)
1.5.1beta10.tar.gz 1.5.1beta11.tar.gz
1.5.1beta10.tar.bz2 1.5.1beta11.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
lp151b10.7z (LZMA-compressed, recommended) lp151b11.7z (LZMA-compressed, recommended)
lp151b10.zip lp151b11.zip
Other information: Other information:
1.5.1beta10-README.txt 1.5.1beta11-README.txt
1.5.1beta10-LICENSE.txt 1.5.1beta11-LICENSE.txt
Changes since the last public release (1.5.0): Changes since the last public release (1.5.0):
@ -96,7 +96,7 @@ Version 1.5.1beta09 [January 24, 2011]
documentation did not accurately describe what libpng really does when documentation did not accurately describe what libpng really does when
converting RGB to gray. converting RGB to gray.
Version 1.5.1beta10 [January 27, 2011] Version 1.5.1beta10 [January 27, 2010]
Fixed incorrect examples of callback prototypes in the manual, that were Fixed incorrect examples of callback prototypes in the manual, that were
introduced in libpng-1.0.0. introduced in libpng-1.0.0.
In addition the order of the png_get_uint macros with respect to the In addition the order of the png_get_uint macros with respect to the
@ -108,6 +108,9 @@ Version 1.5.1beta10 [January 27, 2011]
Made the manual, synopses, and function prototypes use the function Made the manual, synopses, and function prototypes use the function
argument names file_gamma, int_file_gamma, and srgb_intent consistently. argument names file_gamma, int_file_gamma, and srgb_intent consistently.
Version 1.5.1beta11 [January 27, 2011]
Changed PNG_UNUSED from "param=param;" to "(void)(param ? 0 : 0));" (Cosmin)
Send comments/corrections/commendations to png-mng-implement at lists.sf.net: Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
(subscription required; visit (subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement https://lists.sourceforge.net/lists/listinfo/png-mng-implement

5
CHANGES
View File

@ -3212,7 +3212,7 @@ Version 1.5.1beta09 [January 24, 2011]
documentation did not accurately describe what libpng really does when documentation did not accurately describe what libpng really does when
converting RGB to gray. converting RGB to gray.
Version 1.5.1beta10 [January 27, 2011] Version 1.5.1beta10 [January 27, 2010]
Fixed incorrect examples of callback prototypes in the manual, that were Fixed incorrect examples of callback prototypes in the manual, that were
introduced in libpng-1.0.0. introduced in libpng-1.0.0.
In addition the order of the png_get_uint macros with respect to the In addition the order of the png_get_uint macros with respect to the
@ -3224,6 +3224,9 @@ Version 1.5.1beta10 [January 27, 2011]
Made the manual, synopses, and function prototypes use the function Made the manual, synopses, and function prototypes use the function
argument names file_gamma, int_file_gamma, and srgb_intent consistently. argument names file_gamma, int_file_gamma, and srgb_intent consistently.
Version 1.5.1beta11 [January 27, 2011]
Changed PNG_UNUSED from "param=param;" to "(void)(param ? 0 : 0));" (Cosmin)
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement https://lists.sourceforge.net/lists/listinfo/png-mng-implement

4
libpng-manual.txt
View File

@ -849,7 +849,7 @@ pointer into the info_ptr is returned for any complex types.
num_palette - number of entries in the palette num_palette - number of entries in the palette
png_get_gAMA(png_ptr, info_ptr, &file_gamma); png_get_gAMA(png_ptr, info_ptr, &file_gamma);
png_set_gAMA_fixed(png_ptr, info_ptr, int_file_gamma); png_get_gAMA_fixed(png_ptr, info_ptr, &int_file_gamma);
file_gamma - the gamma at which the file is file_gamma - the gamma at which the file is
written (PNG_INFO_gAMA) written (PNG_INFO_gAMA)
@ -859,7 +859,7 @@ pointer into the info_ptr is returned for any complex types.
png_get_sRGB(png_ptr, info_ptr, &srgb_intent); png_get_sRGB(png_ptr, info_ptr, &srgb_intent);
srgb_intent - the rendering intent (PNG_INFO_sRGB) file_srgb_intent - the rendering intent (PNG_INFO_sRGB)
The presence of the sRGB chunk The presence of the sRGB chunk
means that the pixel data is in the means that the pixel data is in the
sRGB color space. This chunk also sRGB color space. This chunk also

8
libpng.3
View File

@ -1768,7 +1768,7 @@ pointer into the info_ptr is returned for any complex types.
num_palette - number of entries in the palette num_palette - number of entries in the palette
png_get_gAMA(png_ptr, info_ptr, &file_gamma); png_get_gAMA(png_ptr, info_ptr, &file_gamma);
png_set_gAMA_fixed(png_ptr, info_ptr, int_file_gamma); png_get_gAMA_fixed(png_ptr, info_ptr, &int_file_gamma);
file_gamma - the gamma at which the file is file_gamma - the gamma at which the file is
written (PNG_INFO_gAMA) written (PNG_INFO_gAMA)
@ -1778,7 +1778,7 @@ pointer into the info_ptr is returned for any complex types.
png_get_sRGB(png_ptr, info_ptr, &srgb_intent); png_get_sRGB(png_ptr, info_ptr, &srgb_intent);
srgb_intent - the rendering intent (PNG_INFO_sRGB) file_srgb_intent - the rendering intent (PNG_INFO_sRGB)
The presence of the sRGB chunk The presence of the sRGB chunk
means that the pixel data is in the means that the pixel data is in the
sRGB color space. This chunk also sRGB color space. This chunk also
@ -5099,7 +5099,7 @@ the first widely used release:
1.0.6h 10007 10.6h 1.0.6h 10007 10.6h
1.0.6i 10007 10.6i 1.0.6i 10007 10.6i
1.0.6j 10007 2.1.0.6j 1.0.6j 10007 2.1.0.6j
1.0.7beta11-14 DLLNUM 10007 2.1.0.7beta11-14 1.0.7beta10-14 DLLNUM 10007 2.1.0.7beta10-14
1.0.7beta15-18 1 10007 2.1.0.7beta15-18 1.0.7beta15-18 1 10007 2.1.0.7beta15-18
1.0.7rc1-2 1 10007 2.1.0.7rc1-2 1.0.7rc1-2 1 10007 2.1.0.7rc1-2
1.0.7 1 10007 2.1.0.7 1.0.7 1 10007 2.1.0.7
@ -5188,7 +5188,7 @@ the first widely used release:
1.5.0beta01-58 15 10500 15.so.15.0[.0] 1.5.0beta01-58 15 10500 15.so.15.0[.0]
1.5.0rc01-07 15 10500 15.so.15.0[.0] 1.5.0rc01-07 15 10500 15.so.15.0[.0]
1.5.0 15 10500 15.so.15.0[.0] 1.5.0 15 10500 15.so.15.0[.0]
1.5.1beta01-10 15 10501 15.so.15.1[.0] 1.5.1rc01 15 10501 15.so.15.1[.0]
Henceforth the source version will match the shared-library minor Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be and patch numbers; the shared-library major version number will be

8
pngpriv.h
View File

@ -89,7 +89,13 @@ typedef PNG_CONST png_uint_16p FAR * png_const_uint_16pp;
* the terminating semicolon. * the terminating semicolon.
*/ */
#ifndef PNG_UNUSED #ifndef PNG_UNUSED
# define PNG_UNUSED(param) param = param; /* Different possiblities being discussed on png-mng-implement, Jan 2011 */
/* # define PNG_UNUSED(param) param = param; */
/* # define PNG_UNUSED(param) if(param); */
/* # define PNG_UNUSED(param) if(param){} */
/* # define PNG_UNUSED(param) {if(param){}} */
/* # define PNG_UNUSED(param) {(void)param;} */
# define PNG_UNUSED(param) ((void)(param ? 0 : 0));
#endif #endif
/* Just a little check that someone hasn't tried to define something /* Just a little check that someone hasn't tried to define something