cvs: php4(PHP_4_2_0) /ext/exif exif.c

derick Wed Apr 10 02:37:49 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/ext/exif exif.c Log: - Reverse patch Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.52.2.6 php4/ext/exif/exif.c:1.52.2.7 --- php4/ext/exif/exif.c:1.52.2.6 Sun Apr 7 15:45:36 2002 +++ php4/ext/exif/exif.c Wed Apr 10 02:37:49 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.52.2.6 2002/04/07 19:45:36 helly Exp $ */ +/* $Id: exif.c,v 1.52.2.7 2002/04/10 06:37:49 derick Exp $ */ /* ToDos * @@ -720,7 +720,6 @@ int motorola_intel; /* 1 Motorola; 0 Intel */ char *UserComment; - int UserCommentLength; char UserCommentEncoding[12]; char *Thumbnail; @@ -768,7 +767,7 @@ case TAG_FMT_STRING: if ( value) { - /*length = php_strnlen(value,length); would disable UNICODE comments*/ + length = php_strnlen(value,length); info_value->length = length; info_value->value.s = estrndup(value,length); } else { @@ -918,7 +917,7 @@ void add_assoc_image_info( pval *value, int sub_array, image_info_type *image_info, int section_index) { char buffer[64], *val, *name, uname[64]; - int idx=0, unknown=0, len; + int idx=0, unknown=0; image_info_value *info_value; if ( image_info->info_list[section_index].count) @@ -960,16 +959,11 @@ break; case TAG_FMT_STRING: - if ( !(val = info_value->value.s)) { - val = ""; - len = 0; - } else { - len = info_value->length; - } + if ( !(val = info_value->value.s)) val = ""; if (section_index==SECTION_COMMENT) { - add_index_stringl(tmpi, idx++, val, len, 1); + add_index_string(tmpi, idx++, val, 1); } else { - add_assoc_stringl(tmpi, name, val, len , 1); + add_assoc_string(tmpi, name, val, 1); } break; @@ -1071,7 +1065,7 @@ */ static void exif_process_COM (image_info_type *image_info, uchar *value, int length) { - exif_add_image_info( image_info, SECTION_COMMENT, "Comment", TAG_COMPUTED_VALUE, TAG_FMT_STRING, php_strnlen(value+2, length-2), value+2); + exif_add_image_info( image_info, SECTION_COMMENT, "Comment", TAG_COMPUTED_VALUE, TAG_FMT_STRING, length-2, value+2); } /* }}} */ @@ -1260,7 +1254,7 @@ * Process UserComment in IFD. */ static int exif_process_user_comment(char **pszInfoPtr,char *szEncoding,char *szValuePtr,int ByteCount) { - int a, size; + int a; *szEncoding = '\0'; /* Copy the comment */ @@ -1270,8 +1264,7 @@ strcpy( szEncoding, szValuePtr); szValuePtr = szValuePtr+8; ByteCount -= 8; - size = exif_process_string_raw(pszInfoPtr, szValuePtr, ByteCount); - return size ? size-1 : 0; + return exif_process_string_raw(pszInfoPtr, szValuePtr, ByteCount); } if ( !memcmp(szValuePtr, "ASCII\0\0\0", 8)) { strcpy( szEncoding, szValuePtr); @@ -1290,8 +1283,7 @@ if (a) for (a=ByteCount-1;a && szValuePtr[a]==' ';a--) (szValuePtr)[a] = '\0'; /* normal text without encoding */ - size = exif_process_string(pszInfoPtr, szValuePtr, ByteCount); - return size ? size-1 : 0; + return exif_process_string(pszInfoPtr, szValuePtr, ByteCount); } /* }}} */ @@ -1437,7 +1429,7 @@ break; case TAG_USERCOMMENT: - ImageInfo->UserCommentLength = exif_process_user_comment(&(ImageInfo->UserComment),ImageInfo->UserCommentEncoding,value_ptr,byte_count); + exif_process_user_comment(&(ImageInfo->UserComment),ImageInfo->UserCommentEncoding,value_ptr,byte_count); break; /* this is only a comment if type is string! */ @@ -1552,9 +1544,6 @@ /* correctly would be to set components as length * but we are ignoring length for those types where it is not the same as byte_count */ - if (format==TAG_FMT_STRING) { - byte_count = php_strnlen(value_ptr,byte_count); - } exif_add_image_info( ImageInfo, section_index, exif_get_tagname(tag,tagname), tag, format, byte_count, value_ptr); if ( outside) efree( outside); } @@ -2277,7 +2266,7 @@ exif_add_image_info( &ImageInfo, SECTION_COMPUTED, "FocusDistance", TAG_NONE, TAG_FMT_STRING, strlen(tmp), tmp); } if (ImageInfo.UserComment) { - exif_add_image_info( &ImageInfo, SECTION_COMPUTED, "UserComment", TAG_NONE, TAG_FMT_STRING, ImageInfo.UserCommentLength, ImageInfo.UserComment); + exif_add_image_info( &ImageInfo, SECTION_COMPUTED, "UserComment", TAG_NONE, TAG_FMT_STRING, strlen(ImageInfo.UserComment), ImageInfo.UserComment); if ( (len=strlen(ImageInfo.UserCommentEncoding))) { exif_add_image_info( &ImageInfo, SECTION_COMPUTED, "UserCommentEncoding", TAG_NONE, TAG_FMT_STRING, len, ImageInfo.UserCommentEncoding); }