diff options
| -rw-r--r-- | ext/gd/config.m4 | 1 | ||||
| -rw-r--r-- | ext/gd/gd.c | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index d19a4c5c77..2261db20f8 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -214,6 +214,7 @@ AC_DEFUN(PHP_GD_CHECK_VERSION,[ 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 ]) diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 6e9a76451f..be0d5f56f5 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -133,9 +133,8 @@ function_entry gd_functions[] = { 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 @@ function_entry gd_functions[] = { 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 @@ PHP_FUNCTION(imagesetthickness) } /* }}} */ -#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) |