cvs: php4 /ext/exif exif.c

sniper Thu Mar 7 16:41:51 2002 EDT Modified files: /php4/ext/exif exif.c Log: - Fixed some compile warnings and removed bogus comments. Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.52 php4/ext/exif/exif.c:1.53 --- php4/ext/exif/exif.c:1.52 Wed Mar 6 15:52:17 2002 +++ php4/ext/exif/exif.c Thu Mar 7 16:41:51 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.52 2002/03/06 20:52:17 helly Exp $ */ +/* $Id: exif.c,v 1.53 2002/03/07 21:41:51 sniper Exp $ */ /* ToDos * @@ -61,7 +61,7 @@ * while extending the module as it shows if you are at the right position. * You are always considered to have a copy of TIFF6.0 and EXIF 2.10 standard. */ -#undef EXIF_DEBUG /**/ +#undef EXIF_DEBUG #include "php_exif.h" #include <math.h> @@ -878,7 +878,7 @@ { info_value = &image_info->info_list[section_index].list[i]; #ifdef EXIF_DEBUG - /* php_error(E_NOTICE,"adding info #%d: '%s:%s'", i, exif_get_sectionname(section_index), info_value->name);/**/ + php_error(E_NOTICE,"adding info #%d: '%s:%s'", i, exif_get_sectionname(section_index), info_value->name); #endif switch(info_value->format) { @@ -1266,7 +1266,7 @@ { int l; int tag, format, components; - char *value_ptr, *buffer, tagname[64]; + char *value_ptr, tagname[64]; size_t byte_count; unsigned offset_val; @@ -1429,8 +1429,9 @@ #endif ImageInfo->sections_found |= FOUND_INTEROP; sub_section_index = SECTION_INTEROP; -/* return;/* we do not know how to handle that yet */ - break;/**/ + /* we do not know how to handle that yet */ + /* return; */ + break; } SubdirStart = offset_base + php_ifd_get32u(value_ptr, ImageInfo->motorola_intel); if (SubdirStart < offset_base || SubdirStart > offset_base+IFDlength) { @@ -1577,7 +1578,6 @@ static int exif_scan_JPEG_header(image_info_type *ImageInfo, FILE *infile) { int a; - int HaveCom = FALSE; for(ImageInfo->sections_count=0;ImageInfo->sections_count < 19;) { int itemlen; @@ -1859,8 +1859,9 @@ case TAG_INTEROP_IFD_POINTER: ImageInfo->sections_found |= FOUND_INTEROP; sub_section_index = SECTION_INTEROP; -/* return; /* we do not know how to handle that yet */ - break;/**/ + /* we do not know how to handle that yet */ + /* return; */ + break; } entry_offset = php_ifd_get32u(dir_entry+8, ImageInfo->motorola_intel); #ifdef EXIF_DEBUG @@ -2007,7 +2008,7 @@ php_error(E_WARNING, "Unable to open '%s'", FileName); return FALSE; } - /* php_error(E_WARNING,"EXIF: Process %s%s: %s", read_thumbnail?"thumbs ":"", read_all?"All ":"", FileName); /**/ + /* php_error(E_WARNING,"EXIF: Process %s%s: %s", read_thumbnail?"thumbs ":"", read_all?"All ":"", FileName); */ /* Start with an empty image information structure. */ memset(ImageInfo, 0, sizeof(*ImageInfo)); @@ -2045,7 +2046,6 @@ { pval **p_name, **p_sections_needed, **p_sub_arrays, **p_read_thumbnail, **p_read_all; int i, len, ac = ZEND_NUM_ARGS(), ret, sections_needed=0, sub_arrays=0, read_thumbnail=0, read_all=0; - int self_motorola_intel; image_info_type ImageInfo; char tmp[64], *sections_str, *s;