cvs: php4 /ext/gd config.m4 gd.c

sniper Fri Aug 24 16:05:58 2001 EDT Modified files: /php4/ext/gd config.m4 gd.c Log: Fixed bug: #12948, #12945 Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.71 php4/ext/gd/config.m4:1.72 --- php4/ext/gd/config.m4:1.71 Tue Jul 3 17:09:16 2001 +++ php4/ext/gd/config.m4 Fri Aug 24 16:05:58 2001 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.71 2001/07/03 21:09:16 sniper Exp $ +dnl $Id: config.m4,v 1.72 2001/08/24 20:05:58 sniper Exp $ dnl AC_DEFUN(PHP_GD_JPEG,[ @@ -172,7 +172,8 @@ AC_CHECK_LIB(gd, gdImageString16, [AC_DEFINE(HAVE_LIBGD13, 1, [ ])]) AC_CHECK_LIB(gd, gdImagePaletteCopy, [AC_DEFINE(HAVE_LIBGD15, 1, [ ])]) AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])]) - AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF, 1, [ ])]) + AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF_READ, 1, [ ])]) + AC_CHECK_LIB(gd, gdImageGif, [AC_DEFINE(HAVE_GD_GIF_CREATE, 1, [ ])]) AC_CHECK_LIB(gd, gdImageWBMP, [AC_DEFINE(HAVE_GD_WBMP, 1, [ ])]) AC_CHECK_LIB(gd, gdImageCreateFromJpeg, [AC_DEFINE(HAVE_GD_JPG, 1, [ ])]) AC_CHECK_LIB(gd, gdImageCreateFromXpm, [AC_DEFINE(HAVE_GD_XPM, 1, [ ])]) Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.155 php4/ext/gd/gd.c:1.156 --- php4/ext/gd/gd.c:1.155 Wed Aug 22 04:32:22 2001 +++ php4/ext/gd/gd.c Fri Aug 24 16:05:58 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.155 2001/08/22 08:32:22 sniper Exp $ */ +/* $Id: gd.c,v 1.156 2001/08/24 20:05:58 sniper Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -305,8 +305,11 @@ /* this next part is stupid ... if I knew better, I'd put them all on one row (cmv) */ -#ifdef HAVE_GD_GIF - php_info_print_table_row(2, "GIF Support", "enabled"); +#ifdef HAVE_GD_GIF_READ + php_info_print_table_row(2, "GIF Read Support", "enabled"); +#endif +#ifdef(HAVE_GD_GID_CREATE) + php_info_print_table_row(2, "GIF Create Support", "enabled"); #endif #ifdef HAVE_GD_JPG php_info_print_table_row(2, "JPG Support", "enabled"); @@ -1045,7 +1048,7 @@ break; case PHP_GDIMG_TYPE_GIF: -#ifdef HAVE_GD_GIF +#ifdef HAVE_GD_GIF_READ im = _php_image_create_from_string (data, "GIF", gdImageCreateFromGifCtx TSRMLS_CC); #else php_error(E_WARNING, "No GIF support in this PHP build"); @@ -1187,10 +1190,10 @@ Create a new image from GIF file or URL */ PHP_FUNCTION(imagecreatefromgif) { -#ifdef HAVE_GD_GIF +#ifdef HAVE_GD_GIF_READ _php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageCreateFromGif, gdImageCreateFromGifCtx); -#else /* HAVE_GD_GIF */ - php_error(E_WARNING, "ImageCreateFromGif: No GIF support in this PHP build"); +#else /* HAVE_GD_GIF_READ */ + php_error(E_WARNING, "ImageCreateFromGif: No GIF read support in this PHP build"); RETURN_FALSE; #endif /* HAVE_GD_GIF */ } @@ -1413,14 +1416,14 @@ Output GIF image to browser or file */ PHP_FUNCTION(imagegif) { -#ifdef HAVE_GD_GIF +#ifdef HAVE_GD_GIF_CREATE #ifdef HAVE_GD_GIF_CTX _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageGifCtx); #else _php_image_output(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageGif); #endif #else /* HAVE_GD_GIF */ - php_error(E_WARNING, "ImageGif: No GIF support in this PHP build"); + php_error(E_WARNING, "ImageGif: No GIF create support in this PHP build"); RETURN_FALSE; #endif /* HAVE_GD_GIF */ } @@ -3447,7 +3450,7 @@ } switch (image_type) { -#ifdef HAVE_GD_GIF +#ifdef HAVE_GD_GIF_READ case PHP_GDIMG_TYPE_GIF: im_org = gdImageCreateFromGif (org); if (im_org == NULL) { @@ -3455,7 +3458,7 @@ RETURN_FALSE; } break; -#endif /* HAVE_GD_GIF */ +#endif /* HAVE_GD_GIF_READ */ #ifdef HAVE_GD_JPG case PHP_GDIMG_TYPE_JPG: