diff options
author | Alex Dupre <ale@FreeBSD.org> | 2006-04-02 07:38:11 +0000 |
---|---|---|
committer | Alex Dupre <ale@FreeBSD.org> | 2006-04-02 07:38:11 +0000 |
commit | 78f1a6f9640404868d01404b3fd55aab083f1ec5 (patch) | |
tree | 675842d9e65b1b15a5d13eb4d84274dca845738a /lang/php5 | |
parent | b042b2385fdead63a9e0a6c5b8e64ef6b4ff52f1 (diff) | |
download | ports-78f1a6f9640404868d01404b3fd55aab083f1ec5.tar.gz ports-78f1a6f9640404868d01404b3fd55aab083f1ec5.zip |
Notes
Diffstat (limited to 'lang/php5')
-rw-r--r-- | lang/php5/files/patch-ext_standard_image.c | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/lang/php5/files/patch-ext_standard_image.c b/lang/php5/files/patch-ext_standard_image.c new file mode 100644 index 000000000000..7ad02bb7a59f --- /dev/null +++ b/lang/php5/files/patch-ext_standard_image.c @@ -0,0 +1,51 @@ +--- ext/standard/image.c.orig Sun Apr 2 09:34:50 2006 ++++ ext/standard/image.c Sun Apr 2 09:35:27 2006 +@@ -31,9 +31,7 @@ + #endif + #include "php_image.h" + +-#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) + #include "zlib.h" +-#endif + + /* file type markers */ + PHPAPI const char php_sig_gif[3] = {'G', 'I', 'F'}; +@@ -80,9 +78,7 @@ + REGISTER_LONG_CONSTANT("IMAGETYPE_JP2", IMAGE_FILETYPE_JP2, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMAGETYPE_JPX", IMAGE_FILETYPE_JPX, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMAGETYPE_JB2", IMAGE_FILETYPE_JB2, CONST_CS | CONST_PERSISTENT); +-#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) + REGISTER_LONG_CONSTANT("IMAGETYPE_SWC", IMAGE_FILETYPE_SWC, CONST_CS | CONST_PERSISTENT); +-#endif + REGISTER_LONG_CONSTANT("IMAGETYPE_IFF", IMAGE_FILETYPE_IFF, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMAGETYPE_WBMP", IMAGE_FILETYPE_WBMP, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMAGETYPE_JPEG2000",IMAGE_FILETYPE_JPC, CONST_CS | CONST_PERSISTENT); /* keep alias */ +@@ -184,7 +180,6 @@ + } + /* }}} */ + +-#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) + /* {{{ php_handle_swc + */ + static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC) +@@ -255,7 +250,6 @@ + return result; + } + /* }}} */ +-#endif + + /* {{{ php_handle_swf + */ +@@ -1310,12 +1304,7 @@ + result = php_handle_swf(stream TSRMLS_CC); + break; + case IMAGE_FILETYPE_SWC: +-#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) + result = php_handle_swc(stream TSRMLS_CC); +-#else +- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled."); +- +-#endif + break; + case IMAGE_FILETYPE_PSD: + result = php_handle_psd(stream TSRMLS_CC); |