Changeset 8330

Timestamp:

06/18/12 14:23:31 (11 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk/MagickCore

Files:

• colorspace-private.h (modified) (1 diff)
• colorspace.c (modified) (3 diffs)

ImageMagick/trunk/MagickCore/colorspace-private.h

@@ -43 +43 @@
       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)

ImageMagick/trunk/MagickCore/colorspace.c

@@ -257 +257 @@
         {
           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);
         }
@@ -1447 +1450 @@
 }
 
-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
@@ -1790 +1793 @@
         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);
         }