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

sniper Thu Sep 6 19:10:37 2001 EDT Modified files: /php4/ext/gd config.m4 gd.c Log: Fixed bug: #13172 Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.75 php4/ext/gd/config.m4:1.76 --- php4/ext/gd/config.m4:1.75 Thu Sep 6 16:55:24 2001 +++ php4/ext/gd/config.m4 Thu Sep 6 19:10:36 2001 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.75 2001/09/06 20:55:24 sniper Exp $ +dnl $Id: config.m4,v 1.76 2001/09/06 23:10:36 sniper Exp $ dnl AC_DEFUN(PHP_GD_JPEG,[ @@ -196,6 +196,8 @@ AC_CHECK_LIB(gd, gdImageCreateTrueColor, [AC_DEFINE(HAVE_LIBGD20, 1, [ ])]) AC_CHECK_LIB(gd, gdImageSetTile, [AC_DEFINE(HAVE_GD_IMAGESETTILE, 1, [ ])]) AC_CHECK_LIB(gd, gdImageSetBrush, [AC_DEFINE(HAVE_GD_IMAGESETBRUSH, 1, [ ])]) + AC_CHECK_LIB(gd, gdImageStringTTF, [AC_DEFINE(HAVE_GD_STRINGTTF, 1, [ ])]) + AC_CHECK_LIB(gd, gdImageStringFT, [AC_DEFINE(HAVE_GD_STRINGFT, 1, [ ])]) 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, [ ])]) Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.157 php4/ext/gd/gd.c:1.158 --- php4/ext/gd/gd.c:1.157 Sat Aug 25 21:10:10 2001 +++ php4/ext/gd/gd.c Thu Sep 6 19:10:37 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.157 2001/08/26 01:10:10 rasmus Exp $ */ +/* $Id: gd.c,v 1.158 2001/09/06 23:10:37 sniper Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -2610,7 +2610,6 @@ /* }}} */ - /* {{{ proto array imagettfbbox(int size, int angle, string font_file, string text) Give the bounding box of a text using TrueType fonts */ PHP_FUNCTION(imagettfbbox) @@ -2640,8 +2639,7 @@ #ifdef ENABLE_GD_TTF /* {{{ php_imagettftext_common */ -static -void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int extended) +static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int extended) { zval **IM, **PTSIZE, **ANGLE, **X, **Y, **C, **FONTNAME, **COL, **EXT = NULL; gdImagePtr im=NULL; @@ -2739,22 +2737,26 @@ fontname = (unsigned char*)Z_STRVAL_PP(FONTNAME); #endif -#ifdef USE_GD_IMGSTRTTF -# if HAVE_LIBFREETYPE -#if HAVE_GD_STRINGFTEX +#ifdef USE_GD_IMGSTRTTF +# if HAVE_GD_STRINGFTEX if (extended) { error = gdImageStringFTEx(im, brect, col, fontname, ptsize, angle, x, y, str, &strex); } else -#endif +# endif +# if HAVE_GD_STRINGFT error = gdImageStringFT(im, brect, col, fontname, ptsize, angle, x, y, str); -# else +# endif + +# if HAVE_GD_STRINGTTF error = gdImageStringTTF(im, brect, col, fontname, ptsize, angle, x, y, str); # endif -#else + +#else /* !USE_GD_IMGSTRTTF */ error = gdttf(im, brect, col, fontname, ptsize, angle, x, y, str); #endif + if (error) { php_error(E_WARNING, "%s", error);