summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2010-01-10 02:13:45 +0000
committerPierre Joye <pajoye@php.net>2010-01-10 02:13:45 +0000
commit7aacc1ccbc8d7cb9bbb061ddfce8da2920498a1c (patch)
tree126da5f5a7da32c57473fb38df713d7ac23a45e4
parent81695689b9a1a44e2410b284ec3dcb1d76341829 (diff)
downloadphp-git-7aacc1ccbc8d7cb9bbb061ddfce8da2920498a1c.tar.gz
- use png_sig_cmp to support libpng 1.4, old is deprecated already in older version
-rw-r--r--NEWS1
-rw-r--r--ext/gd/libgd/gd_png.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index b95311040a..5447487b27 100644
--- 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 da5a32f682..52a087e787 100644
--- 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;
}