[mapserver-commits] r11311 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2011-03-23 08:28:19 -0700 (Wed, 23 Mar 2011)
New Revision: 11311

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapimageio.c
Log:
use png_sig_cmp instead of png_check_sig (#3762)



Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-03-23 15:06:00 UTC (rev 11310)
+++ trunk/mapserver/HISTORY.TXT	2011-03-23 15:28:19 UTC (rev 11311)
@@ -14,6 +14,7 @@
 
 Current Version (SVN trunk):
 ----------------------------
+ - use png_sig_cmp instead of png_check_sig (#3762)
 
 - Rendering: scale style OFFSET and GAP the same way we scale other style attributes.
   Beforehand, we scaled them proportionaly to the computeed width.

Modified: trunk/mapserver/mapimageio.c
===================================================================
--- trunk/mapserver/mapimageio.c	2011-03-23 15:06:00 UTC (rev 11310)
+++ trunk/mapserver/mapimageio.c	2011-03-23 15:28:19 UTC (rev 11311)
@@ -1180,7 +1180,7 @@
     }
     fread(signature,1,8,stream);
     fclose(stream);
-    if(png_check_sig(signature,8)) {
+    if(png_sig_cmp(signature,0,8) == 0) {
         ret = readPNG(path,rb);
     }
 #ifdef USE_GIF