From b706cb69ac7737a550c8f7fff025a6abeb3cfcb6 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Mon, 11 May 2009 02:37:12 +0000 Subject: 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 --- modules/exif/lib/exif.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/exif/lib') 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); -- cgit v1.2.3