From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 18 Jun 2012 18:23:31 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5407
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=043b457437e93f9fa2b6e0931116da64616e302e;p=imagemagick

---

diff --git a/MagickCore/colorspace-private.h b/MagickCore/colorspace-private.h
index 053f3f9a4..566da5738 100644
--- a/MagickCore/colorspace-private.h
+++ b/MagickCore/colorspace-private.h
@@ -42,9 +42,9 @@ static inline void ConvertsRGBToCMYK(PixelInfo *pixel)
       pixel->black=(MagickRealType) QuantumRange;
       return;
     }
-  cyan=(MagickRealType) (1.0-DecompandsRGB(QuantumScale*pixel->red));
-  magenta=(MagickRealType) (1.0-DecompandsRGB(QuantumScale*pixel->green));
-  yellow=(MagickRealType) (1.0-DecompandsRGB(QuantumScale*pixel->blue));
+  cyan=(MagickRealType) (1.0-QuantumScale*pixel->red);
+  magenta=(MagickRealType) (1.0-QuantumScale*pixel->green);
+  yellow=(MagickRealType) (1.0-QuantumScale*pixel->blue);
   black=cyan;
   if (magenta < black)
     black=magenta;
diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index f5cd6581e..3f439d2b7 100644
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -256,19 +256,22 @@ static MagickBooleanType sRGBTransformImage(Image *image,
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           double
-            blue,
-            green,
-            red;
-
-          red=QuantumRange*DecompandsRGB(QuantumScale*GetPixelRed(image,q));
-          green=QuantumRange*DecompandsRGB(QuantumScale*GetPixelGreen(image,q));
-          blue=QuantumRange*DecompandsRGB(QuantumScale*GetPixelBlue(image,q));
+            cyan,
+            magenta,
+            yellow;
+
+          cyan=QuantumRange*DecompandsRGB(QuantumScale*
+            GetPixelCyan(image,q));
+          magenta=QuantumRange*DecompandsRGB(QuantumScale*
+            GetPixelMagenta(image,q));
+          yellow=QuantumRange*DecompandsRGB(QuantumScale*
+            GetPixelYellow(image,q));
           SetPixelCyan(image,ClampToQuantum((MagickRealType) (QuantumRange-
-            red)),q);
+            cyan)),q);
           SetPixelMagenta(image,ClampToQuantum((MagickRealType) (QuantumRange-
-            green)),q);
+            magenta)),q);
           SetPixelYellow(image,ClampToQuantum((MagickRealType) (QuantumRange-
-            blue)),q);
+            yellow)),q);
           q+=GetPixelChannels(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -1446,8 +1449,8 @@ static inline ssize_t RoundToYCC(const MagickRealType value)
   return((ssize_t) (value+0.5));
 }
 
-static inline void ConvertXYZTosRGB(const double x,const double y,const double z,
-  Quantum *red,Quantum *green,Quantum *blue)
+static inline void ConvertXYZTosRGB(const double x,const double y,
+  const double z,Quantum *red,Quantum *green,Quantum *blue)
 {
   double
     b,
@@ -1789,12 +1792,20 @@ static MagickBooleanType TransformsRGBImage(Image *image,
           }
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          SetPixelRed(image,ClampToQuantum((MagickRealType) (QuantumRange-
-            GetPixelRed(image,q))),q);
-          SetPixelGreen(image,ClampToQuantum((MagickRealType) (QuantumRange-
-            GetPixelGreen(image,q))),q);
-          SetPixelBlue(image,ClampToQuantum((MagickRealType) (QuantumRange-
-            GetPixelBlue(image,q))),q);
+          double
+            cyan,
+            magenta,
+            yellow;
+
+          cyan=QuantumRange*CompandsRGB(QuantumScale*(QuantumRange-
+            GetPixelCyan(image,q)));
+          magenta=QuantumRange*CompandsRGB(QuantumScale*(QuantumRange-
+            GetPixelMagenta(image,q)));
+          yellow=QuantumRange*CompandsRGB(QuantumScale*(QuantumRange-
+            GetPixelYellow(image,q)));
+          SetPixelCyan(image,ClampToQuantum((MagickRealType) cyan),q);
+          SetPixelMagenta(image,ClampToQuantum((MagickRealType) magenta),q);
+          SetPixelYellow(image,ClampToQuantum((MagickRealType) yellow),q);
           q+=GetPixelChannels(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);