cvs: php-src(PHP_5_2) /ext/gd gd.c

pajoye Mon Jul 30 21:42:36 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/gd gd.c Log: - fix gd bug #102, < 0 means that no load are loaded, return false - add error code in the warning http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.29&r2=1.312.2.20.2.30&diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.29 php-src/ext/gd/gd.c:1.312.2.20.2.30 --- php-src/ext/gd/gd.c:1.312.2.20.2.29 Wed Jun 6 09:45:43 2007 +++ php-src/ext/gd/gd.c Mon Jul 30 21:42:36 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.312.2.20.2.29 2007/06/06 09:45:43 tony2001 Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.30 2007/07/30 21:42:36 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -4363,7 +4363,8 @@ f_ind = T1_AddFont(Z_STRVAL_PP(file)); if (f_ind < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "T1Lib Error: %s", T1_StrError(f_ind)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "T1Lib Error (%i): %s", f_ind, T1_StrError(f_ind)); + RETURN_FALSE; } if (T1_LoadFont(f_ind)) {