]> granicus.if.org Git - imagemagick/commitdiff
https://github.com/ImageMagick/ImageMagick/issues/1225
authorCristy <urban-warrior@imagemagick.org>
Mon, 23 Jul 2018 18:34:05 +0000 (14:34 -0400)
committerCristy <urban-warrior@imagemagick.org>
Mon, 23 Jul 2018 18:34:05 +0000 (14:34 -0400)
MagickCore/delegate.c
MagickCore/property.c

index 156bfba729449b0106d63c946fef636fc487278b..35273f71745544bb05f60ee1302d1a9a46269355 100644 (file)
@@ -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);
index 92433c9afb1f7dd6ca6b8c5e49c507eff0cb2d67..65642be00059050885673b84f7b2646d7cd02b9d 100644 (file)
@@ -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)