From: dirk <dirk@git.imagemagick.org>
Date: Tue, 30 Dec 2014 19:47:47 +0000 (+0000)
Subject: Fixed setting exif properties from thumbnail data.
X-Git-Tag: 7.0.1-0~1516
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1c4ce49731e794a613da40f64a7484495bf68a3;p=imagemagick

Fixed setting exif properties from thumbnail data.
---

diff --git a/MagickCore/property.c b/MagickCore/property.c
index d79f7c3c8..b6f246bdb 100644
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -1445,8 +1445,6 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
                 *p;
 
               key=AcquireString(property);
-              if (level == 2)
-                (void) SubstituteString(&key,"exif:","exif:thumbnail:");
               switch (all)
               {
                 case 1:
@@ -1468,7 +1466,10 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
                         break;
                       }
                   }
-                  (void) FormatLocaleString(key,MaxTextExtent,"%s",description);
+                  (void) FormatLocaleString(key,MaxTextExtent,"%s",
+                    description);
+                  if (level == 2)
+                    (void) SubstituteString(&key,"exif:","exif:thumbnail:");
                   break;
                 }
                 case 2:
@@ -1484,6 +1485,11 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
                       (void) FormatLocaleString(key,MaxTextExtent,"unknown");
                   break;
                 }
+                default:
+                {
+                  if (level == 2)
+                    (void) SubstituteString(&key,"exif:","exif:thumbnail:");
+                }
               }
               p=(const char *) NULL;
               if (image->properties != (void *) NULL)