diff options
| author | Marcus Boerger <helly@php.net> | 2002-03-06 20:24:29 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2002-03-06 20:24:29 +0000 |
| commit | 15d74e343baa070884e380394a43bf24c3088427 (patch) | |
| tree | 56802b9c1ab13b3ce4ce1e26dc6b24ac32d5a872 | |
| parent | 165a97c90f40c3739c97005746738e59ea76e281 (diff) | |
| download | php-git-15d74e343baa070884e380394a43bf24c3088427.tar.gz | |
-comments
| -rw-r--r-- | ext/exif/exif.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index ce58b5b0b5..a87f92eb78 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -859,6 +859,7 @@ void exif_free_image_info( image_info_type *image_info, int section_index) void add_assoc_image_info( pval *value, int sub_array, image_info_type *image_info, int section_index) { char buffer[64]; + int idx=0; image_info_value *info_value; if ( image_info->info_list[section_index].count) @@ -892,7 +893,11 @@ void add_assoc_image_info( pval *value, int sub_array, image_info_type *image_in break; case TAG_FMT_STRING: - add_assoc_string(tmpi, info_value->name, info_value->value.s, 1); + if (section_index==SECTION_COMMENT) { + add_index_string(tmpi, idx++, info_value->value.s, 1); + } else { + add_assoc_string(tmpi, info_value->name, info_value->value.s, 1); + } break; case TAG_FMT_BYTE: @@ -1670,7 +1675,7 @@ static int exif_scan_JPEG_header(image_info_type *ImageInfo, FILE *infile) return (ImageInfo->sections_found&(~FOUND_COMPUTED)) ? TRUE : FALSE; case M_COM: /* Comment section */ - exif_process_COM(ImageInfo, Data, itemlen); + exif_process_COM(ImageInfo, (char *)Data+2, itemlen); break; case M_EXIF: |