com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/gd/gd.c

Commit: d565d4bc1cab2d695863a51eb6f998405b76c147 Author: Christoph M. Becker <cmb@php.net> Tue, 19 Jul 2016 00:46:24 +0200 Parents: 31cbe23a9a4a47b922cd1f6db1a393c5dbdaad36 3c3980caa1437dce5d56e16b5c0ce7d3395b6266 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d565d4bc1cab2d695863a51eb6f998405b76c147 Log: Merge branch 'PHP-5.6' into PHP-7.0 # Resolved conflicts: # ext/gd/gd.c Changed paths: MM NEWS MM ext/gd/gd.c Diff: diff --cc ext/gd/gd.c index a3b33fd,b843bda..b6fa6b9 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@@ -61,8 -61,17 +61,11 @@@ static int le_gd, le_gd_font; -#if HAVE_LIBT1 -#include <t1lib.h> -static int le_ps_font, le_ps_enc; -static void php_free_ps_font(zend_rsrc_list_entry *rsrc TSRMLS_DC); -static void php_free_ps_enc(zend_rsrc_list_entry *rsrc TSRMLS_DC); -#endif #include <gd.h> + #ifndef HAVE_GD_BUNDLED + # include <gd_errors.h> + #endif #include <gdfontt.h> /* 1 Tiny font */ #include <gdfonts.h> /* 2 Small font */ #include <gdfontmb.h> /* 3 Medium bold font */ @@@ -1020,8 -1100,21 +1023,20 @@@ static void php_free_gd_font(zend_resou */ void php_gd_error_method(int type, const char *format, va_list args) { - TSRMLS_FETCH(); - php_verror(NULL, "", type, format, args); + switch (type) { + case GD_DEBUG: + case GD_INFO: + case GD_NOTICE: + type = E_NOTICE; + break; + case GD_WARNING: + type = E_WARNING; + break; + default: + type = E_ERROR; + } + php_verror(NULL, "", type, format, args TSRMLS_CC); } /* }}} */ #endif