svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/gd/libgd/gd_png.c trunk/ext/gd/libgd/gd_png.c

pajoye Sun, 10 Jan 2010 02:13:45 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=293341 Log: - use png_sig_cmp to support libpng 1.4, old is deprecated already in older version Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/gd/libgd/gd_png.c U php/php-src/trunk/ext/gd/libgd/gd_png.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-01-10 00:55:54 UTC (rev 293340) +++ php/php-src/branches/PHP_5_3/NEWS 2010-01-10 02:13:45 UTC (rev 293341) @@ -5,6 +5,7 @@ - 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) Modified: php/php-src/branches/PHP_5_3/ext/gd/libgd/gd_png.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/gd/libgd/gd_png.c 2010-01-10 00:55:54 UTC (rev 293340) +++ php/php-src/branches/PHP_5_3/ext/gd/libgd/gd_png.c 2010-01-10 02:13:45 UTC (rev 293341) @@ -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; } Modified: php/php-src/trunk/ext/gd/libgd/gd_png.c =================================================================== --- php/php-src/trunk/ext/gd/libgd/gd_png.c 2010-01-10 00:55:54 UTC (rev 293340) +++ php/php-src/trunk/ext/gd/libgd/gd_png.c 2010-01-10 02:13:45 UTC (rev 293341) @@ -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; }