diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-05-11 02:37:12 +0000 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-05-11 02:37:12 +0000 |
| commit | b706cb69ac7737a550c8f7fff025a6abeb3cfcb6 (patch) | |
| tree | d396f6f2fbdad585f2af052038d0b9cddca93b39 | |
| parent | 6dbd8aa002c8de2b63a94d24612ce8856d8fee97 (diff) | |
Reinstate abortCount code, originally added to exifer in G2:
http://gallery.svn.sourceforge.net/viewvc/gallery?view=rev&revision=13422
it was commented out in the ZenPhoto version. Filed upstream ticket
about this:
http://www.zenphoto.org/trac/ticket/1118
| -rw-r--r-- | modules/exif/lib/exif.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/exif/lib/exif.php b/modules/exif/lib/exif.php index ed69e60b..212c07da 100644 --- a/modules/exif/lib/exif.php +++ b/modules/exif/lib/exif.php @@ -767,9 +767,9 @@ if ($result['ValidJpeg'] == 1) { $size = bin2hex(fread( $in, 2 )); // LOOP THROUGH MARKERS TILL YOU GET TO FFE1 (exif marker) - //$abortCount = 0; - //while(!feof($in) && $data!='ffe1' && $data!='ffc0' && $data!='ffd9' && ++$abortCount < 200) { - while(!feof($in) && $data!='ffe1' && $data!='ffc0' && $data!='ffd9') { + $abortCount = 0; + while(!feof($in) && $data!='ffe1' && $data!='ffc0' && $data!='ffd9' && ++$abortCount < 200) { + //while(!feof($in) && $data!='ffe1' && $data!='ffc0' && $data!='ffd9') { if ($data == 'ffe0') { // JFIF Marker $result['ValidJFIFData'] = 1; $result['JFIF']['Size'] = hexdec($size); |