cvs: php4 /ext/exif exif.c

helly Wed Mar 6 15:52:19 2002 EDT Modified files: /php4/ext/exif exif.c Log: -comments #just another jhead.c line Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.51 php4/ext/exif/exif.c:1.52 --- php4/ext/exif/exif.c:1.51 Wed Mar 6 15:24:29 2002 +++ php4/ext/exif/exif.c Wed Mar 6 15:52:17 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.51 2002/03/06 20:24:29 helly Exp $ */ +/* $Id: exif.c,v 1.52 2002/03/06 20:52:17 helly Exp $ */ /* ToDos * @@ -1470,7 +1470,7 @@ NumDirEntries = php_ifd_get16u(DirStart, ImageInfo->motorola_intel); if ((DirStart+2+NumDirEntries*12) > (OffsetBase+IFDlength)) { - php_error(E_WARNING, "Illegally sized directory"); + php_error(E_WARNING, "Illegally sized directory x%04X + 2 + x%04X*12 = x%04X > x%04X", (int)DirStart+2-(int)OffsetBase, NumDirEntries, (int)DirStart+2+NumDirEntries*12-(int)OffsetBase, IFDlength); return; } @@ -1546,6 +1546,9 @@ return; } exif_process_TIFF_in_JPEG(ImageInfo,CharBuf+8,length-8); + #ifdef EXIF_DEBUG + php_error(E_NOTICE,"process Exif done"); + #endif } /* }}} */ @@ -1679,8 +1682,8 @@ break; case M_EXIF: - ImageInfo->sections_found |= FOUND_EXIF; - if (ImageInfo->sections_count <= 2) { + if ( !(ImageInfo->sections_found&FOUND_EXIF)) { + ImageInfo->sections_found |= FOUND_EXIF; /* Seen files from some 'U-lead' software with Vivitar scanner that uses marker 31 later in the file (no clue what for!) */ exif_process_APP1(ImageInfo, (char *)Data, itemlen);