cvs: php4 /ext/gd gd.c
| From: | Derick Rethans | Date: | Fri, 01 Feb 2002 08:53:48 +0000 |
| Subject: | cvs: php4 /ext/gd gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-9229@lists.php.net to get a copy of this message | ||
derick Fri Feb 1 03:53:48 2002 EDT
Modified files:
/php4/ext/gd gd.c
Log:
- Fix for bug 14899 (patch by Sander Roobol <sander@php.net>)
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.175 php4/ext/gd/gd.c:1.176
--- php4/ext/gd/gd.c:1.175 Tue Jan 1 20:25:48 2002
+++ php4/ext/gd/gd.c Fri Feb 1 03:53:47 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.175 2002/01/02 01:25:48 jimw Exp $ */
+/* $Id: gd.c,v 1.176 2002/02/01 08:53:47 derick Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -928,7 +928,7 @@
PHP_FUNCTION(imagetypes)
{
int ret=0;
-#ifdef HAVE_GD_GIF
+#ifdef HAVE_GD_GIF_CREATE
ret = 1;
#endif
#ifdef HAVE_GD_JPG
@@ -1204,7 +1204,7 @@
#else /* HAVE_GD_GIF_READ */
php_error(E_WARNING, "ImageCreateFromGif: No GIF read support in this PHP build");
RETURN_FALSE;
-#endif /* HAVE_GD_GIF */
+#endif /* HAVE_GD_GIF_READ */
}
/* }}} */
@@ -1431,10 +1431,10 @@
#else
_php_image_output(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF",
gdImageGif);
#endif
-#else /* HAVE_GD_GIF */
+#else /* HAVE_GD_GIF_CREATE */
php_error(E_WARNING, "ImageGif: No GIF create support in this PHP build");
RETURN_FALSE;
-#endif /* HAVE_GD_GIF */
+#endif /* HAVE_GD_GIF_CREATE */
}
/* }}} */