3acf4c24e2
Source general-purpose scripting language that is especially suited for Web development and can be embedded into HTML. Its syntax draws upon C, Java, and Perl, and is easy to learn. The main goal of the language is to allow web developers to write dynamically generated webpages quickly, but you can do much more with PHP. WWW: http://www.php.net/ PR: 145772 Submitted by: Alex Keda
50 lines
1.8 KiB
C
50 lines
1.8 KiB
C
--- ext/standard/image.c.orig 2007-10-04 15:31:11.000000000 +0200
|
|
+++ ext/standard/image.c 2007-11-13 22:47:04.000000000 +0100
|
|
@@ -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
|
|
*/
|
|
@@ -1314,11 +1308,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);
|