commit 3889d153c1a0232697d239c8a51151f87048a432
author Cristy <urban-warrior@imagemagick.org> Fri Dec 22 19:42:13 2017 -0500
committer Cristy <urban-warrior@imagemagick.org> Fri Dec 22 19:42:13 2017 -0500
tree 21bf0214efc01fbc2a104f012ee55a1191067570
parent e8883a1744f8685e585b80745dbfaedc247a7411

...

coders/json.c

diff --git a/coders/json.c b/coders/json.c
index c445414..e2566cb 100644
--- a/coders/json.c
+++ b/coders/json.c
@@ -932,9 +932,6 @@
   char
     *url;
 
-  ColorspaceType
-    colorspace;
-
   const char
     *artifact,
     *locate,
@@ -1069,8 +1066,7 @@
       if (image->alpha_trait != UndefinedPixelTrait)
         (void) PrintChannelLocations(file,image,AlphaPixelChannel,"Alpha",
           type,max_locations,MagickTrue,channel_statistics);
-      colorspace=GetImageColorspaceType(image,exception);
-      switch (colorspace)
+      switch (image->colorspace)
       {
         case RGBColorspace:
         default:
@@ -1109,13 +1105,9 @@
   /*
     Detail channel depth and extrema.
   */
-  colorspace=GetImageColorspaceType(image,exception);
   JSONFormatLocaleFile(file,"    \"colorspace\": %s,\n",
-    CommandOptionToMnemonic(MagickColorspaceOptions,(ssize_t) colorspace));
-  if (image->colorspace != colorspace)
-    JSONFormatLocaleFile(file,"    \"baseColorspace\": %s,\n",
-      CommandOptionToMnemonic(MagickColorspaceOptions,(ssize_t)
-        image->colorspace));
+    CommandOptionToMnemonic(MagickColorspaceOptions,(ssize_t)
+    image->colorspace));
   channel_statistics=(ChannelStatistics *) NULL;
   channel_moments=(ChannelMoments *) NULL;
   channel_phash=(ChannelPerceptualHash *) NULL;
@@ -1148,7 +1140,7 @@
   if (image->alpha_trait != UndefinedPixelTrait)
     (void) FormatLocaleFile(file,"      \"alpha\": %.20g,\n",(double)
       channel_statistics[AlphaPixelChannel].depth);
-  switch (colorspace)
+  switch (image->colorspace)
   {
     case RGBColorspace:
     default:
@@ -1189,7 +1181,7 @@
     {
       (void) FormatLocaleFile(file,"    \"pixels\": %.20g,\n",
         channel_statistics[CompositePixelChannel].area);
-      if (colorspace != GRAYColorspace)
+      if (image->colorspace != GRAYColorspace)
         {
           (void) FormatLocaleFile(file,"    \"imageStatistics\": {\n");
           (void) PrintChannelStatistics(file,(PixelChannel) MaxPixelChannels,
@@ -1200,7 +1192,7 @@
       if (image->alpha_trait != UndefinedPixelTrait)
         (void) PrintChannelStatistics(file,AlphaPixelChannel,"Alpha",1.0/scale,
           MagickTrue,channel_statistics);
-      switch (colorspace)
+      switch (image->colorspace)
       {
         case RGBColorspace:
         default:
@@ -1242,7 +1234,7 @@
       if (image->alpha_trait != UndefinedPixelTrait)
         (void) PrintChannelMoments(file,AlphaPixelChannel,"Alpha",MagickTrue,
           channel_moments);
-      switch (colorspace)
+      switch (image->colorspace)
       {
         case RGBColorspace:
         default:
@@ -1292,7 +1284,7 @@
       if (image->alpha_trait != UndefinedPixelTrait)
         (void) PrintChannelFeatures(file,AlphaPixelChannel,"Alpha",MagickTrue,
           channel_features);
-      switch (colorspace)
+      switch (image->colorspace)
       {
         case RGBColorspace:
         default: