From: Marcus Boerger <helly@php.net>
Date: Tue, 25 Jun 2002 09:00:09 +0000 (+0000)
Subject: imageellipse is removed in 2.01
X-Git-Tag: php-4.3.0dev_zend2_alpha2~94
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33b5d72f6cde827c42d516ffeefc672d7d3f3d05;p=php

imageellipse is removed in 2.01
#maybe someone reintroduces this one in bundled lib?
---

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)