projects / packages / php.git / blame
| Commit | Line | Data |
|---|---|---|
| 55f776ca JB |
1 | --- php-5.2.0/ext/gd/config.m4.orig 2005-11-29 19:25:59.000000000 +0100 |
| 2 | +++ php-5.2.0/ext/gd/config.m4 2006-12-22 23:41:12.363074440 +0100 | |
| 3 | @@ -261,6 +261,7 @@ | |
| 4 | PHP_CHECK_LIBRARY(gd, gdFontCacheShutdown, [AC_DEFINE(HAVE_GD_FONTCACHESHUTDOWN,1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) | |
| 5 | PHP_CHECK_LIBRARY(gd, gdFreeFontCache, [AC_DEFINE(HAVE_GD_FREEFONTCACHE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) | |
| 6 | PHP_CHECK_LIBRARY(gd, gdNewDynamicCtxEx, [AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) | |
| 7 | + PHP_CHECK_LIBRARY(gd, gdImageRotate, [AC_DEFINE(HAVE_GD_ROTATE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) | |
| 8 | ]) | |
| 9 | ||
| 10 | dnl | |
| 11 | @@ -313,6 +314,7 @@ | |
| 12 | AC_DEFINE(HAVE_GD_FONTCACHESHUTDOWN,1, [ ]) | |
| 13 | AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX, 1, [ ]) | |
| 14 | AC_DEFINE(HAVE_GD_GIF_CTX, 1, [ ]) | |
| 15 | + AC_DEFINE(HAVE_GD_ROTATE, 1, [ ]) | |
| 16 | ||
| 17 | dnl Make sure the libgd/ is first in the include path | |
| 18 | GDLIB_CFLAGS="-DHAVE_LIBPNG" | |
| 19 | --- php-5.2.0/ext/gd/gd.c.orig 2006-10-18 18:04:37.000000000 +0200 | |
| 20 | +++ php-5.2.0/ext/gd/gd.c 2006-12-22 23:45:04.600308887 +0100 | |
| 21 | @@ -314,7 +314,7 @@ | |
| 22 | ZEND_END_ARG_INFO() | |
| 23 | #endif | |
| 24 | ||
| 25 | -#ifdef HAVE_GD_BUNDLED | |
| 26 | +#ifdef HAVE_GD_ROTATE | |
| 27 | static | |
| 28 | ZEND_BEGIN_ARG_INFO_EX(arginfo_imagerotate, 0, 0, 3) | |
| 29 | ZEND_ARG_INFO(0, im) | |
| 30 | @@ -1020,8 +1020,10 @@ | |
| 31 | PHP_FE(imagecopyresampled, arginfo_imagecopyresampled) | |
| 7d798202 PG |
32 | #endif |
| 33 | ||
| 34 | -#ifdef HAVE_GD_BUNDLED | |
| 55f776ca JB |
35 | +#ifdef HAVE_GD_ROTATE |
| 36 | PHP_FE(imagerotate, arginfo_imagerotate) | |
| 37 | +#endif | |
| 7d798202 | 38 | +#ifdef HAVE_GD_BUNDLED |
| 55f776ca | 39 | PHP_FE(imageantialias, arginfo_imageantialias) |
| 7d798202 PG |
40 | #endif |
| 41 | ||
| 55f776ca | 42 | @@ -1248,11 +1250,13 @@ |
| 7d798202 PG |
43 | #ifdef GD2_FMT_COMPRESSED |
| 44 | REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT); | |
| 45 | #endif | |
| 46 | -#if HAVE_GD_BUNDLED | |
| 55f776ca | 47 | +#ifdef HAVE_GD_ROTATE |
| 7d798202 PG |
48 | REGISTER_LONG_CONSTANT("IMG_EFFECT_REPLACE", gdEffectReplace, CONST_CS | CONST_PERSISTENT); |
| 49 | REGISTER_LONG_CONSTANT("IMG_EFFECT_ALPHABLEND", gdEffectAlphaBlend, CONST_CS | CONST_PERSISTENT); | |
| 50 | REGISTER_LONG_CONSTANT("IMG_EFFECT_NORMAL", gdEffectNormal, CONST_CS | CONST_PERSISTENT); | |
| 51 | REGISTER_LONG_CONSTANT("IMG_EFFECT_OVERLAY", gdEffectOverlay, CONST_CS | CONST_PERSISTENT); | |
| 55f776ca | 52 | +#endif |
| 7d798202 PG |
53 | +#if HAVE_GD_BUNDLED |
| 54 | REGISTER_LONG_CONSTANT("GD_BUNDLED", 1, CONST_CS | CONST_PERSISTENT); | |
| 8afa12fe PG |
55 | /* Section Filters */ |
| 56 | REGISTER_LONG_CONSTANT("IMG_FILTER_NEGATE", IMAGE_FILTER_NEGATE, CONST_CS | CONST_PERSISTENT); | |
| 55f776ca | 57 | @@ -2055,7 +2059,7 @@ |
| 7d798202 PG |
58 | /* }}} */ |
| 59 | #endif | |
| 60 | ||
| 61 | -#ifdef HAVE_GD_BUNDLED | |
| 55f776ca JB |
62 | +#ifdef HAVE_GD_ROTATE |
| 63 | /* {{{ proto resource imagerotate(resource src_im, float angle, int bgdcolor [, int ignoretransparent]) | |
| 7d798202 PG |
64 | Rotate an image using a custom angle */ |
| 65 | PHP_FUNCTION(imagerotate) | |
| 55f776ca JB |
66 | --- php-5.2.0/ext/gd/php_gd.h.orig 2006-01-01 13:50:06.000000000 +0100 |
| 67 | +++ php-5.2.0/ext/gd/php_gd.h 2006-12-22 23:42:04.138024927 +0100 | |
| 68 | @@ -112,8 +112,10 @@ | |
| 7d798202 PG |
69 | PHP_FUNCTION(imagecopyresampled); |
| 70 | #endif | |
| 71 | ||
| 72 | -#ifdef HAVE_GD_BUNDLED | |
| 55f776ca | 73 | +#ifdef HAVE_GD_ROTATE |
| 7d798202 | 74 | PHP_FUNCTION(imagerotate); |
| 55f776ca | 75 | +#endif |
| 7d798202 PG |
76 | +#ifdef HAVE_GD_BUNDLED |
| 77 | PHP_FUNCTION(imageantialias); | |
| 78 | #endif | |
| 79 |