kalle Tue May 19 10:23:51 2009 UTC
Modified files:
/php-src/ext/exif exif.c
Log:
Fixed compiler warning
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.211&r2=1.212&diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.211 php-src/ext/exif/exif.c:1.212
--- php-src/ext/exif/exif.c:1.211 Tue Mar 10 23:39:17 2009
+++ php-src/ext/exif/exif.c Tue May 19 10:23:51 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.211 2009/03/10 23:39:17 helly Exp $ */
+/* $Id: exif.c,v 1.212 2009/05/19 10:23:51 kalle Exp $ */
/* ToDos
*
@@ -138,7 +138,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.211 2009/03/10 23:39:17 helly Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.212 2009/05/19 10:23:51 kalle Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -3883,7 +3883,7 @@
Reads header data from the JPEG/TIFF image filename and optionally reads
the internal thumbnails */
PHP_FUNCTION(exif_read_data)
{
- zval **p_name, **p_read_all;
+ zval **p_name;
int i, ac = ZEND_NUM_ARGS(), ret, sections_needed=0;
zend_bool sub_arrays=0, read_thumbnail=0, read_all=0;
image_info_type ImageInfo;
@@ -3927,15 +3927,7 @@
#endif
}
- if(ac >= 5) {
- convert_to_long_ex(p_read_all);
- read_all = Z_LVAL_PP(p_read_all);
- }
- /* parameters 3,4 will be working in later versions.... */
- read_all = 0; /* just to make function work for 4.2 tree */
-
ret = exif_read_file(&ImageInfo, filename, read_thumbnail, read_all
TSRMLS_CC);
-
sections_str = exif_get_sectionlist(ImageInfo.sections_found TSRMLS_CC);
#ifdef EXIF_DEBUG
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
