[devel] Trying a different PNG_UNUSED macro.
diff --git a/ANNOUNCE b/ANNOUNCE
index 1411766..c8c6436 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -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
within a few weeks by a public version or by another test version.
@@ -9,20 +9,20 @@
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- 1.5.1beta10.tar.xz (LZMA-compressed, recommended)
- 1.5.1beta10.tar.gz
- 1.5.1beta10.tar.bz2
+ 1.5.1beta11.tar.xz (LZMA-compressed, recommended)
+ 1.5.1beta11.tar.gz
+ 1.5.1beta11.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp151b10.7z (LZMA-compressed, recommended)
- lp151b10.zip
+ lp151b11.7z (LZMA-compressed, recommended)
+ lp151b11.zip
Other information:
- 1.5.1beta10-README.txt
- 1.5.1beta10-LICENSE.txt
+ 1.5.1beta11-README.txt
+ 1.5.1beta11-LICENSE.txt
Changes since the last public release (1.5.0):
@@ -96,7 +96,7 @@
documentation did not accurately describe what libpng really does when
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
introduced in libpng-1.0.0.
In addition the order of the png_get_uint macros with respect to the
@@ -108,6 +108,9 @@
Made the manual, synopses, and function prototypes use the function
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:
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/CHANGES b/CHANGES
index 6b18c8f..59b3c3d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3212,7 +3212,7 @@
documentation did not accurately describe what libpng really does when
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
introduced in libpng-1.0.0.
In addition the order of the png_get_uint macros with respect to the
@@ -3224,6 +3224,9 @@
Made the manual, synopses, and function prototypes use the function
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
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/libpng-manual.txt b/libpng-manual.txt
index 10eb6f6..7a429b0 100644
--- a/libpng-manual.txt
+++ b/libpng-manual.txt
@@ -849,7 +849,7 @@
num_palette - number of entries in the palette
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
written (PNG_INFO_gAMA)
@@ -859,7 +859,7 @@
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
means that the pixel data is in the
sRGB color space. This chunk also
diff --git a/libpng.3 b/libpng.3
index 6258a34..633b8d3 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1768,7 +1768,7 @@
num_palette - number of entries in the palette
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
written (PNG_INFO_gAMA)
@@ -1778,7 +1778,7 @@
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
means that the pixel data is in the
sRGB color space. This chunk also
@@ -5099,7 +5099,7 @@
1.0.6h 10007 10.6h
1.0.6i 10007 10.6i
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.7rc1-2 1 10007 2.1.0.7rc1-2
1.0.7 1 10007 2.1.0.7
@@ -5188,7 +5188,7 @@
1.5.0beta01-58 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.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
and patch numbers; the shared-library major version number will be
diff --git a/pngpriv.h b/pngpriv.h
index 1d916a6..21c8a44 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -89,7 +89,13 @@
* the terminating semicolon.
*/
#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
/* Just a little check that someone hasn't tried to define something
