derick Wed Aug 11 08:31:39 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard image.c
Log:
- MFH: Added a notice to getimagesize in case zlib is not available and a
compressed SWF movie has been passed to the function.
http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.98.2.1&r2=1.98.2.2&ty=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.98.2.1 php-src/ext/standard/image.c:1.98.2.2
--- php-src/ext/standard/image.c:1.98.2.1 Thu Jul 29 21:10:42 2004
+++ php-src/ext/standard/image.c Wed Aug 11 08:31:37 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: image.c,v 1.98.2.1 2004/07/30 01:10:42 iliaa Exp $ */
+/* $Id: image.c,v 1.98.2.2 2004/08/11 12:31:37 derick Exp $ */
#include "php.h"
#include <stdio.h>
@@ -1288,11 +1288,14 @@
case IMAGE_FILETYPE_SWF:
result = php_handle_swf(stream TSRMLS_CC);
break;
-#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
case IMAGE_FILETYPE_SWC:
+#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
result = php_handle_swc(stream TSRMLS_CC);
- break;
+#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);
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
