Fixed setting exif properties from thumbnail data.

diff --git a/MagickCore/property.c b/MagickCore/property.c
index d79f7c3c85f34a2dda954ae8c93faeaa40964136..b6f246bdba4ccb08b83d263d1642fd3d9d99a8c6 100644 (file)
--- 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)