Browse Source

Made phpinfo() / gd_info() indicate availability of JIS feature

migration/unlabaled-1.3.2
Moriyoshi Koizumi 24 years ago
parent
commit
6be2406b63
  1. 3
      ext/gd/config.m4
  2. 8
      ext/gd/gd.c

3
ext/gd/config.m4

@ -230,7 +230,7 @@ AC_DEFUN(PHP_GD_TTSTR,[
AC_DEFUN(PHP_GD_JISX0208,[
if test "$PHP_GD_JIS_CONV" = "yes"; then
USE_GD_JIS_CONV=1
USE_GD_JIS_CONV=1
fi
])
@ -330,6 +330,7 @@ dnl enable the support in bundled GD library
fi
if test -n "$USE_GD_JIS_CONV"; then
AC_DEFINE(USE_GD_JISX0208, 1, [ ])
GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"
fi

8
ext/gd/gd.c

@ -499,6 +499,9 @@ PHP_MINFO_FUNCTION(gd)
#endif
#ifdef HAVE_GD_XBM
php_info_print_table_row(2, "XBM Support", "enabled");
#endif
#if defined(USE_GD_JISX0208) && defined(HAVE_GD_BUNDLED)
php_info_print_table_row(2, "JIS-mapped Japanese Font Support", "enabled");
#endif
php_info_print_table_end();
}
@ -570,6 +573,11 @@ PHP_FUNCTION(gd_info)
#else
add_assoc_bool(return_value, "XBM Support", 0);
#endif
#if defined(USE_GD_JISX0208) && defined(HAVE_GD_BUNDLED)
add_assoc_bool(return_value, "JIS-mapped Japanese Font Support", 1);
#else
add_assoc_bool(return_value, "JIS-mapped Japanese Font Support", 0);
#endif
}
/* }}} */

Loading…
Cancel
Save