(no commit message)

[imagemagick] / MagickCore / property.c

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 342799185fc1c10dd4065a63b7dda28afe84ad0e..507806d5d68cbcc2b0c2c30d95e258129f5320ca 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -1095,7 +1095,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
       { 0x1001c, "exif:GPSAreaInformation" },
       { 0x1001d, "exif:GPSDateStamp" },
       { 0x1001e, "exif:GPSDifferential" },
-      {  0x0000, NULL}
+      { 0x00000, (const char *) NULL }
     };
 
   const StringInfo
@@ -1332,8 +1332,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
             continue;
           p=(unsigned char *) (exif+offset);
         }
-      if ((level == 0) &&
-          ((all != 0) || (tag == (size_t) tag_value)))
+      if ((all != 0) || (tag == (size_t) tag_value))
         {
           char
             buffer[MaxTextExtent],
@@ -1426,12 +1425,14 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
           if (value != (char *) NULL)
             {
               char
-                key[MaxTextExtent];
+                *key;
 
               register const char
                 *p;
 
-              (void) CopyMagickString(key,property,MaxTextExtent);
+              key=AcquireString(property);
+              if (level == 2)
+                (void) SubstituteString(&key,"exif:","exif:thumbnail:");
               switch (all)
               {
                 case 1:
@@ -1477,6 +1478,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
               if (p == (const char *) NULL)
                 (void) SetImageProperty((Image *) image,key,value,exception);
               value=DestroyString(value);
+              key=DestroyString(key);
               status=MagickTrue;
             }
         }