[libpng16] Cleaned up pngpriv.h to consistently declare all functions and data.

Also eliminated PNG_CONST_DATA, which is apparently not needed but we
can't be sure until it is gone.

ANNOUNCE

@@ -1,5 +1,5 @@
 
-Libpng 1.6.0beta08 - January 29, 2012
+Libpng 1.6.0beta08 - January 31, 2012
 
 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.
@@ -142,7 +142,7 @@ Version 1.6.0beta07 [January 28, 2012]
     and renamed three whose names were inconsistent with those in
     pngsuite/README.txt.
 
-Version 1.6.0beta08 [January 29, 2012]
+Version 1.6.0beta08 [January 31, 2012]
   Fixed Image::colormap misalignment in pngstest.c
   Check libtool/libtoolize version number (2.4.2) in configure.ac
   Divide test-pngstest.sh into separate pngstest runs for basic and
@@ -154,6 +154,9 @@ Version 1.6.0beta08 [January 29, 2012]
     the background parameter of png_image_finish_read. The --background
     option is now done automagically only when required, so that commandline
     option no longer exists.
+  Cleaned up pngpriv.h to consistently declare all functions and data.
+    Also eliminated PNG_CONST_DATA, which is apparently not needed but we
+    can't be sure until it is gone.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit

CHANGES

@@ -3893,7 +3893,7 @@ Version 1.6.0beta07 [January 28, 2012]
     and renamed three whose names were inconsistent with those in
     pngsuite/README.txt.
 
-Version 1.6.0beta08 [January 29, 2012]
+Version 1.6.0beta08 [January 31, 2012]
   Fixed Image::colormap misalignment in pngstest.c
   Check libtool/libtoolize version number (2.4.2) in configure.ac
   Divide test-pngstest.sh into separate pngstest runs for basic and
@@ -3905,6 +3905,9 @@ Version 1.6.0beta08 [January 29, 2012]
     the background parameter of png_image_finish_read. The --background
     option is now done automagically only when required, so that commandline
     option no longer exists.
+  Cleaned up pngpriv.h to consistently declare all functions and data.
+    Also eliminated PNG_CONST_DATA, which is apparently not needed but we
+    can't be sure until it is gone.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit

png.c

@@ -762,13 +762,13 @@ png_get_copyright(png_const_structrp png_ptr)
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-     "libpng version 1.6.0beta08 - January 28, 2012" PNG_STRING_NEWLINE \
+     "libpng version 1.6.0beta08 - January 31, 2012" PNG_STRING_NEWLINE \
      "Copyright (c) 1998-2012 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
      "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
      "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
      PNG_STRING_NEWLINE;
 #  else
-      return "libpng version 1.6.0beta08 - January 28, 2012\
+      return "libpng version 1.6.0beta08 - January 31, 2012\
       Copyright (c) 1998-2012 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
@@ -2991,7 +2991,7 @@ png_build_gamma_table(png_structrp png_ptr, int bit_depth)
 
 #ifdef PNG_SIMPLIFIED_READ_SUPPORTED
 /* The convert-to-sRGB table is only currently required for read. */
-PNG_CONST_DATA png_uint_16 png_sRGB_table[256] =
+const png_uint_16 png_sRGB_table[256] =
 {
    0,20,40,60,80,99,119,139,
    159,179,199,219,241,264,288,313,
@@ -3032,7 +3032,7 @@ PNG_CONST_DATA png_uint_16 png_sRGB_table[256] =
 /* The base/delta tables are required for both read and write (but currently
  * only the simplified versions.)
  */
-PNG_CONST_DATA png_uint_16 png_sRGB_base[512] =
+const png_uint_16 png_sRGB_base[512] =
 {
    128,1782,3383,4644,5675,6564,7357,8074,
    8732,9346,9921,10463,10977,11466,11935,12384,
@@ -3100,7 +3100,7 @@ PNG_CONST_DATA png_uint_16 png_sRGB_base[512] =
    65070,65126,65183,65239,65296,65352,65409,65465
 };
 
-PNG_CONST_DATA png_byte png_sRGB_delta[512] =
+const png_byte png_sRGB_delta[512] =
 {
    207,201,158,129,113,100,90,82,77,72,68,64,61,59,56,54,
    52,50,49,47,46,45,43,42,41,40,39,39,38,37,36,36,