svn: /php/php-src/branches/PHP_5_3_2/ext/gd/libgd/ gd_png.c
| From: | Pierre Joye | Date: | Wed, 03 Feb 2010 17:47:28 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_3_2/ext/gd/libgd/ gd_png.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-61725@lists.php.net to get a copy of this message | ||
pajoye Wed, 03 Feb 2010 17:47:28 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=294425
Log:
- Merge: use png_sig_cmp to support libpng 1.4, old is deprecated already in older vers
Changed paths:
U php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd_png.c
Modified: php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd_png.c
===================================================================
--- php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd_png.c 2010-02-03 17:44:30 UTC (rev 294424)
+++ php/php-src/branches/PHP_5_3_2/ext/gd/libgd/gd_png.c 2010-02-03 17:47:28 UTC (rev 294425)
@@ -145,7 +145,7 @@
return NULL;
}
- if (!png_check_sig (sig, 8)) { /* bad signature */
+ if (png_sig_cmp(sig, 0, 8) != 0) { /* bad signature */
return NULL;
}