[gs-cvs] rev 8157 - trunk/gs/libpng

[alexcher at ghostscript.com]

Author: alexcher
Date: 2007-07-31 21:01:06 -0700 (Tue, 31 Jul 2007)
New Revision: 8157

Modified:
   trunk/gs/libpng/pngerror.c
   trunk/gs/libpng/pngtrans.c
Log:
Remove inappropriate PNG_CONST qualifier from a few libpng arrays, where it
adds 2nd const qualifier, which is rejected by MSVC 6. Bug 689383.


Modified: trunk/gs/libpng/pngerror.c
===================================================================
--- trunk/gs/libpng/pngerror.c	2007-07-31 14:19:45 UTC (rev 8156)
+++ trunk/gs/libpng/pngerror.c	2007-08-01 04:01:06 UTC (rev 8157)
@@ -113,7 +113,7 @@
  * if the character is invalid.
  */
 #define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
-const static PNG_CONST char png_digit[16] = {
+static const char png_digit[16] = {
    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
    'A', 'B', 'C', 'D', 'E', 'F'
 };

Modified: trunk/gs/libpng/pngtrans.c
===================================================================
--- trunk/gs/libpng/pngtrans.c	2007-07-31 14:19:45 UTC (rev 8156)
+++ trunk/gs/libpng/pngtrans.c	2007-08-01 04:01:06 UTC (rev 8157)
@@ -252,7 +252,7 @@
 #endif
 
 #if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-const static PNG_CONST png_byte onebppswaptable[256] = {
+static const png_byte onebppswaptable[256] = {
    0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
    0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
    0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
@@ -287,7 +287,7 @@
    0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
 };
 
-const static PNG_CONST png_byte twobppswaptable[256] = {
+static const png_byte twobppswaptable[256] = {
    0x00, 0x40, 0x80, 0xC0, 0x10, 0x50, 0x90, 0xD0,
    0x20, 0x60, 0xA0, 0xE0, 0x30, 0x70, 0xB0, 0xF0,
    0x04, 0x44, 0x84, 0xC4, 0x14, 0x54, 0x94, 0xD4,
@@ -322,7 +322,7 @@
    0x2F, 0x6F, 0xAF, 0xEF, 0x3F, 0x7F, 0xBF, 0xFF
 };
 
-const static PNG_CONST png_byte fourbppswaptable[256] = {
+static const png_byte fourbppswaptable[256] = {
    0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
    0x80, 0x90, 0xA0, 0xB0, 0xC0, 0xD0, 0xE0, 0xF0,
    0x01, 0x11, 0x21, 0x31, 0x41, 0x51, 0x61, 0x71,