- use png_sig_cmp to support libpng 1.4, old is deprecated already in older version

diff --git a/NEWS b/NEWS
index b95311040af50d4442786af3c3c6a5724d97745c..5447487b27818289c4464fda46509e8fc576d339 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ PHP                                                                        NEWS
 
 - Improved LCG entropy. (Rasmus, Samy Kamkar)
 
+- Added libpng 1.4.0 support. (Pierre)
 - Added support for DISABLE_AUTHENTICATOR for imap_open. (Pierre)
 - Added missing host validation for HTTP urls inside FILTER_VALIDATE_URL.
   (Ilia)

diff --git a/ext/gd/libgd/gd_png.c b/ext/gd/libgd/gd_png.c
index da5a32f682158e499bf44da58f557d94580e6637..52a087e787418461a1ceaba9a8150586ae148861 100644 (file)
--- a/ext/gd/libgd/gd_png.c
+++ b/ext/gd/libgd/gd_png.c
@@ -145,7 +145,7 @@ gdImagePtr gdImageCreateFromPngCtx (gdIOCtx * infile)
                return NULL;
        }
 
-       if (!png_check_sig (sig, 8)) { /* bad signature */
+       if (png_sig_cmp(sig, 0, 8) != 0) { /* bad signature */
                return NULL;
        }