From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 21 Feb 2011 15:21:35 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~8124
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=929ea321267714a1c12ef1bfc0c551e42a62c4e0;p=imagemagick

---

diff --git a/magick/property.c b/magick/property.c
index 27a1da574..df3050176 100644
--- a/magick/property.c
+++ b/magick/property.c
@@ -1091,30 +1091,29 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
   EndianType
     endian;
 
-  ssize_t
-    all,
-    id,
-    level,
-    tag_value;
+  MagickBooleanType
+    status;
 
   register ssize_t
     i;
 
   size_t
-    length;
+    entry,
+    length,
+    number_entries,
+    tag_offset,
+    tag;
 
   ssize_t
-    offset;
+    all,
+    id,
+    level,
+    offset,
+    tag_value;
 
   static int
     tag_bytes[] = {0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8};
 
-  size_t
-    entry,
-    number_entries,
-    tag_offset,
-    tag;
-
   /*
     If EXIF data exists, then try to parse the request for a tag.
   */
@@ -1245,6 +1244,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
   /*
     Set the pointer to the first IFD and follow it were it leads.
   */
+  status=MagickFalse;
   directory=exif+offset;
   level=0;
   entry=0;
@@ -1446,6 +1446,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
               if (p == (const char *) NULL)
                 (void) SetImageProperty((Image *) image,key,value);
               value=DestroyString(value);
+              status=MagickTrue;
             }
         }
         if ((tag_value == TAG_EXIF_OFFSET) ||
@@ -1488,7 +1489,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
           }
     }
   } while (level > 0);
-  return(MagickTrue);
+  return(status);
 }
 
 static MagickBooleanType GetXMPProperty(const Image *image,