(no commit message)

[imagemagick] / MagickCore / gem-private.h

diff --git a/MagickCore/gem-private.h b/MagickCore/gem-private.h
index f2f844318804b751a8f54379d63d006beaa87fcc..f3ca0dc537efcd0deaeee56559cc64d1d1888bf1 100644 (file)
--- a/MagickCore/gem-private.h
+++ b/MagickCore/gem-private.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization
   dedicated to making software imaging solutions freely available.
   
   You may not use this file except in compliance with the License.
@@ -18,17 +18,17 @@
 #ifndef _MAGICKCORE_GEM_PRIVATE_H
 #define _MAGICKCORE_GEM_PRIVATE_H
 
+#include "MagickCore/pixel-private.h"
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
 
-#include "MagickCore/pixel-private.h"
-
-#define D65X  (0.950456f)
-#define D65Y  (1.0f)
-#define D65Z  (1.088754f)
-#define CIEEpsilon  (216.0f/24389.0f)
-#define CIEK  (24389.0f/27.0f)
+#define D65X  0.950456
+#define D65Y  1.0
+#define D65Z  1.088754
+#define CIEEpsilon  (216.0/24389.0)
+#define CIEK  (24389.0/27.0)
 
 extern MagickPrivate double
   GenerateDifferentialNoise(RandomInfo *,const Quantum,const NoiseType,
@@ -42,8 +42,14 @@ extern MagickPrivate size_t
 extern MagickPrivate void
   ConvertHCLToRGB(const double,const double,const double,double *,double *,
     double *),
+  ConvertHCLpToRGB(const double,const double,const double,double *,double *,
+    double *),
   ConvertHSBToRGB(const double,const double,const double,double *,double *,
     double *),
+  ConvertHSIToRGB(const double,const double,const double,double *,double *,
+    double *),
+  ConvertHSVToRGB(const double,const double,const double,double *,double *,
+    double *),
   ConvertHWBToRGB(const double,const double,const double,double *,double *,
     double *),
   ConvertLCHabToRGB(const double,const double,const double,double *,double *,
@@ -52,8 +58,14 @@ extern MagickPrivate void
     double *),
   ConvertRGBToHCL(const double,const double,const double,double *,double *,
     double *),
+  ConvertRGBToHCLp(const double,const double,const double,double *,double *,
+    double *),
   ConvertRGBToHSB(const double,const double,const double,double *,double *,
     double *),
+  ConvertRGBToHSI(const double,const double,const double,double *,double *,
+    double *),
+  ConvertRGBToHSV(const double,const double,const double,double *,double *,
+    double *),
   ConvertRGBToHWB(const double,const double,const double,double *,double *,
     double *),
   ConvertRGBToLCHab(const double,const double,const double,double *,double *,
@@ -72,21 +84,21 @@ static inline void ConvertLabToXYZ(const double L,const double a,const double b,
   assert(X != (double *) NULL);
   assert(Y != (double *) NULL);
   assert(Z != (double *) NULL);
-  y=(100.0f*L+16.0f)/116.0f;
-  x=y+255.0f*(a-0.5f)/500.0f;
-  z=y-255.0f*(b-0.5f)/200.0f;
+  y=(L+16.0)/116.0;
+  x=y+a/500.0;
+  z=y-b/200.0;
   if ((x*x*x) > CIEEpsilon)
     x=(x*x*x);
   else
-    x=(116.0f*x-16.0f)/CIEK;
+    x=(116.0*x-16.0)/CIEK;
   if ((y*y*y) > CIEEpsilon)
     y=(y*y*y);
   else
-    y=(100.0f*L)/CIEK;
+    y=L/CIEK;
   if ((z*z*z) > CIEEpsilon)
     z=(z*z*z);
   else
-    z=(116.0f*z-16.0f)/CIEK;
+    z=(116.0*z-16.0)/CIEK;
   *X=D65X*x;
   *Y=D65Y*y;
   *Z=D65Z*z;
@@ -98,16 +110,15 @@ static inline void ConvertLuvToXYZ(const double L,const double u,const double v,
   assert(X != (double *) NULL);
   assert(Y != (double *) NULL);
   assert(Z != (double *) NULL);
-  if ((100.0f*L) > (CIEK*CIEEpsilon))
-    *Y=(double) pow(((100.0*L)+16.0)/116.0,3.0);
+  if (L > (CIEK*CIEEpsilon))
+    *Y=(double) pow((L+16.0)/116.0,3.0);
   else
-    *Y=(100.0f*L)/CIEK;
-  *X=((*Y*((39.0f*(100.0f*L)/((262.0f*v-140.0f)+13.0f*(100.0f*L)*(9.0f*D65Y/
-    (D65X+15.0f*D65Y+3.0f*D65Z))))-5.0f))+5.0f*(*Y))/((((52.0f*(100.0f*L)/
-    ((354.0f*u-134.0f)+13.0f*(100.0f*L)*(4.0f*D65X/(D65X+15.0f*D65Y+3.0f*
-    D65Z))))-1.0f)/3.0f)-(-1.0f/3.0f));
-  *Z=(*X*(((52.0f*(100.0f*L)/((354.0f*u-134.0f)+13.0f*(100.0f*L)*(4.0f*D65X/
-    (D65X+15.0f*D65Y+3.0f*D65Z))))-1.0f)/3.0f))-5.0f*(*Y);
+    *Y=L/CIEK;
+  *X=((*Y*((39.0*L/(v+13.0*L*(9.0*D65Y/(D65X+15.0*D65Y+3.0*D65Z))))-5.0))+
+    5.0*(*Y))/((((52.0*L/(u+13.0*L*(4.0*D65X/(D65X+15.0*D65Y+3.0*D65Z))))-1.0)/
+    3.0)-(-1.0/3.0));
+  *Z=(*X*(((52.0*L/(u+13.0*L*(4.0*D65X/(D65X+15.0*D65Y+3.0*D65Z))))-1.0)/3.0))-
+    5.0*(*Y);
 }
 
 static inline void ConvertRGBToXYZ(const double red,const double green,
@@ -118,12 +129,15 @@ static inline void ConvertRGBToXYZ(const double red,const double green,
     g,
     r;
 
+  /*
+    Convert RGB to XYZ colorspace.
+  */
   assert(X != (double *) NULL);
   assert(Y != (double *) NULL);
   assert(Z != (double *) NULL);
-  r=QuantumScale*red;
-  g=QuantumScale*green;
-  b=QuantumScale*blue;
+  r=QuantumScale*DecodePixelGamma(red);
+  g=QuantumScale*DecodePixelGamma(green);
+  b=QuantumScale*DecodePixelGamma(blue);
   *X=0.41239558896741421610*r+0.35758343076371481710*g+0.18049264738170157350*b;
   *Y=0.21258623078559555160*r+0.71517030370341084990*g+0.07220049864333622685*b;
   *Z=0.01929721549174694484*r+0.11918386458084853180*g+0.95049712513157976600*b;
@@ -136,24 +150,25 @@ static inline void ConvertXYZToLab(const double X,const double Y,const double Z,
     x,
     y,
     z;
+
   assert(L != (double *) NULL);
   assert(a != (double *) NULL);
   assert(b != (double *) NULL);
   if ((X/D65X) > CIEEpsilon)
     x=pow(X/D65X,1.0/3.0);
   else
-    x=(CIEK*X/D65X+16.0f)/116.0f;
+    x=(CIEK*X/D65X+16.0)/116.0;
   if ((Y/D65Y) > CIEEpsilon)
     y=pow(Y/D65Y,1.0/3.0);
   else
-    y=(CIEK*Y/D65Y+16.0f)/116.0f;
+    y=(CIEK*Y/D65Y+16.0)/116.0;
   if ((Z/D65Z) > CIEEpsilon)
     z=pow(Z/D65Z,1.0/3.0);
   else
-    z=(CIEK*Z/D65Z+16.0f)/116.0f;
-  *L=((116.0f*y)-16.0f)/100.0f;
-  *a=(500.0f*(x-y))/255.0f+0.5f;
-  *b=(200.0f*(y-z))/255.0f+0.5f;
+    z=(CIEK*Z/D65Z+16.0)/116.0;
+  *L=((116.0*y)-16.0)/100.0;
+  *a=(500.0*(x-y))/255.0+0.5;
+  *b=(200.0*(y-z))/255.0+0.5;
 }
 
 static inline void ConvertXYZToLuv(const double X,const double Y,const double Z,
@@ -166,18 +181,18 @@ static inline void ConvertXYZToLuv(const double X,const double Y,const double Z,
   assert(u != (double *) NULL);
   assert(v != (double *) NULL);
   if ((Y/D65Y) > CIEEpsilon)
-    *L=(double) (116.0f*pow(Y/D65Y,1.0/3.0)-16.0f);
+    *L=(double) (116.0*pow(Y/D65Y,1.0/3.0)-16.0);
   else
     *L=CIEK*(Y/D65Y);
-  alpha=PerceptibleReciprocal(X+15.0f*Y+3.0f*Z);
-  *u=13.0f*(*L)*((4.0f*alpha*X)-(4.0f*D65X/(D65X+15.0f*D65Y+3.0f*D65Z)));
-  *v=13.0f*(*L)*((9.0f*alpha*Y)-(9.0f*D65Y/(D65X+15.0f*D65Y+3.0f*D65Z)));
-  *L/=100.0f;
-  *u=(*u+134.0f)/354.0f;
-  *v=(*v+140.0f)/262.0f;
+  alpha=PerceptibleReciprocal(X+15.0*Y+3.0*Z);
+  *u=13.0*(*L)*((4.0*alpha*X)-(4.0*D65X/(D65X+15.0*D65Y+3.0*D65Z)));
+  *v=13.0*(*L)*((9.0*alpha*Y)-(9.0*D65Y/(D65X+15.0*D65Y+3.0*D65Z)));
+  *L/=100.0;
+  *u=(*u+134.0)/354.0;
+  *v=(*v+140.0)/262.0;
 }
 
-static inline void ConvertXYZToRGB(const double x,const double y,const double z,
+static inline void ConvertXYZToRGB(const double X,const double Y,const double Z,
   double *red,double *green,double *blue)
 {
   double
@@ -185,21 +200,17 @@ static inline void ConvertXYZToRGB(const double x,const double y,const double z,
     g,
     r;
 
-  /*
-    Convert XYZ to RGB colorspace.
-  */
   assert(red != (double *) NULL);
   assert(green != (double *) NULL);
   assert(blue != (double *) NULL);
-  r=3.2406f*x-1.5372f*y-0.4986f*z;
-  g=(-0.9689f*x+1.8758f*y+0.0415f*z);
-  b=0.0557f*x-0.2040f*y+1.0570f*z;
-  *red=QuantumRange*r;
-  *green=QuantumRange*g;
-  *blue=QuantumRange*b;
+  r=3.2406*X-1.5372*Y-0.4986*Z;
+  g=(-0.9689)*X+1.8758*Y+0.0415*Z;
+  b=0.0557*X-0.2040*Y+1.0570*Z;
+  *red=EncodePixelGamma(QuantumRange*r);
+  *green=EncodePixelGamma(QuantumRange*g);
+  *blue=EncodePixelGamma(QuantumRange*b);
 }
 
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif