diff options
Diffstat (limited to 'lang/php53/files/patch-ext::gd::gd_ctx.c')
| -rw-r--r-- | lang/php53/files/patch-ext::gd::gd_ctx.c | 168 |
1 files changed, 0 insertions, 168 deletions
diff --git a/lang/php53/files/patch-ext::gd::gd_ctx.c b/lang/php53/files/patch-ext::gd::gd_ctx.c deleted file mode 100644 index 11a7ef43e264..000000000000 --- a/lang/php53/files/patch-ext::gd::gd_ctx.c +++ /dev/null @@ -1,168 +0,0 @@ ---- ext/gd/gd_ctx.c.orig Wed Jan 28 18:10:05 2004 -+++ ext/gd/gd_ctx.c Fri Feb 13 12:12:00 2004 -@@ -49,23 +49,29 @@ - /* {{{ _php_image_output_ctx */ - static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, void (*func_p)()) - { -- zval **imgind, **file, **quality; -+ zval **imgind, **file, **quality, **lo, **to, **del, **dis; - gdImagePtr im; - char *fn = NULL; - FILE *fp = NULL; - int argc = ZEND_NUM_ARGS(); - int q = -1, i; -+#ifdef HAVE_GD_GIF_ANIM -+ int LeftOfs = -1, TopOfs = -1, Delay = -1, Disposal = -1; -+#endif /* HAVE_GD_GIF_ANIM */ - gdIOCtx *ctx; - - /* The third (quality) parameter for Wbmp stands for the threshold when called from image2wbmp(). - * The third (quality) parameter for Wbmp and Xbm stands for the foreground color index when called - * from imagey<type>(). -+ * The third (quality) parameter for GIF animation stands for colormap inclusion. 1==include -+ * local/global colormap. -+ * The fourth (LeftOfs) parameter for GIF animation begin stands for NETSCAPE2.0 Loop count extension. - */ - - if (argc < 2 && image_type == PHP_GDIMG_TYPE_XBM) { - WRONG_PARAM_COUNT; - } -- if (argc < 1 || argc > 3 || zend_get_parameters_ex(argc, &imgind, &file, &quality) == FAILURE) -+ if (argc < 1 || argc > 7 || zend_get_parameters_ex(argc, &imgind, &file, &quality, &lo, &to, &del, &dis) == FAILURE) - { - WRONG_PARAM_COUNT; - } -@@ -75,11 +81,29 @@ - if (argc > 1) { - convert_to_string_ex(file); - fn = Z_STRVAL_PP(file); -- if (argc == 3) { -- convert_to_long_ex(quality); -- q = Z_LVAL_PP(quality);/* or colorindex for foreground of BW images (defaults to black) */ -- } - } -+ if (argc >= 3) { -+ convert_to_long_ex(quality); -+ q = Z_LVAL_PP(quality);/* or colorindex for foreground of BW images (defaults to black) */ -+ } -+#ifdef HAVE_GD_GIF_ANIM -+ if (argc >= 4) { -+ convert_to_long_ex(lo); -+ LeftOfs = Z_LVAL_PP(lo); -+ } -+ if (argc >= 5) { -+ convert_to_long_ex(to); -+ TopOfs = Z_LVAL_PP(to); -+ } -+ if (argc >= 6) { -+ convert_to_long_ex(del); -+ Delay = Z_LVAL_PP(del); -+ } -+ if (argc >= 7) { -+ convert_to_long_ex(dis); -+ Disposal = Z_LVAL_PP(dis); -+ } -+#endif /* HAVE_GD_GIF_ANIM */ - - if ((argc == 2) || (argc > 2 && Z_STRLEN_PP(file))) { - if (!fn || fn == empty_string || php_check_open_basedir(fn TSRMLS_CC)) { -@@ -87,7 +111,7 @@ - RETURN_FALSE; - } - -- fp = VCWD_FOPEN(fn, "wb"); -+ fp = VCWD_FOPEN(fn, PHP_GDIMG_TYPE_GIFANIMADD == image_type ? "ab" : "wb"); - if (!fp) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open '%s' for writing", fn); - RETURN_FALSE; -@@ -133,6 +157,14 @@ - (*func_p)(im, q, ctx); - } - break; -+#ifdef HAVE_GD_GIF_ANIM -+ case PHP_GDIMG_TYPE_GIFANIMBEGIN: -+ (*func_p)(im, ctx, q, LeftOfs); -+ break; -+ case PHP_GDIMG_TYPE_GIFANIMADD: -+ (*func_p)(im, ctx, q, LeftOfs, TopOfs, Delay, Disposal); -+ break; -+#endif /* HAVE_GD_GIF_ANIM */ - default: - (*func_p)(im, ctx); - break; -@@ -151,6 +183,75 @@ - - RETURN_TRUE; - } -+ -+#ifdef HAVE_GD_GIF_ANIM -+/* {{{ proto int imagegifanimend([string filename]) -+ Write end mark to gif animation. */ -+PHP_FUNCTION(imagegifanimend) -+{ -+ zval **file; -+ char *fn = NULL; -+ FILE *fp = NULL; -+ int argc = ZEND_NUM_ARGS(); -+ gdIOCtx *ctx; -+ -+ if (argc < 0 || argc > 1 || zend_get_parameters_ex(argc, &file) == FAILURE) { -+ ZEND_WRONG_PARAM_COUNT(); -+ } -+ -+ if (argc >= 1) { -+ convert_to_string_ex(file); -+ fn = Z_STRVAL_PP(file); -+ } -+ -+ if ((argc == 1) || (argc > 1 && Z_STRLEN_PP(file))) { -+ if (!fn || fn == empty_string || php_check_open_basedir(fn TSRMLS_CC)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid filename '%s'", fn); -+ RETURN_FALSE; -+ } -+ -+ fp = VCWD_FOPEN(fn, "ab"); -+ if (!fp) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open '%s' for writing", fn); -+ RETURN_FALSE; -+ } -+ -+ ctx = gdNewFileCtx(fp); -+ } else { -+ ctx = emalloc(sizeof(gdIOCtx)); -+ ctx->putC = _php_image_output_putc; -+ ctx->putBuf = _php_image_output_putbuf; -+#if HAVE_LIBGD204 -+ ctx->gd_free = _php_image_output_ctxfree; -+#else -+ ctx->free = _php_image_output_ctxfree; -+#endif -+ -+#if APACHE && defined(CHARSET_EBCDIC) -+ /* XXX this is unlikely to work any more thies@thieso.net */ -+ /* This is a binary file already: avoid EBCDIC->ASCII conversion */ -+ ap_bsetflag(php3_rqst->connection->client, B_EBCDIC2ASCII, 0); -+#endif -+ } -+ -+ /* This could be coded in here, as it only outputs ';' */ -+ gdImageGifAnimEndCtx(ctx); -+ -+#if HAVE_LIBGD204 -+ ctx->gd_free(ctx); -+#else -+ ctx->free(ctx); -+#endif -+ -+ if(fp) { -+ fflush(fp); -+ fclose(fp); -+ } -+ -+ RETURN_TRUE; -+} -+/* }}} */ -+#endif /* HAVE_GD_GIF_ANIM */ - /* }}} */ - - /* |