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

helly Tue Jun 25 05:00:11 2002 EDT Modified files: /php4/ext/gd config.m4 gd.c Log: imageellipse is removed in 2.01 #maybe someone reintroduces this one in bundled lib? Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.98 php4/ext/gd/config.m4:1.99 --- php4/ext/gd/config.m4:1.98 Mon Jun 24 15:31:44 2002 +++ php4/ext/gd/config.m4 Tue Jun 25 05:00:08 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.98 2002/06/24 19:31:44 derick Exp $ +dnl $Id: config.m4,v 1.99 2002/06/25 09:00:08 helly Exp $ dnl dnl @@ -214,6 +214,7 @@ PHP_CHECK_LIBRARY(gd, gdImageCreateFromGd2, [AC_DEFINE(HAVE_GD_GD2, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) PHP_CHECK_LIBRARY(gd, gdImageCreateTrueColor, [AC_DEFINE(HAVE_LIBGD20, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) PHP_CHECK_LIBRARY(gd, gdImageSetTile, [AC_DEFINE(HAVE_GD_IMAGESETTILE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageEllipse, [AC_DEFINE(HAVE_GD_IMAGEELLIPSE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) PHP_CHECK_LIBRARY(gd, gdImageSetBrush, [AC_DEFINE(HAVE_GD_IMAGESETBRUSH, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) PHP_CHECK_LIBRARY(gd, gdImageStringTTF, [AC_DEFINE(HAVE_GD_STRINGTTF, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) PHP_CHECK_LIBRARY(gd, gdImageStringFT, [AC_DEFINE(HAVE_GD_STRINGFT, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.190 php4/ext/gd/gd.c:1.191 --- php4/ext/gd/gd.c:1.190 Mon Jun 24 15:31:44 2002 +++ php4/ext/gd/gd.c Tue Jun 25 05:00:09 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.190 2002/06/24 19:31:44 derick Exp $ */ +/* $Id: gd.c,v 1.191 2002/06/25 09:00:09 helly Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -133,9 +133,8 @@ PHP_FE(imagecreatetruecolor, NULL) PHP_FE(imagetruecolortopalette, NULL) PHP_FE(imagesetthickness, NULL) - PHP_FE(imageellipse, NULL) - PHP_FE(imagefilledellipse, NULL) PHP_FE(imagefilledarc, NULL) + PHP_FE(imagefilledellipse, NULL) PHP_FE(imagealphablending, NULL) PHP_FE(imagecolorresolvealpha, NULL) PHP_FE(imagecolorclosestalpha, NULL) @@ -143,6 +142,10 @@ PHP_FE(imagecopyresampled, NULL) #endif +#if HAVE_GD_IMAGEELLIPSE + PHP_FE(imageellipse, NULL) +#endif + #if HAVE_GD_IMAGESETTILE PHP_FE(imagesettile, NULL) #endif @@ -645,7 +648,7 @@ } /* }}} */ -#if 0 /* this function is missing from GD 2.0.1 */ +#ifdef HAVE_GD_IMAGEELLIPSE /* this function is missing from GD 2.0.1 */ /* {{{ proto void imageellipse(resource im, int cx, int cy, int w, int h, int color) Draw an ellipse */ PHP_FUNCTION(imageellipse)