From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 5 Feb 2017 00:39:50 +0000 (-0500)
Subject: ...
X-Git-Tag: 7.0.4-8~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f8642cde36f32246d04b4ba0d40f559e078b850;p=imagemagick

...
---

diff --git a/MagickCore/option.c b/MagickCore/option.c
index 6b85d5c59..b3a9645c5 100644
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -177,6 +177,28 @@ static const OptionInfo
     { "7", 7, UndefinedOptionFlag, MagickFalse },
     { "8", 8, UndefinedOptionFlag, MagickFalse },
     { "9", 9, UndefinedOptionFlag, MagickFalse },
+    { "10", 10, UndefinedOptionFlag, MagickFalse },
+    { "11", 11, UndefinedOptionFlag, MagickFalse },
+    { "12", 12, UndefinedOptionFlag, MagickFalse },
+    { "13", 13, UndefinedOptionFlag, MagickFalse },
+    { "14", 14, UndefinedOptionFlag, MagickFalse },
+    { "15", 15, UndefinedOptionFlag, MagickFalse },
+    { "16", 16, UndefinedOptionFlag, MagickFalse },
+    { "17", 17, UndefinedOptionFlag, MagickFalse },
+    { "18", 18, UndefinedOptionFlag, MagickFalse },
+    { "19", 19, UndefinedOptionFlag, MagickFalse },
+    { "20", 20, UndefinedOptionFlag, MagickFalse },
+    { "21", 21, UndefinedOptionFlag, MagickFalse },
+    { "22", 22, UndefinedOptionFlag, MagickFalse },
+    { "23", 23, UndefinedOptionFlag, MagickFalse },
+    { "24", 24, UndefinedOptionFlag, MagickFalse },
+    { "25", 25, UndefinedOptionFlag, MagickFalse },
+    { "26", 26, UndefinedOptionFlag, MagickFalse },
+    { "27", 27, UndefinedOptionFlag, MagickFalse },
+    { "28", 28, UndefinedOptionFlag, MagickFalse },
+    { "29", 29, UndefinedOptionFlag, MagickFalse },
+    { "30", 30, UndefinedOptionFlag, MagickFalse },
+    { "31", 31, UndefinedOptionFlag, MagickFalse },
     { (char *) NULL, UndefinedChannel, UndefinedOptionFlag, MagickFalse }
   },
   ClassOptions[] =
diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index 49080dcd6..0a5f0c2ed 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -4326,6 +4326,7 @@ static void LogPixelChannels(const Image *image)
   for (i=0; i < (ssize_t) image->number_channels; i++)
   {
     char
+      channel_name[MagickPathExtent],
       traits[MagickPathExtent];
 
     const char
@@ -4334,7 +4335,8 @@ static void LogPixelChannels(const Image *image)
     PixelChannel
       channel;
 
-    switch (GetPixelChannelChannel(image,i))
+    channel=GetPixelChannelChannel(image,i);
+    switch (channel)
     {
       case RedPixelChannel:
       {
@@ -4394,7 +4396,12 @@ static void LogPixelChannels(const Image *image)
       default:
         name="undefined";
     }
-    channel=GetPixelChannelChannel(image,i);
+    if (image->colorspace ==  UndefinedColorspace)
+      {
+        (void) FormatLocaleString(channel_name,MagickPathExtent,"%.20g",
+          (double) channel);
+        name=(const char *) channel_name;
+      }
     *traits='\0';
     if ((GetPixelChannelTraits(image,channel) & UpdatePixelTrait) != 0)
       (void) ConcatenateMagickString(traits,"update,",MagickPathExtent);