From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 12 Nov 2016 00:46:11 +0000 (-0500)
Subject: ...
X-Git-Tag: 7.0.3-7~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f4f6b301a1a2042bc09cda79f036c108764044b;p=imagemagick

...
---

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 39fcb8ce7..39350d812 100644
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -2792,6 +2792,13 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info,
             (void) ConcatenateMagickString(value,"a",MagickPathExtent);
           break;
         }
+      if (LocaleCompare("colors",property) == 0)
+        {
+          WarnNoImageReturn("\"%%[%s]\"",property);
+          (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double)
+            GetNumberColors(image,(FILE *) NULL,exception));
+          break;
+        }
       if (LocaleCompare("colorspace",property) == 0)
         {
           WarnNoImageReturn("\"%%[%s]\"",property);
@@ -2807,6 +2814,13 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info,
             image->compose);
           break;
         }
+      if (LocaleCompare("compression",property) == 0)
+        {
+          WarnNoImageReturn("\"%%[%s]\"",property);
+          string=CommandOptionToMnemonic(MagickCompressOptions,(ssize_t)
+            image->compression);
+          break;
+        }
       if (LocaleCompare("copyright",property) == 0)
         {
           (void) CopyMagickString(value,GetMagickCopyright(),MagickPathExtent);
@@ -2886,6 +2900,13 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info,
           string=image->filename;
           break;
         }
+      if (LocaleCompare("interlace",property) == 0)
+        {
+          WarnNoImageReturn("\"%%[%s]\"",property);
+          string=CommandOptionToMnemonic(MagickInterlaceOptions,(ssize_t)
+            image->interlace);
+          break;
+        }
       break;
     }
     case 'k':
@@ -3031,8 +3052,26 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info,
         }
       break;
     }
+    case 'q':
+    {
+      if (LocaleCompare("quality",property) == 0)
+        {
+          WarnNoImageReturn("\"%%[%s]\"",property);
+          (void) FormatLocaleString(value,MagickPathExtent,"%.*g",
+            GetMagickPrecision(),(double) image->quality);
+          break;
+        }
+      break;
+    }
     case 'r':
     {
+      if (LocaleCompare("rendering-intent",property) == 0)
+        {
+          WarnNoImageReturn("\"%%[%s]\"",property);
+          string=CommandOptionToMnemonic(MagickIntentOptions,(ssize_t)
+            image->rendering_intent);
+          break;
+        }
       if (LocaleCompare("resolution.x",property) == 0)
         {
           WarnNoImageReturn("\"%%[%s]\"",property);