diff options
| author | SVN Migration <svn@php.net> | 2008-12-03 20:30:45 +0000 |
|---|---|---|
| committer | SVN Migration <svn@php.net> | 2008-12-03 20:30:45 +0000 |
| commit | 2876046398950e59c3b3c460e67e6fec7ff2ba3c (patch) | |
| tree | 33b2b8b4b859960a6446ad19d0ada1c55f9cfcda /ext/exif | |
| parent | 3fb86b0b9e79e6a3312b694f30ee627e2e1b325c (diff) | |
| download | php-git-php-5.3.0alpha2.tar.gz | |
This commit was manufactured by cvs2svn to create tag 'php_5_3_0alpha2'.php-5.3.0alpha2
Diffstat (limited to 'ext/exif')
| -rw-r--r-- | ext/exif/exif.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 23eec4475e..a75e223011 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -102,10 +102,12 @@ typedef unsigned char uchar; #define MAX_IFD_NESTING_LEVEL 100 /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO(arginfo_exif_tagname, 0) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_exif_read_data, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, sections_needed) @@ -113,6 +115,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_exif_read_data, 0, 0, 1) ZEND_ARG_INFO(0, read_thumbnail) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_exif_thumbnail, 0, 0, 1) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(1, width) @@ -120,6 +123,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_exif_thumbnail, 0, 0, 1) ZEND_ARG_INFO(1, imagetype) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO(arginfo_exif_imagetype, 0) ZEND_ARG_INFO(0, imagefile) ZEND_END_ARG_INFO() @@ -3904,8 +3908,8 @@ static int exif_read_file(image_info_type *ImageInfo, char *FileName, int read_t Reads header data from the JPEG/TIFF image filename and optionally reads the internal thumbnails */ PHP_FUNCTION(exif_read_data) { - char *p_name, *p_sections_needed = NULL; - int p_name_len, p_sections_needed_len = 0; + char *p_name, *p_sections_needed; + int p_name_len, p_sections_needed_len; zend_bool sub_arrays=0, read_thumbnail=0, read_all=0; int i, ac = ZEND_NUM_ARGS(), ret, sections_needed=0; |