(no commit message)

[imagemagick] / MagickCore / color.c

diff --git a/MagickCore/color.c b/MagickCore/color.c
index 7ac6ce910a6da40e1810726bbc4293b61a6a8e28..81a2ead58ed09089954f51d832e37a7343d060fa 100644 (file)
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -46,6 +46,7 @@
 #include "MagickCore/cache.h"
 #include "MagickCore/color.h"
 #include "MagickCore/color-private.h"
+#include "MagickCore/colorspace-private.h"
 #include "MagickCore/client.h"
 #include "MagickCore/configure.h"
 #include "MagickCore/exception.h"
@@ -1004,7 +1005,7 @@ MagickExport const ColorInfo *GetColorInfo(const char *name,
 %  The format of the ConcatenateColorComponent() method is:
 %
 %      void ConcatenateColorComponent(const PixelInfo *pixel,
-%        const PixelComponent component,const ComplianceType compliance,
+%        const PixelChannel component,const ComplianceType compliance,
 %        char *tuple)
 %
 %  A description of each parameter follows.
@@ -1019,7 +1020,7 @@ MagickExport const ColorInfo *GetColorInfo(const char *name,
 %
 */
 MagickExport void ConcatenateColorComponent(const PixelInfo *pixel,
-  const PixelComponent component,const ComplianceType compliance,char *tuple)
+  const PixelChannel component,const ComplianceType compliance,char *tuple)
 {
   char
     text[MaxTextExtent];
@@ -1030,27 +1031,27 @@ MagickExport void ConcatenateColorComponent(const PixelInfo *pixel,
   color=0.0;
   switch (component)
   {
-    case RedPixelComponent:
+    case RedPixelChannel:
     {
       color=pixel->red;
       break;
     }
-    case GreenPixelComponent:
+    case GreenPixelChannel:
     {
       color=pixel->green;
       break;
     }
-    case BluePixelComponent:
+    case BluePixelChannel:
     {
       color=pixel->blue;
       break;
     }
-    case AlphaPixelComponent:
+    case AlphaPixelChannel:
     {
       color=pixel->alpha;
       break;
     }
-    case BlackPixelComponent:
+    case BlackPixelChannel:
     {
       color=pixel->black;
       break;
@@ -1079,7 +1080,7 @@ MagickExport void ConcatenateColorComponent(const PixelInfo *pixel,
       (void) ConcatenateMagickString(tuple,text,MaxTextExtent);
       return;
     }
-  if (component == AlphaPixelComponent)
+  if (component == AlphaPixelChannel)
     {
       (void) FormatLocaleString(text,MaxTextExtent,"%g",(double)
         (QuantumScale*color));
@@ -1446,20 +1447,20 @@ MagickExport void GetColorTuple(const PixelInfo *pixel,
   if (color.matte != MagickFalse)
     (void) ConcatenateMagickString(tuple,"a",MaxTextExtent);
   (void) ConcatenateMagickString(tuple,"(",MaxTextExtent);
-  ConcatenateColorComponent(&color,RedPixelComponent,SVGCompliance,tuple);
+  ConcatenateColorComponent(&color,RedPixelChannel,SVGCompliance,tuple);
   (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
-  ConcatenateColorComponent(&color,GreenPixelComponent,SVGCompliance,tuple);
+  ConcatenateColorComponent(&color,GreenPixelChannel,SVGCompliance,tuple);
   (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
-  ConcatenateColorComponent(&color,BluePixelComponent,SVGCompliance,tuple);
+  ConcatenateColorComponent(&color,BluePixelChannel,SVGCompliance,tuple);
   if (color.colorspace == CMYKColorspace)
     {
       (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
-      ConcatenateColorComponent(&color,BlackPixelComponent,SVGCompliance,tuple);
+      ConcatenateColorComponent(&color,BlackPixelChannel,SVGCompliance,tuple);
     }
   if (color.matte != MagickFalse)
     {
       (void) ConcatenateMagickString(tuple,",",MaxTextExtent);
-      ConcatenateColorComponent(&color,AlphaPixelComponent,SVGCompliance,tuple);
+      ConcatenateColorComponent(&color,AlphaPixelChannel,SVGCompliance,tuple);
     }
   (void) ConcatenateMagickString(tuple,")",MaxTextExtent);
   LocaleLower(tuple);
@@ -2591,8 +2592,8 @@ MagickExport MagickBooleanType QueryMagickColor(const char *name,
 %
 */
 MagickExport MagickBooleanType QueryMagickColorname(const Image *image,
-  const PixelInfo *color,const ComplianceType compliance,
-  char *name,ExceptionInfo *exception)
+  const PixelInfo *color,const ComplianceType compliance,char *name,
+  ExceptionInfo *exception)
 {
   PixelInfo
     pixel;
@@ -2612,6 +2613,8 @@ MagickExport MagickBooleanType QueryMagickColorname(const Image *image,
     }
   GetColorTuple(&pixel,compliance != SVGCompliance ? MagickTrue : MagickFalse,
     name);
+  if (IsRGBColorspace(pixel.colorspace) == MagickFalse)
+    return(MagickFalse);
   (void) GetColorInfo("*",exception);
   ResetLinkedListIterator(color_list);
   opacity=image->matte != MagickFalse ? color->alpha : OpaqueAlpha;