cvs: php4(PHP_4_0_6) /ext/gd config.m4 gd.c
| From: | Jani Taskinen | Date: | Mon, 21 May 2001 19:28:45 +0000 |
| Subject: | cvs: php4(PHP_4_0_6) /ext/gd config.m4 gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-5907@lists.php.net to get a copy of this message | ||
sniper Mon May 21 12:28:45 2001 EDT
Modified files: (Branch: PHP_4_0_6)
/php4/ext/gd config.m4 gd.c
Log:
MFH
Index: php4/ext/gd/config.m4
diff -u php4/ext/gd/config.m4:1.60.2.2 php4/ext/gd/config.m4:1.60.2.3
--- php4/ext/gd/config.m4:1.60.2.2 Sun May 20 16:17:49 2001
+++ php4/ext/gd/config.m4 Mon May 21 12:28:45 2001
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.60.2.2 2001/05/20 23:17:49 sniper Exp $
+dnl $Id: config.m4,v 1.60.2.3 2001/05/21 19:28:45 sniper Exp $
dnl
AC_DEFUN(PHP_GD_JPEG,[
@@ -180,6 +180,7 @@
AC_CHECK_LIB(gd, gdImageStringFTEx, [AC_DEFINE(HAVE_GD_STRINGFTEX, 1, [ ])])
AC_CHECK_LIB(gd, gdImageColorClosestHWB, [AC_DEFINE(HAVE_COLORCLOSESTHWB, 1, [ ])])
AC_CHECK_LIB(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE, 1, [ ])])
+ AC_CHECK_LIB(gd, gdImageGifCtx, [AC_DEFINE(HAVE_GD_GIF_CTX, 1, [ ])])
])
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.123 php4/ext/gd/gd.c:1.123.2.1
--- php4/ext/gd/gd.c:1.123 Mon Apr 30 05:43:36 2001
+++ php4/ext/gd/gd.c Mon May 21 12:28:45 2001
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.123 2001/04/30 12:43:36 andi Exp $ */
+/* $Id: gd.c,v 1.123.2.1 2001/05/21 19:28:45 sniper Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1394,7 +1394,7 @@
PHP_FUNCTION(imagegif)
{
#ifdef HAVE_GD_GIF
-#ifdef USE_GD_IOCTX
+#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);