From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 23 Jul 2018 18:34:05 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick/issues/1225
X-Git-Tag: 7.0.8-8~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c75f301d9ac84f91071393b02d8c88c8341c91c;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/1225
---

diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c
index 156bfba72..35273f717 100644
--- a/MagickCore/delegate.c
+++ b/MagickCore/delegate.c
@@ -1032,7 +1032,7 @@ RestoreMSCWarning
         p--;      /* back up one */
         continue;
       }
-    string=GetMagickPropertyLetter(image_info,image,*p, exception);
+    string=GetMagickPropertyLetter(image_info,image,*p,exception);
     if (string != (char *) NULL)
       {
         AppendString2Text(string);
diff --git a/MagickCore/property.c b/MagickCore/property.c
index 92433c9af..65642be00 100644
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -2591,7 +2591,7 @@ static const char *GetMagickPropertyLetter(ImageInfo *image_info,
 #else
       WarnNoImageReturn("\"%%%c\"",letter);
       (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
-         image->scene);
+        image->scene);
 #endif
       break;
     }
@@ -2847,6 +2847,7 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info,
         }
       if (LocaleCompare("bit-depth",property) == 0)
         {
+          WarnNoImageReturn("\"%%[%s]\"",property);
           (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
             GetImageDepth(image,exception));
           break;
@@ -2969,6 +2970,7 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info,
         }
       if (LocaleCompare("interlace",property) == 0)
         {
+          WarnNoImageReturn("\"%%[%s]\"",property);
           string=CommandOptionToMnemonic(MagickInterlaceOptions,(ssize_t)
             image->interlace);
           break;
@@ -3086,6 +3088,7 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info,
           cmsHPROFILE
             icc_profile;
 
+          WarnNoImageReturn("\"%%[%s]\"",property);
           profile=GetImageProfile(image,property+8);
           if (profile == (StringInfo *) NULL)
             break;
@@ -3108,6 +3111,7 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info,
           const char
             *name;
 
+          WarnNoImageReturn("\"%%[%s]\"",property);
           ResetImageProfileIterator(image);
           name=GetNextImageProfile(image);
           if (name != (char *) NULL)