Isn't XPM support available with anything but our
bundled GD lib??
--Jani
On Sat, 1 Feb 2003, Marcus Boerger wrote:
>helly Sat Feb 1 18:24:00 2003 EDT
>
> Modified files:
> /php4/ext/gd gd.c
> Log:
> Show if XPM support is available & Set availability bit only when available.
>
>Index: php4/ext/gd/gd.c
>diff -u php4/ext/gd/gd.c:1.249 php4/ext/gd/gd.c:1.250
>--- php4/ext/gd/gd.c:1.249 Sat Jan 25 20:15:02 2003
>+++ php4/ext/gd/gd.c Sat Feb 1 18:23:59 2003
>@@ -18,7 +18,7 @@
> +----------------------------------------------------------------------+
> */
>
>-/* $Id: gd.c,v 1.249 2003/01/26 01:15:02 pollita Exp $ */
>+/* $Id: gd.c,v 1.250 2003/02/01 23:23:59 helly Exp $ */
>
> /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
> Cold Spring Harbor Labs. */
>@@ -479,6 +479,9 @@
> #ifdef HAVE_GD_WBMP
> php_info_print_table_row(2, "WBMP Support", "enabled");
> #endif
>+#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
>+ php_info_print_table_row(2, "XPM Support", "enabled");
>+#endif
> #ifdef HAVE_GD_XBM
> php_info_print_table_row(2, "XBM Support", "enabled");
> #endif
>@@ -552,6 +555,11 @@
> #else
> add_assoc_bool(return_value, "WBMP Support", 0);
> #endif
>+#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
>+ add_assoc_bool(return_value, "XPM Support", 1);
>+#else
>+ add_assoc_bool(return_value, "XPM Support", 0);
>+#endif
> #ifdef HAVE_GD_XBM
> add_assoc_bool(return_value, "XBM Support", 1);
> #else
>@@ -1211,7 +1219,7 @@
> #ifdef HAVE_GD_WBMP
> ret |= 8;
> #endif
>-#ifdef HAVE_GD_XPM
>+#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
> ret |= 16;
> #endif
> if (ZEND_NUM_ARGS() != 0) {
>
>
>
>
--
<- For Sale! ->
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
