php-gd_imagerotate_enable.patch

   1 diff -ur php5.3-200812262130/ext/gd/config.m4 mod/ext/gd/config.m4
   2 --- php5.3-200812262130/ext/gd/config.m4        2008-07-18 04:34:20.000000000 +0200
   3 +++ mod/ext/gd/config.m4        2008-12-27 01:12:23.000000000 +0100
   4 @@ -255,6 +255,7 @@
   5    PHP_CHECK_LIBRARY(gd, gdFreeFontCache,        [AC_DEFINE(HAVE_GD_FREEFONTCACHE,    1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   6    PHP_CHECK_LIBRARY(gd, gdFontCacheMutexSetup,  [AC_DEFINE(HAVE_GD_FONTMUTEX,        1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   7    PHP_CHECK_LIBRARY(gd, gdNewDynamicCtxEx,      [AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX,   1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   8 +  PHP_CHECK_LIBRARY(gd, gdImageRotate,          [AC_DEFINE(HAVE_GD_ROTATE,           1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   9  ])
  10
  11  dnl
  12 @@ -308,6 +309,7 @@
  13    AC_DEFINE(HAVE_GD_FONTMUTEX,        1, [ ])
  14    AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX,   1, [ ])
  15    AC_DEFINE(HAVE_GD_GIF_CTX,          1, [ ])
  16 +  AC_DEFINE(HAVE_GD_ROTATE,           1, [ ])
  17
  18  dnl Make sure the libgd/ is first in the include path
  19    GDLIB_CFLAGS="-DHAVE_LIBPNG"
  20 diff -ur php5.3-200812262130/ext/gd/gd.c mod/ext/gd/gd.c
  21 --- php5.3-200812262130/ext/gd/gd.c     2008-12-12 14:35:20.000000000 +0100
  22 +++ mod/ext/gd/gd.c     2008-12-27 01:18:43.000000000 +0100
  23 @@ -296,7 +296,7 @@
  24  ZEND_END_ARG_INFO()
  25  #endif
  26
  27 -#ifdef HAVE_GD_BUNDLED
  28 +#ifdef HAVE_GD_ROTATE
  29  ZEND_BEGIN_ARG_INFO_EX(arginfo_imagerotate, 0, 0, 3)
  30         ZEND_ARG_INFO(0, im)
  31         ZEND_ARG_INFO(0, angle)
  32 @@ -927,9 +927,12 @@
  33         PHP_FE(imagegrabscreen,                                                 arginfo_imagegrabscreen)
  34  #endif
  35
  36 +#ifdef HAVE_GD_ROTATE
  37 +       PHP_FE(imagerotate,                                                     arginfo_imagerotate)
  38 +#endif
  39 +
  40  #ifdef HAVE_GD_BUNDLED
  41 -       PHP_FE(imagerotate,                                                     arginfo_imagerotate)
  42 -       PHP_FE(imageantialias,                                                  arginfo_imageantialias)
  43 +       PHP_FE(imageantialias,                                                  arginfo_imageantialias)
  44  #endif
  45
  46  #if HAVE_GD_IMAGESETTILE
  47 @@ -1079,7 +1082,7 @@
  48         PHP_INI_ENTRY("gd.jpeg_ignore_warning", "0", PHP_INI_ALL, NULL)
  49  PHP_INI_END()
  50  /* }}} */
  51 -
  52 +
  53  /* {{{ php_free_gd_image
  54   */
  55  static void php_free_gd_image(zend_rsrc_list_entry *rsrc TSRMLS_DC)
  56 @@ -1140,7 +1143,7 @@
  57  #endif
  58
  59         REGISTER_INI_ENTRIES();
  60 -
  61 +
  62         REGISTER_LONG_CONSTANT("IMG_GIF", 1, CONST_CS | CONST_PERSISTENT);
  63         REGISTER_LONG_CONSTANT("IMG_JPG", 2, CONST_CS | CONST_PERSISTENT);
  64         REGISTER_LONG_CONSTANT("IMG_JPEG", 2, CONST_CS | CONST_PERSISTENT);
  65 @@ -1168,11 +1171,14 @@
  66  #ifdef GD2_FMT_COMPRESSED
  67         REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT);
  68  #endif
  69 -#if HAVE_GD_BUNDLED
  70 +#if HAVE_GD_ROTATE
  71         REGISTER_LONG_CONSTANT("IMG_EFFECT_REPLACE", gdEffectReplace, CONST_CS | CONST_PERSISTENT);
  72         REGISTER_LONG_CONSTANT("IMG_EFFECT_ALPHABLEND", gdEffectAlphaBlend, CONST_CS | CONST_PERSISTENT);
  73         REGISTER_LONG_CONSTANT("IMG_EFFECT_NORMAL", gdEffectNormal, CONST_CS | CONST_PERSISTENT);
  74         REGISTER_LONG_CONSTANT("IMG_EFFECT_OVERLAY", gdEffectOverlay, CONST_CS | CONST_PERSISTENT);
  75 +#endif
  76 +
  77 +#if HAVE_GD_BUNDLED
  78         REGISTER_LONG_CONSTANT("GD_BUNDLED", 1, CONST_CS | CONST_PERSISTENT);
  79
  80         /* Section Filters */
  81 @@ -1760,7 +1766,7 @@
  82         long cx, cy, w, h, ST, E, col, style;
  83         gdImagePtr im;
  84         int e, st;
  85 -
  86 +
  87         if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rllllllll", &IM, &cx, &cy, &w, &h, &ST, &E, &col, &style) == FAILURE) {
  88                 return;
  89         }
  90 @@ -2008,7 +2014,7 @@
  91         if ( handle == 0 ) {
  92                 goto clean;
  93         }
  94 -       pPrintWindow = (tPrintWindow) GetProcAddress(handle, "PrintWindow");
  95 +       pPrintWindow = (tPrintWindow) GetProcAddress(handle, "PrintWindow");
  96
  97         if ( pPrintWindow )  {
  98                 pPrintWindow(window, memDC, (UINT) client_area);
  99 @@ -2105,7 +2111,7 @@
 100  /* }}} */
 101  #endif /* PHP_WIN32 */
 102
 103 -#ifdef HAVE_GD_BUNDLED
 104 +#ifdef HAVE_GD_ROTATE
 105  /* {{{ proto resource imagerotate(resource src_im, float angle, int bgdcolor [, int ignoretransparent])
 106     Rotate an image using a custom angle */
 107  PHP_FUNCTION(imagerotate)
 108 @@ -3362,7 +3368,7 @@
 109  {
 110         zval *IM;
 111         gdImagePtr im;
 112 -
 113 +
 114         if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &IM) == FAILURE) {
 115                 return;
 116         }
 117 @@ -3946,7 +3952,7 @@
 118                         if (zend_hash_get_current_data_ex(HASH_OF(EXT), (void **) &item, &pos) == FAILURE) {
 119                                 continue;
 120                         }
 121 -
 122 +
 123                         if (strcmp("linespacing", key) == 0) {
 124                                 convert_to_double_ex(item);
 125                                 strex.flags |= gdFTEX_LINESPACE;
 126 @@ -3972,7 +3978,7 @@
 127  #endif
 128
 129         PHP_GD_CHECK_OPEN_BASEDIR((char *)fontname, "Invalid font filename");
 130 -
 131 +
 132  #ifdef USE_GD_IMGSTRTTF
 133  # if HAVE_GD_STRINGFTEX
 134         if (extended) {
 135 @@ -4373,11 +4379,11 @@
 136         if (argc != 3 && argc != 6) {
 137                 ZEND_WRONG_PARAM_COUNT();
 138         }
 139 -
 140 +
 141         if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "srl|lld", &str, &str_len, &fnt, &sz, &sp, &wd, &angle) == FAILURE) {
 142                 return;
 143         }
 144 -
 145 +
 146         if (argc == 6) {
 147                 space = sp;
 148                 add_width = wd;
 149 @@ -4562,7 +4568,7 @@
 150  #ifdef HAVE_GD_JPG
 151      long ignore_warning;
 152  #endif
 153 -
 154 +
 155         if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sslll", &f_org, &f_org_len, &f_dest, &f_dest_len, &height, &width, &threshold) == FAILURE) {
 156                 return;
 157         }
 158 diff -ur php5.3-200812262130/ext/gd/php_gd.h mod/ext/gd/php_gd.h
 159 --- php5.3-200812262130/ext/gd/php_gd.h 2008-07-18 04:34:20.000000000 +0200
 160 +++ mod/ext/gd/php_gd.h 2008-12-27 01:20:04.000000000 +0100
 161 @@ -119,8 +119,11 @@
 162  PHP_FUNCTION(imagegrabscreen);
 163  #endif
 164
 165 -#ifdef HAVE_GD_BUNDLED
 166 +#ifdef HAVE_GD_ROTATE
 167  PHP_FUNCTION(imagerotate);
 168 +#endif
 169 +
 170 +#ifdef HAVE_GD_BUNDLED
 171  PHP_FUNCTION(imageantialias);
 172  #endif
 173