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

tony2001 Tue Aug 1 22:42:11 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/gd gd.c gd_ctx.c Log: MFH: implement my own FR #36995 add missing ifdefs http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.3&r2=1.312.2.20.2.4&diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.3 php-src/ext/gd/gd.c:1.312.2.20.2.4 --- php-src/ext/gd/gd.c:1.312.2.20.2.3 Sun Jul 2 00:11:06 2006 +++ php-src/ext/gd/gd.c Tue Aug 1 22:42:11 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.312.2.20.2.3 2006/07/02 00:11:06 bjori Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.4 2006/08/01 22:42:11 tony2001 Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -2357,8 +2357,9 @@ php_stream *stream; FILE * fp = NULL; int argc=ZEND_NUM_ARGS(); +#ifdef HAVE_GD_JPG long ignore_warning; - +#endif if ((image_type == PHP_GDIMG_TYPE_GD2PART && argc != 5) || (image_type != PHP_GDIMG_TYPE_GD2PART && argc != 1) || @@ -4672,7 +4673,9 @@ int int_threshold; int x, y; float x_ratio, y_ratio; +#ifdef HAVE_GD_JPG long ignore_warning; +#endif if (argc != 5 || zend_get_parameters_ex(argc, &f_org, &f_dest, &height, &width, &threshold) == FAILURE) { ZEND_WRONG_PARAM_COUNT(); http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd_ctx.c?r1=1.22.2.5&r2=1.22.2.5.2.1&diff_format=u Index: php-src/ext/gd/gd_ctx.c diff -u php-src/ext/gd/gd_ctx.c:1.22.2.5 php-src/ext/gd/gd_ctx.c:1.22.2.5.2.1 --- php-src/ext/gd/gd_ctx.c:1.22.2.5 Fri Jan 27 13:36:29 2006 +++ php-src/ext/gd/gd_ctx.c Tue Aug 1 22:42:11 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd_ctx.c,v 1.22.2.5 2006/01/27 13:36:29 pajoye Exp $ */ +/* $Id: gd_ctx.c,v 1.22.2.5.2.1 2006/08/01 22:42:11 tony2001 Exp $ */ #include "php_gd.h" @@ -93,7 +93,7 @@ fp = VCWD_FOPEN(fn, "wb"); if (!fp) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open '%s' for writing", fn); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open '%s' for writing: %s", fn, strerror(errno)); RETURN_FALSE; }