diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-05-03 13:53:55 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-05-04 16:50:06 +0200 |
| commit | 8a90aad35b3647a104458d5af4dcb315b9e8d80c (patch) | |
| tree | 4b81f4ddbdaa62ddf5245932bc03e004854c5925 /ext/gd/php_gd.h | |
| parent | 2fc17d83cb8e1adb95542c6c18a698082a7f687c (diff) | |
| download | php-git-8a90aad35b3647a104458d5af4dcb315b9e8d80c.tar.gz | |
Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef
Diffstat (limited to 'ext/gd/php_gd.h')
| -rw-r--r-- | ext/gd/php_gd.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h index 280705436a..c9c9e9de90 100644 --- a/ext/gd/php_gd.h +++ b/ext/gd/php_gd.h @@ -22,8 +22,6 @@ #ifndef PHP_GD_H #define PHP_GD_H -#define HAVE_GDIMAGECREATEFROMPNG 1 - #if HAVE_LIBFREETYPE # ifndef ENABLE_GD_TTF # define ENABLE_GD_TTF @@ -69,10 +67,10 @@ extern zend_module_entry gd_module_entry; /* gd.c functions */ PHP_MINFO_FUNCTION(gd); PHP_MINIT_FUNCTION(gd); -#if HAVE_LIBT1 || HAVE_GD_FONTMUTEX +#if HAVE_LIBT1 PHP_MSHUTDOWN_FUNCTION(gd); #endif -#if HAVE_GD_STRINGFT +#if HAVE_GD_FREETYPE && HAVE_LIBFREETYPE PHP_RSHUTDOWN_FUNCTION(gd); #endif @@ -123,15 +121,12 @@ PHP_FUNCTION(imagegrabscreen); PHP_FUNCTION(imagerotate); -#ifdef HAVE_GD_IMAGE_FLIP PHP_FUNCTION(imageflip); -#endif #ifdef HAVE_GD_BUNDLED PHP_FUNCTION(imageantialias); #endif -#if defined(HAVE_GD_BUNDLED) || defined(HAVE_LIBGD21) PHP_FUNCTION(imagecrop); PHP_FUNCTION(imagecropauto); PHP_FUNCTION(imagescale); @@ -139,7 +134,6 @@ PHP_FUNCTION(imageaffine); PHP_FUNCTION(imageaffinematrixget); PHP_FUNCTION(imageaffinematrixconcat); PHP_FUNCTION(imagesetinterpolation); -#endif PHP_FUNCTION(imagesetthickness); PHP_FUNCTION(imagecopymergegray); @@ -157,7 +151,7 @@ PHP_FUNCTION(imagecreatefromwbmp); PHP_FUNCTION(imagecreatefromgd); PHP_FUNCTION(imagecreatefromgd2); PHP_FUNCTION(imagecreatefromgd2part); -#if defined(HAVE_GD_XPM) && (defined(HAVE_GD_BUNDLED) || defined(HAVE_LIBGD21)) +#if defined(HAVE_GD_XPM) PHP_FUNCTION(imagecreatefromxpm); #endif @@ -208,10 +202,8 @@ PHP_FUNCTION(image2wbmp); PHP_FUNCTION(imagecolormatch); -#if defined(HAVE_GD_BUNDLED) || defined(HAVE_LIBGD21) PHP_FUNCTION(imagelayereffect); PHP_FUNCTION(imagexbm); -#endif PHP_FUNCTION(imagefilter); PHP_FUNCTION(imageconvolution); |