From 8d629c29bab9dad903273acec2bec245883b29d7 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Wed, 19 May 2010 11:45:02 -0400
Subject: [PATCH] Unused global variable

---
 framework/Image/lib/Horde/Image/Exif/Parser/Canon.php   | 6 +-----
 framework/Image/lib/Horde/Image/Exif/Parser/Olympus.php | 9 +++------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/framework/Image/lib/Horde/Image/Exif/Parser/Canon.php b/framework/Image/lib/Horde/Image/Exif/Parser/Canon.php
index ad43d1f53..5a68b4ced 100644
--- a/framework/Image/lib/Horde/Image/Exif/Parser/Canon.php
+++ b/framework/Image/lib/Horde/Image/Exif/Parser/Canon.php
@@ -516,11 +516,7 @@ class Horde_Image_Exif_Parser_Canon extends Horde_Image_Exif_Parser_Base
                     $value = Horde_Image_Exif::intel2Moto($value);
                 }
                 $v = fseek($seek, $globalOffset+hexdec($value));  //offsets are from TIFF header which is 12 bytes from the start of the file
-                if (isset($GLOBALS['exiferFileSize'])) {
-                    $exiferFileSize = $GLOBALS['exiferFileSize'];
-                } else {
-                    $exiferFileSize = 0;
-                }
+                $exiferFileSize = 0;
                 if ($v == 0 && $bytesofdata < $exiferFileSize) {
                     $data = fread($seek, $bytesofdata);
                 } elseif ($v == -1) {
diff --git a/framework/Image/lib/Horde/Image/Exif/Parser/Olympus.php b/framework/Image/lib/Horde/Image/Exif/Parser/Olympus.php
index 6e6393628..5da09e18b 100644
--- a/framework/Image/lib/Horde/Image/Exif/Parser/Olympus.php
+++ b/framework/Image/lib/Horde/Image/Exif/Parser/Olympus.php
@@ -179,12 +179,9 @@ class Horde_Image_Exif_Parser_Olympus extends Horde_Image_Exif_Parser_Base
                 $value = bin2hex($value);
                 if($intel==1) $value = Horde_Image_Exif::intel2Moto($value);
                 $v = fseek($seek,$globalOffset+hexdec($value));  //offsets are from TIFF header which is 12 bytes from the start of the file
-                if(isset($GLOBALS['exiferFileSize']) && $v == 0 && $bytesofdata < $GLOBALS['exiferFileSize']) {
-                    $data = fread($seek, $bytesofdata);
-                } else {
-                    $result['Errors'] = $result['Errors']++;
-                    $data = '';
-                }
+                $result['Errors'] = $result['Errors']++;
+                $data = '';
+
             }
             $formated_data = self::_formatData($type,$tag,$intel,$data);
             $result['SubIFD']['MakerNote'][$tag_name] = $formated_data;
-- 
2.11.0