(no commit message)

[imagemagick] / MagickCore / colorspace-private.h

diff --git a/MagickCore/colorspace-private.h b/MagickCore/colorspace-private.h
index 6bc12ccb2460ac7d09981c6d85668b37eac4ac5f..d5f598b59bd45d3bf73d7098ab4eaa0716e91c2f 100644 (file)
--- a/MagickCore/colorspace-private.h
+++ b/MagickCore/colorspace-private.h
@@ -25,33 +25,48 @@ extern "C" {
 #include <MagickCore/image.h>
 #include <MagickCore/image-private.h>
 #include <MagickCore/pixel.h>
+#include <MagickCore/pixel-accessor.h>
 
 static inline void ConvertRGBToCMYK(PixelInfo *pixel)
 {
-  MagickRealType
+  double
     black,
+    blue,
     cyan,
+    green,
     magenta,
+    red,
     yellow;
                                                                                 
-  if ((fabs(pixel->red) < MagickEpsilon) &&
-      (fabs(pixel->green) < MagickEpsilon) &&
-      (fabs(pixel->blue) < MagickEpsilon))
+  if (pixel->colorspace != sRGBColorspace)
     {
-      pixel->black=(MagickRealType) QuantumRange;
+      red=QuantumScale*pixel->red;
+      green=QuantumScale*pixel->green;
+      blue=QuantumScale*pixel->blue;
+    }
+  else
+    {
+      red=InversesRGBCompandor(pixel->red);
+      green=InversesRGBCompandor(pixel->green);
+      blue=InversesRGBCompandor(pixel->blue);
+    }
+  if ((fabs(red) < MagickEpsilon) && (fabs(green) < MagickEpsilon) &&
+      (fabs(blue) < MagickEpsilon))
+    {
+      pixel->black=(double) QuantumRange;
       return;
     }
-  cyan=(MagickRealType) (1.0-QuantumScale*pixel->red);
-  magenta=(MagickRealType) (1.0-QuantumScale*pixel->green);
-  yellow=(MagickRealType) (1.0-QuantumScale*pixel->blue);
+  cyan=(double) (1.0-red);
+  magenta=(double) (1.0-green);
+  yellow=(double) (1.0-blue);
   black=cyan;
   if (magenta < black)
     black=magenta;
   if (yellow < black)
     black=yellow;
-  cyan=(MagickRealType) ((cyan-black)/(1.0-black));
-  magenta=(MagickRealType) ((magenta-black)/(1.0-black));
-  yellow=(MagickRealType) ((yellow-black)/(1.0-black));
+  cyan=(double) ((cyan-black)/(1.0-black));
+  magenta=(double) ((magenta-black)/(1.0-black));
+  yellow=(double) ((yellow-black)/(1.0-black));
   pixel->colorspace=CMYKColorspace;
   pixel->red=QuantumRange*cyan;
   pixel->green=QuantumRange*magenta;
@@ -59,6 +74,14 @@ static inline void ConvertRGBToCMYK(PixelInfo *pixel)
   pixel->black=QuantumRange*black;
 }
 
+static inline MagickBooleanType IsCMYKColorspace(
+  const ColorspaceType colorspace)
+{
+  if (colorspace == CMYKColorspace)
+    return(MagickTrue);
+  return(MagickFalse);
+}
+
 static inline MagickBooleanType IsGrayColorspace(
   const ColorspaceType colorspace)
 {
@@ -83,6 +106,15 @@ static inline MagickBooleanType IssRGBColorspace(
   return(MagickFalse);
 }
 
+static inline MagickBooleanType IssRGBCompatibleColorspace(
+  const ColorspaceType colorspace)
+{
+  if ((colorspace == sRGBColorspace) || (colorspace == TransparentColorspace) ||
+      (colorspace == RGBColorspace) || (colorspace == GRAYColorspace))
+    return(MagickTrue);
+  return(MagickFalse);
+}
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif