% MagickCore Image Colorspace Methods %
% %
% Software Design %
-% John Cristy %
+% Cristy %
% July 1992 %
% %
% %
-% Copyright 1999-2012 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. You may %
*/
typedef struct _TransformPacket
{
- double
+ MagickRealType
x,
y,
z;
Forward declarations.
*/
static MagickBooleanType
- TransformsRGBImage(Image *,const ColorspaceType,ExceptionInfo *);
+ TransformsRGBImage(Image *,ExceptionInfo *);
\f
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
*/
-static inline void ConvertRGBToXYZ(const double red,const double green,
- const double blue,double *X,double *Y,double *Z)
+static inline void ConvertRGBToCMY(const double red,const double green,
+ const double blue,double *cyan,double *magenta,double *yellow)
{
- double
- b,
- g,
- r;
-
- assert(X != (double *) NULL);
- assert(Y != (double *) NULL);
- assert(Z != (double *) NULL);
- r=QuantumScale*red;
- g=QuantumScale*green;
- b=QuantumScale*blue;
- *X=0.4124564*r+0.3575761*g+0.1804375*b;
- *Y=0.2126729*r+0.7151522*g+0.0721750*b;
- *Z=0.0193339*r+0.1191920*g+0.9503041*b;
+ *cyan=QuantumScale*(QuantumRange-red);
+ *magenta=QuantumScale*(QuantumRange-green);
+ *yellow=QuantumScale*(QuantumRange-blue);
}
-static inline void ConvertXYZToLab(const double X,const double Y,const double Z,
- double *L,double *a,double *b)
+static inline void ConvertXYZToLMS(const double x,const double y,
+ const double z,double *L,double *M,double *S)
{
-#define D65X (0.950470)
-#define D65Y (1.0)
-#define D65Z (1.088830)
-#define CIEEpsilon (216.0/24389.0)
-#define CIEK (24389.0/27.0)
+ *L=0.7328*x+0.4296*y-0.1624*z;
+ *M=(-0.7036*x+1.6975*y+0.0061*z);
+ *S=0.0030*x+0.0136*y+0.9834*z;
+}
+static void ConvertRGBToLMS(const double red,const double green,
+ const double blue,double *L,double *M,double *S)
+{
double
- x,
- y,
- 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.0)/116.0;
- if ((Y/D65Y) > CIEEpsilon)
- y=pow(Y/D65Y,1.0/3.0);
- else
- 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.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;
+ ConvertRGBToXYZ(red,green,blue,&X,&Y,&Z);
+ ConvertXYZToLMS(X,Y,Z,L,M,S);
}
-static inline void ConvertXYZToLuv(const double X,const double Y,const double Z,
- double *L,double *u,double *v)
+static void ConvertRGBToLab(const double red,const double green,
+ const double blue,double *L,double *a,double *b)
{
double
- alpha;
+ X,
+ Y,
+ Z;
- assert(L != (double *) NULL);
- assert(u != (double *) NULL);
- assert(v != (double *) NULL);
- if ((Y/D65Y) > CIEEpsilon)
- *L=(double) (116.0*pow(Y/D65Y,1.0/3.0)-16.0);
- else
- *L=CIEK*(Y/D65Y);
- alpha=MagickEpsilonReciprocal(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;
+ ConvertRGBToXYZ(red,green,blue,&X,&Y,&Z);
+ ConvertXYZToLab(X,Y,Z,L,a,b);
+}
+
+static void ConvertRGBToLuv(const double red,const double green,
+ const double blue,double *L,double *u,double *v)
+{
+ double
+ X,
+ Y,
+ Z;
+
+ ConvertRGBToXYZ(red,green,blue,&X,&Y,&Z);
+ ConvertXYZToLuv(X,Y,Z,L,u,v);
+}
+
+static void ConvertRGBToYDbDr(const double red,const double green,
+ const double blue,double *Y,double *Db,double *Dr)
+{
+ *Y=QuantumScale*(0.298839*red+0.586811*green+0.114350*blue);
+ *Db=QuantumScale*(-0.450*red-0.883*green+1.333*blue)+0.5;
+ *Dr=QuantumScale*(-1.333*red+1.116*green+0.217*blue)+0.5;
+}
+
+static void ConvertRGBToYIQ(const double red,const double green,
+ const double blue,double *Y,double *I,double *Q)
+{
+ *Y=QuantumScale*(0.298839*red+0.586811*green+0.114350*blue);
+ *I=QuantumScale*(0.595716*red-0.274453*green-0.321263*blue)+0.5;
+ *Q=QuantumScale*(0.211456*red-0.522591*green+0.311135*blue)+0.5;
+}
+
+static void ConvertRGBToYPbPr(const double red,const double green,
+ const double blue,double *Y,double *Pb,double *Pr)
+{
+ *Y=QuantumScale*(0.298839*red+0.586811*green+0.114350*blue);
+ *Pb=QuantumScale*((-0.1687367)*red-0.331264*green+0.5*blue)+0.5;
+ *Pr=QuantumScale*(0.5*red-0.418688*green-0.081312*blue)+0.5;
+}
+
+static void ConvertRGBToYCbCr(const double red,const double green,
+ const double blue,double *Y,double *Cb,double *Cr)
+{
+ ConvertRGBToYPbPr(red,green,blue,Y,Cb,Cr);
+}
+
+static void ConvertRGBToYUV(const double red,const double green,
+ const double blue,double *Y,double *U,double *V)
+{
+ *Y=QuantumScale*(0.298839*red+0.586811*green+0.114350*blue);
+ *U=QuantumScale*((-0.147)*red-0.289*green+0.436*blue)+0.5;
+ *V=QuantumScale*(0.615*red-0.515*green-0.100*blue)+0.5;
}
static MagickBooleanType sRGBTransformImage(Image *image,
progress=0;
switch (colorspace)
{
- case CMYColorspace:
- {
- /*
- Convert RGB to CMY colorspace.
- */
- if (image->storage_class == PseudoClass)
- {
- if (SyncImage(image,exception) == MagickFalse)
- return(MagickFalse);
- if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
- return(MagickFalse);
- }
- image_view=AcquireAuthenticCacheView(image,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
-#endif
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- MagickBooleanType
- sync;
-
- register ssize_t
- x;
-
- register Quantum
- *restrict q;
-
- if (status == MagickFalse)
- continue;
- q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
- exception);
- if (q == (Quantum *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- double
- cyan,
- magenta,
- yellow;
-
- cyan=InversesRGBCompandor((double) GetPixelCyan(image,q));
- magenta=InversesRGBCompandor((double) GetPixelMagenta(image,q));
- yellow=InversesRGBCompandor((double) GetPixelYellow(image,q));
- SetPixelCyan(image,ClampToQuantum(QuantumRange-cyan),q);
- SetPixelMagenta(image,ClampToQuantum(QuantumRange-magenta),q);
- SetPixelYellow(image,ClampToQuantum(QuantumRange-yellow),q);
- q+=GetPixelChannels(image);
- }
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
- status=MagickFalse;
- }
- image_view=DestroyCacheView(image_view);
- image->type=image->alpha_trait != BlendPixelTrait ? ColorSeparationType :
- ColorSeparationMatteType;
- if (SetImageColorspace(image,colorspace,exception) == MagickFalse)
- return(MagickFalse);
- return(status);
- }
case CMYKColorspace:
{
PixelInfo
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
for (x=0; x < (ssize_t) image->columns; x++)
{
GetPixelInfoPixel(image,q,&pixel);
- pixel.red=InversesRGBCompandor(pixel.red);
- pixel.green=InversesRGBCompandor(pixel.green);
- pixel.blue=InversesRGBCompandor(pixel.blue);
ConvertRGBToCMYK(&pixel);
SetPixelInfoPixel(image,&pixel,q);
q+=GetPixelChannels(image);
return(status);
}
case GRAYColorspace:
- case Rec601LumaColorspace:
{
/*
Transform image from sRGB to GRAY.
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- double
- blue,
- gray,
- green,
- red;
-
- red=InversesRGBCompandor((double) GetPixelRed(image,q));
- green=InversesRGBCompandor((double) GetPixelGreen(image,q));
- blue=InversesRGBCompandor((double) GetPixelBlue(image,q));
- gray=0.298839*red+0.586811*green+0.114350*blue;
- SetPixelGray(image,ClampToQuantum(gray),q);
+ SetPixelGray(image,ClampToQuantum(GetPixelIntensity(image,q)),q);
q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
image->type=GrayscaleType;
return(status);
}
+ case CMYColorspace:
case HCLColorspace:
+ case HCLpColorspace:
+ case HSBColorspace:
+ case HSIColorspace:
+ case HSLColorspace:
+ case HSVColorspace:
+ case HWBColorspace:
+ case LabColorspace:
+ case LCHColorspace:
+ case LCHabColorspace:
+ case LCHuvColorspace:
+ case LMSColorspace:
+ case LuvColorspace:
+ case XYZColorspace:
+ case YCbCrColorspace:
+ case YDbDrColorspace:
+ case YIQColorspace:
+ case YPbPrColorspace:
+ case YUVColorspace:
{
/*
- Transform image from sRGB to HCL.
+ Transform image from sRGB to target colorspace.
*/
if (image->storage_class == PseudoClass)
{
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
{
double
blue,
- chroma,
green,
- hue,
- luma,
- red;
+ red,
+ X,
+ Y,
+ Z;
- red=InversesRGBCompandor((double) GetPixelRed(image,q));
- green=InversesRGBCompandor((double) GetPixelGreen(image,q));
- blue=InversesRGBCompandor((double) GetPixelBlue(image,q));
- ConvertRGBToHCL(red,green,blue,&hue,&chroma,&luma);
- SetPixelRed(image,ClampToQuantum(QuantumRange*hue),q);
- SetPixelGreen(image,ClampToQuantum(QuantumRange*chroma),q);
- SetPixelBlue(image,ClampToQuantum(QuantumRange*luma),q);
+ red=(double) GetPixelRed(image,q);
+ green=(double) GetPixelGreen(image,q);
+ blue=(double) GetPixelBlue(image,q);
+ switch (colorspace)
+ {
+ case CMYColorspace:
+ {
+ ConvertRGBToCMY(red,green,blue,&X,&Y,&Z);
+ break;
+ }
+ case HCLColorspace:
+ {
+ ConvertRGBToHCL(red,green,blue,&X,&Y,&Z);
+ break;
+ }
+ case HCLpColorspace:
+ {
+ ConvertRGBToHCLp(red,green,blue,&X,&Y,&Z);
+ break;
+ }
+ case HSBColorspace:
+ {
+ ConvertRGBToHSB(red,green,blue,&X,&Y,&Z);
+ break;
+ }
+ case HSIColorspace:
+ {
+ ConvertRGBToHSI(red,green,blue,&X,&Y,&Z);
+ break;
+ }
+ case HSLColorspace:
+ {
+ ConvertRGBToHSL(red,green,blue,&X,&Y,&Z);
+ break;
+ }
+ case HSVColorspace:
+ {
+ ConvertRGBToHSV(red,green,blue,&X,&Y,&Z);
+ break;
+ }
+ case HWBColorspace:
+ {
+ ConvertRGBToHWB(red,green,blue,&X,&Y,&Z);
+ break;
+ }
+ case LabColorspace:
+ {
+ ConvertRGBToLab(red,green,blue,&X,&Y,&Z);
+ break;
+ }
+ case LCHColorspace:
+ case LCHabColorspace:
+ {
+ ConvertRGBToLCHab(red,green,blue,&X,&Y,&Z);
+ break;
+ }
+ case LCHuvColorspace:
+ {
+ ConvertRGBToLCHuv(red,green,blue,&X,&Y,&Z);
+ break;
+ }
+ case LMSColorspace:
+ {
+ ConvertRGBToLMS(red,green,blue,&X,&Y,&Z);
+ break;
+ }
+ case LuvColorspace:
+ {
+ ConvertRGBToLuv(red,green,blue,&X,&Y,&Z);
+ break;
+ }
+ case XYZColorspace:
+ {
+ ConvertRGBToXYZ(red,green,blue,&X,&Y,&Z);
+ break;
+ }
+ case YCbCrColorspace:
+ {
+ ConvertRGBToYCbCr(red,green,blue,&X,&Y,&Z);
+ break;
+ }
+ case YDbDrColorspace:
+ {
+ ConvertRGBToYDbDr(red,green,blue,&X,&Y,&Z);
+ break;
+ }
+ case YIQColorspace:
+ {
+ ConvertRGBToYIQ(red,green,blue,&X,&Y,&Z);
+ break;
+ }
+ case YPbPrColorspace:
+ {
+ ConvertRGBToYPbPr(red,green,blue,&X,&Y,&Z);
+ break;
+ }
+ case YUVColorspace:
+ {
+ ConvertRGBToYUV(red,green,blue,&X,&Y,&Z);
+ break;
+ }
+ default:
+ {
+ X=QuantumScale*red;
+ Y=QuantumScale*green;
+ Z=QuantumScale*blue;
+ break;
+ }
+ }
+ SetPixelRed(image,ClampToQuantum(QuantumRange*X),q);
+ SetPixelGreen(image,ClampToQuantum(QuantumRange*Y),q);
+ SetPixelBlue(image,ClampToQuantum(QuantumRange*Z),q);
q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
return(MagickFalse);
return(status);
}
- case HSBColorspace:
+ case LogColorspace:
{
+#define DisplayGamma (1.0/1.7)
+#define FilmGamma 0.6
+#define ReferenceBlack 95.0
+#define ReferenceWhite 685.0
+
+ const char
+ *value;
+
+ double
+ black,
+ density,
+ film_gamma,
+ gamma,
+ reference_black,
+ reference_white;
+
+ Quantum
+ *logmap;
+
/*
- Transform image from sRGB to HSB.
+ Transform RGB to Log colorspace.
*/
- if (image->storage_class == PseudoClass)
- {
- if (SyncImage(image,exception) == MagickFalse)
- return(MagickFalse);
- if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
- return(MagickFalse);
- }
+ density=DisplayGamma;
+ gamma=DisplayGamma;
+ value=GetImageProperty(image,"gamma",exception);
+ if (value != (const char *) NULL)
+ gamma=PerceptibleReciprocal(StringToDouble(value,(char **) NULL));
+ film_gamma=FilmGamma;
+ value=GetImageProperty(image,"film-gamma",exception);
+ if (value != (const char *) NULL)
+ film_gamma=StringToDouble(value,(char **) NULL);
+ reference_black=ReferenceBlack;
+ value=GetImageProperty(image,"reference-black",exception);
+ if (value != (const char *) NULL)
+ reference_black=StringToDouble(value,(char **) NULL);
+ reference_white=ReferenceWhite;
+ value=GetImageProperty(image,"reference-white",exception);
+ if (value != (const char *) NULL)
+ reference_white=StringToDouble(value,(char **) NULL);
+ logmap=(Quantum *) AcquireQuantumMemory((size_t) MaxMap+1UL,
+ sizeof(*logmap));
+ if (logmap == (Quantum *) NULL)
+ ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
+ image->filename);
+ black=pow(10.0,(reference_black-reference_white)*(gamma/density)*0.002/
+ film_gamma);
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp parallel for schedule(static,4) \
+ magick_threads(image,image,1,1)
+#endif
+ for (i=0; i <= (ssize_t) MaxMap; i++)
+ logmap[i]=ScaleMapToQuantum((double) (MaxMap*(reference_white+
+ log10(black+(1.0*i/MaxMap)*(1.0-black))/((gamma/density)*0.002/
+ film_gamma))/1024.0));
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
status=MagickFalse;
continue;
}
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=(ssize_t) image->columns; x != 0; x--)
{
double
blue,
- brightness,
green,
- hue,
- red,
- saturation;
-
- red=InversesRGBCompandor((double) GetPixelRed(image,q));
- green=InversesRGBCompandor((double) GetPixelGreen(image,q));
- blue=InversesRGBCompandor((double) GetPixelBlue(image,q));
- ConvertRGBToHSB(red,green,blue,&hue,&saturation,&brightness);
- SetPixelRed(image,ClampToQuantum(QuantumRange*hue),q);
- SetPixelGreen(image,ClampToQuantum(QuantumRange*saturation),q);
- SetPixelBlue(image,ClampToQuantum(QuantumRange*brightness),q);
+ red;
+
+ red=(double) DecodePixelGamma((MagickRealType)
+ GetPixelRed(image,q));
+ green=(double) DecodePixelGamma((MagickRealType)
+ GetPixelGreen(image,q));
+ blue=(double) DecodePixelGamma((MagickRealType)
+ GetPixelBlue(image,q));
+ SetPixelRed(image,logmap[ScaleQuantumToMap(ClampToQuantum(red))],q);
+ SetPixelGreen(image,logmap[ScaleQuantumToMap(ClampToQuantum(green))],
+ q);
+ SetPixelBlue(image,logmap[ScaleQuantumToMap(ClampToQuantum(blue))],q);
q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
status=MagickFalse;
}
image_view=DestroyCacheView(image_view);
+ logmap=(Quantum *) RelinquishMagickMemory(logmap);
if (SetImageColorspace(image,colorspace,exception) == MagickFalse)
return(MagickFalse);
return(status);
}
- case HSLColorspace:
+ case RGBColorspace:
+ case scRGBColorspace:
{
/*
- Transform image from sRGB to HSL.
+ Transform image from sRGB to linear RGB.
*/
if (image->storage_class == PseudoClass)
{
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
double
blue,
green,
- hue,
- lightness,
- red,
- saturation;
-
- red=InversesRGBCompandor((double) GetPixelRed(image,q));
- green=InversesRGBCompandor((double) GetPixelGreen(image,q));
- blue=InversesRGBCompandor((double) GetPixelBlue(image,q));
- ConvertRGBToHSL(red,green,blue,&hue,&saturation,&lightness);
- SetPixelRed(image,ClampToQuantum(QuantumRange*hue),q);
- SetPixelGreen(image,ClampToQuantum(QuantumRange*saturation),q);
- SetPixelBlue(image,ClampToQuantum(QuantumRange*lightness),q);
+ red;
+
+ red=DecodePixelGamma((MagickRealType) GetPixelRed(image,q));
+ green=DecodePixelGamma((MagickRealType) GetPixelGreen(image,q));
+ blue=DecodePixelGamma((MagickRealType) GetPixelBlue(image,q));
+ SetPixelRed(image,ClampToQuantum(red),q);
+ SetPixelGreen(image,ClampToQuantum(green),q);
+ SetPixelBlue(image,ClampToQuantum(blue),q);
q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
return(MagickFalse);
return(status);
}
- case HWBColorspace:
+ default:
+ break;
+ }
+ /*
+ Allocate the tables.
+ */
+ x_map=(TransformPacket *) AcquireQuantumMemory((size_t) MaxMap+1UL,
+ sizeof(*x_map));
+ y_map=(TransformPacket *) AcquireQuantumMemory((size_t) MaxMap+1UL,
+ sizeof(*y_map));
+ z_map=(TransformPacket *) AcquireQuantumMemory((size_t) MaxMap+1UL,
+ sizeof(*z_map));
+ if ((x_map == (TransformPacket *) NULL) ||
+ (y_map == (TransformPacket *) NULL) ||
+ (z_map == (TransformPacket *) NULL))
+ ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
+ image->filename);
+ (void) ResetMagickMemory(&primary_info,0,sizeof(primary_info));
+ switch (colorspace)
+ {
+ case OHTAColorspace:
{
/*
- Transform image from sRGB to HWB.
- */
- if (image->storage_class == PseudoClass)
- {
- if (SyncImage(image,exception) == MagickFalse)
- return(MagickFalse);
- if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
- return(MagickFalse);
- }
- image_view=AcquireAuthenticCacheView(image,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
-#endif
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- MagickBooleanType
- sync;
+ Initialize OHTA tables:
- register ssize_t
- x;
-
- register Quantum
- *restrict q;
+ I1 = 0.33333*R+0.33334*G+0.33333*B
+ I2 = 0.50000*R+0.00000*G-0.50000*B
+ I3 =-0.25000*R+0.50000*G-0.25000*B
- if (status == MagickFalse)
- continue;
- q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
- exception);
- if (q == (Quantum *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- double
- blackness,
- blue,
- green,
- hue,
- red,
- whiteness;
-
- red=InversesRGBCompandor((double) GetPixelRed(image,q));
- green=InversesRGBCompandor((double) GetPixelGreen(image,q));
- blue=InversesRGBCompandor((double) GetPixelBlue(image,q));
- ConvertRGBToHWB(red,green,blue,&hue,&whiteness,&blackness);
- SetPixelRed(image,ClampToQuantum(QuantumRange*hue),q);
- SetPixelGreen(image,ClampToQuantum(QuantumRange*whiteness),q);
- SetPixelBlue(image,ClampToQuantum(QuantumRange*blackness),q);
- q+=GetPixelChannels(image);
- }
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
- status=MagickFalse;
+ I and Q, normally -0.5 through 0.5, are normalized to the range 0
+ through QuantumRange.
+ */
+ primary_info.y=(double) (MaxMap+1.0)/2.0;
+ primary_info.z=(double) (MaxMap+1.0)/2.0;
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp parallel for schedule(static,4) \
+ magick_threads(image,image,1,1)
+#endif
+ for (i=0; i <= (ssize_t) MaxMap; i++)
+ {
+ x_map[i].x=(MagickRealType) (0.33333*(double) i);
+ y_map[i].x=(MagickRealType) (0.33334*(double) i);
+ z_map[i].x=(MagickRealType) (0.33333*(double) i);
+ x_map[i].y=(MagickRealType) (0.50000*(double) i);
+ y_map[i].y=(MagickRealType) (0.00000*(double) i);
+ z_map[i].y=(MagickRealType) (-0.50000*(double) i);
+ x_map[i].z=(MagickRealType) (-0.25000*(double) i);
+ y_map[i].z=(MagickRealType) (0.50000*(double) i);
+ z_map[i].z=(MagickRealType) (-0.25000*(double) i);
}
- image_view=DestroyCacheView(image_view);
- if (SetImageColorspace(image,colorspace,exception) == MagickFalse)
- return(MagickFalse);
- return(status);
+ break;
}
- case LabColorspace:
+ case Rec601YCbCrColorspace:
{
/*
- Transform image from sRGB to Lab.
+ Initialize YCbCr tables (ITU-R BT.601):
+
+ Y = 0.2988390*R+0.5868110*G+0.1143500*B
+ Cb= -0.1687367*R-0.3312640*G+0.5000000*B
+ Cr= 0.5000000*R-0.4186880*G-0.0813120*B
+
+ Cb and Cr, normally -0.5 through 0.5, are normalized to the range 0
+ through QuantumRange.
*/
- if (image->storage_class == PseudoClass)
- {
- if (SyncImage(image,exception) == MagickFalse)
- return(MagickFalse);
- if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
- return(MagickFalse);
- }
- image_view=AcquireAuthenticCacheView(image,exception);
+ primary_info.y=(double) (MaxMap+1.0)/2.0;
+ primary_info.z=(double) (MaxMap+1.0)/2.0;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ #pragma omp parallel for schedule(static,4) \
+ magick_threads(image,image,1,1)
#endif
- for (y=0; y < (ssize_t) image->rows; y++)
+ for (i=0; i <= (ssize_t) MaxMap; i++)
{
- MagickBooleanType
- sync;
-
- register ssize_t
- x;
-
- register Quantum
- *restrict q;
-
- if (status == MagickFalse)
- continue;
- q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
- exception);
- if (q == (Quantum *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- double
- a,
- b,
- blue,
- green,
- L,
- red,
- X,
- Y,
- Z;
-
- red=InversesRGBCompandor((double) GetPixelRed(image,q));
- green=InversesRGBCompandor((double) GetPixelGreen(image,q));
- blue=InversesRGBCompandor((double) GetPixelBlue(image,q));
- ConvertRGBToXYZ(red,green,blue,&X,&Y,&Z);
- ConvertXYZToLab(X,Y,Z,&L,&a,&b);
- SetPixelRed(image,ClampToQuantum(QuantumRange*L),q);
- SetPixelGreen(image,ClampToQuantum(QuantumRange*a),q);
- SetPixelBlue(image,ClampToQuantum(QuantumRange*b),q);
- q+=GetPixelChannels(image);
- }
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
- status=MagickFalse;
+ x_map[i].x=(MagickRealType) (0.298839*(double) i);
+ y_map[i].x=(MagickRealType) (0.586811*(double) i);
+ z_map[i].x=(MagickRealType) (0.114350*(double) i);
+ x_map[i].y=(MagickRealType) (-0.1687367*(double) i);
+ y_map[i].y=(MagickRealType) (-0.331264*(double) i);
+ z_map[i].y=(MagickRealType) (0.500000*(double) i);
+ x_map[i].z=(MagickRealType) (0.500000*(double) i);
+ y_map[i].z=(MagickRealType) (-0.418688*(double) i);
+ z_map[i].z=(MagickRealType) (-0.081312*(double) i);
}
- image_view=DestroyCacheView(image_view);
- if (SetImageColorspace(image,colorspace,exception) == MagickFalse)
- return(MagickFalse);
- return(status);
+ break;
}
- case LogColorspace:
+ case Rec709YCbCrColorspace:
{
-#define DisplayGamma (1.0/1.7)
-#define FilmGamma 0.6
-#define ReferenceBlack 95.0
-#define ReferenceWhite 685.0
+ /*
+ Initialize YCbCr tables (ITU-R BT.709):
- const char
- *value;
+ Y = 0.212656*R+0.715158*G+0.072186*B
+ Cb= -0.114572*R-0.385428*G+0.500000*B
+ Cr= 0.500000*R-0.454153*G-0.045847*B
- double
- black,
- density,
- film_gamma,
- gamma,
- reference_black,
- reference_white;
+ Cb and Cr, normally -0.5 through 0.5, are normalized to the range 0
+ through QuantumRange.
+ */
+ primary_info.y=(double) (MaxMap+1.0)/2.0;
+ primary_info.z=(double) (MaxMap+1.0)/2.0;
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp parallel for schedule(static,4) \
+ magick_threads(image,image,1,1)
+#endif
+ for (i=0; i <= (ssize_t) MaxMap; i++)
+ {
+ x_map[i].x=(MagickRealType) (0.212656*(double) i);
+ y_map[i].x=(MagickRealType) (0.715158*(double) i);
+ z_map[i].x=(MagickRealType) (0.072186*(double) i);
+ x_map[i].y=(MagickRealType) (-0.114572*(double) i);
+ y_map[i].y=(MagickRealType) (-0.385428*(double) i);
+ z_map[i].y=(MagickRealType) (0.500000*(double) i);
+ x_map[i].z=(MagickRealType) (0.500000*(double) i);
+ y_map[i].z=(MagickRealType) (-0.454153*(double) i);
+ z_map[i].z=(MagickRealType) (-0.045847*(double) i);
+ }
+ break;
+ }
+ case YCCColorspace:
+ {
+ /*
+ Initialize YCC tables:
- Quantum
- *logmap;
+ Y = 0.298839*R+0.586811*G+0.114350*B
+ C1= -0.298839*R-0.586811*G+0.88600*B
+ C2= 0.70100*R-0.586811*G-0.114350*B
+ YCC is scaled by 1.3584. C1 zero is 156 and C2 is at 137.
+ */
+ primary_info.y=(double) ScaleQuantumToMap(ScaleCharToQuantum(156));
+ primary_info.z=(double) ScaleQuantumToMap(ScaleCharToQuantum(137));
+ for (i=0; i <= (ssize_t) (0.018*MaxMap); i++)
+ {
+ x_map[i].x=0.003962014134275617*i;
+ y_map[i].x=0.007778268551236748*i;
+ z_map[i].x=0.001510600706713781*i;
+ x_map[i].y=(-0.002426619775463276)*i;
+ y_map[i].y=(-0.004763965913702149)*i;
+ z_map[i].y=0.007190585689165425*i;
+ x_map[i].z=0.006927257754597858*i;
+ y_map[i].z=(-0.005800713697502058)*i;
+ z_map[i].z=(-0.0011265440570958)*i;
+ }
+ for ( ; i <= (ssize_t) MaxMap; i++)
+ {
+ x_map[i].x=0.2201118963486454*(1.099*i-0.099);
+ y_map[i].x=0.4321260306242638*(1.099*i-0.099);
+ z_map[i].x=0.08392226148409894*(1.099*i-0.099);
+ x_map[i].y=(-0.1348122097479598)*(1.099*i-0.099);
+ y_map[i].y=(-0.2646647729834528)*(1.099*i-0.099);
+ z_map[i].y=0.3994769827314126*(1.099*i-0.099);
+ x_map[i].z=0.3848476530332144*(1.099*i-0.099);
+ y_map[i].z=(-0.3222618720834477)*(1.099*i-0.099);
+ z_map[i].z=(-0.06258578094976668)*(1.099*i-0.099);
+ }
+ break;
+ }
+ default:
+ {
/*
- Transform RGB to Log colorspace.
+ Linear conversion tables.
*/
- density=DisplayGamma;
- gamma=DisplayGamma;
- value=GetImageProperty(image,"gamma",exception);
- if (value != (const char *) NULL)
- gamma=MagickEpsilonReciprocal(StringToDouble(value,(char **) NULL));
- film_gamma=FilmGamma;
- value=GetImageProperty(image,"film-gamma",exception);
- if (value != (const char *) NULL)
- film_gamma=StringToDouble(value,(char **) NULL);
- reference_black=ReferenceBlack;
- value=GetImageProperty(image,"reference-black",exception);
- if (value != (const char *) NULL)
- reference_black=StringToDouble(value,(char **) NULL);
- reference_white=ReferenceWhite;
- value=GetImageProperty(image,"reference-white",exception);
- if (value != (const char *) NULL)
- reference_white=StringToDouble(value,(char **) NULL);
- logmap=(Quantum *) AcquireQuantumMemory((size_t) MaxMap+1UL,
- sizeof(*logmap));
- if (logmap == (Quantum *) NULL)
- ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
- image->filename);
- black=pow(10.0,(reference_black-reference_white)*(gamma/density)*
- 0.002/film_gamma);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static) \
- dynamic_number_threads(image,image->columns,1,1)
+ #pragma omp parallel for schedule(static,4) \
+ magick_threads(image,image,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
- logmap[i]=ScaleMapToQuantum((double) (MaxMap*(reference_white+
- log10(black+((double) i/MaxMap)*(1.0-black))/((gamma/density)*
- 0.002/film_gamma))/1024.0));
+ {
+ x_map[i].x=(MagickRealType) (1.0*(double) i);
+ y_map[i].x=(MagickRealType) 0.0;
+ z_map[i].x=(MagickRealType) 0.0;
+ x_map[i].y=(MagickRealType) 0.0;
+ y_map[i].y=(MagickRealType) (1.0*(double) i);
+ z_map[i].y=(MagickRealType) 0.0;
+ x_map[i].z=(MagickRealType) 0.0;
+ y_map[i].z=(MagickRealType) 0.0;
+ z_map[i].z=(MagickRealType) (1.0*(double) i);
+ }
+ break;
+ }
+ }
+ /*
+ Convert from sRGB.
+ */
+ switch (image->storage_class)
+ {
+ case DirectClass:
+ default:
+ {
+ /*
+ Convert DirectClass image.
+ */
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
MagickBooleanType
sync;
- register ssize_t
- x;
+ PixelInfo
+ pixel;
register Quantum
*restrict q;
+ register ssize_t
+ x;
+
+ register unsigned int
+ blue,
+ green,
+ red;
+
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
status=MagickFalse;
continue;
}
- for (x=(ssize_t) image->columns; x != 0; x--)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
- double
- blue,
- green,
- red;
-
- red=InversesRGBCompandor((double) GetPixelRed(image,q));
- green=InversesRGBCompandor((double) GetPixelGreen(image,q));
- blue=InversesRGBCompandor((double) GetPixelBlue(image,q));
- SetPixelRed(image,logmap[ScaleQuantumToMap(
- ClampToQuantum(red))],q);
- SetPixelGreen(image,logmap[ScaleQuantumToMap(
- ClampToQuantum(green))],q);
- SetPixelBlue(image,logmap[ScaleQuantumToMap(
- ClampToQuantum(blue))],q);
+ red=ScaleQuantumToMap(ClampToQuantum((MagickRealType)
+ GetPixelRed(image,q)));
+ green=ScaleQuantumToMap(ClampToQuantum((MagickRealType)
+ GetPixelGreen(image,q)));
+ blue=ScaleQuantumToMap(ClampToQuantum((MagickRealType)
+ GetPixelBlue(image,q)));
+ pixel.red=(x_map[red].x+y_map[green].x+z_map[blue].x)+
+ primary_info.x;
+ pixel.green=(x_map[red].y+y_map[green].y+z_map[blue].y)+
+ primary_info.y;
+ pixel.blue=(x_map[red].z+y_map[green].z+z_map[blue].z)+
+ primary_info.z;
+ SetPixelRed(image,ScaleMapToQuantum(pixel.red),q);
+ SetPixelGreen(image,ScaleMapToQuantum(pixel.green),q);
+ SetPixelBlue(image,ScaleMapToQuantum(pixel.blue),q);
q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
status=MagickFalse;
+ if (image->progress_monitor != (MagickProgressMonitor) NULL)
+ {
+ MagickBooleanType
+ proceed;
+
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp critical (MagickCore_sRGBTransformImage)
+#endif
+ proceed=SetImageProgress(image,sRGBTransformImageTag,progress++,
+ image->rows);
+ if (proceed == MagickFalse)
+ status=MagickFalse;
+ }
}
image_view=DestroyCacheView(image_view);
- logmap=(Quantum *) RelinquishMagickMemory(logmap);
- if (SetImageColorspace(image,colorspace,exception) == MagickFalse)
- return(MagickFalse);
- return(status);
+ break;
}
- case LuvColorspace:
+ case PseudoClass:
{
+ register unsigned int
+ blue,
+ green,
+ red;
+
/*
- Transform image from sRGB to Luv.
- */
- if (image->storage_class == PseudoClass)
- {
- if (SyncImage(image,exception) == MagickFalse)
- return(MagickFalse);
- if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
- return(MagickFalse);
- }
- image_view=AcquireAuthenticCacheView(image,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
-#endif
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- MagickBooleanType
- sync;
-
- register ssize_t
- x;
-
- register Quantum
- *restrict q;
-
- if (status == MagickFalse)
- continue;
- q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
- exception);
- if (q == (Quantum *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- double
- blue,
- green,
- L,
- red,
- u,
- v,
- X,
- Y,
- Z;
-
- red=InversesRGBCompandor((double) GetPixelRed(image,q));
- green=InversesRGBCompandor((double) GetPixelGreen(image,q));
- blue=InversesRGBCompandor((double) GetPixelBlue(image,q));
- ConvertRGBToXYZ(red,green,blue,&X,&Y,&Z);
- ConvertXYZToLuv(X,Y,Z,&L,&u,&v);
- SetPixelRed(image,ClampToQuantum(QuantumRange*L),q);
- SetPixelGreen(image,ClampToQuantum(QuantumRange*u),q);
- SetPixelBlue(image,ClampToQuantum(QuantumRange*v),q);
- q+=GetPixelChannels(image);
- }
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
- status=MagickFalse;
- }
- image_view=DestroyCacheView(image_view);
- if (SetImageColorspace(image,colorspace,exception) == MagickFalse)
- return(MagickFalse);
- return(status);
- }
- case Rec709LumaColorspace:
- {
- /*
- Transform image from sRGB to Rec709Luma.
- */
- if (image->storage_class == PseudoClass)
- {
- if (SyncImage(image,exception) == MagickFalse)
- return(MagickFalse);
- if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
- return(MagickFalse);
- }
- image_view=AcquireAuthenticCacheView(image,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
-#endif
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- MagickBooleanType
- sync;
-
- register ssize_t
- x;
-
- register Quantum
- *restrict q;
-
- if (status == MagickFalse)
- continue;
- q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
- exception);
- if (q == (Quantum *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- double
- blue,
- gray,
- green,
- red;
-
- red=InversesRGBCompandor((double) GetPixelRed(image,q));
- green=InversesRGBCompandor((double) GetPixelGreen(image,q));
- blue=InversesRGBCompandor((double) GetPixelBlue(image,q));
- gray=0.212600*red+0.715200*green+0.072200*blue;
- SetPixelGray(image,ClampToQuantum(gray),q);
- q+=GetPixelChannels(image);
- }
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
- status=MagickFalse;
- }
- image_view=DestroyCacheView(image_view);
- if (SetImageColorspace(image,colorspace,exception) == MagickFalse)
- return(MagickFalse);
- image->type=GrayscaleType;
- return(status);
- }
- case RGBColorspace:
- {
- /*
- Transform image from sRGB to linear RGB.
- */
- if (image->storage_class == PseudoClass)
- {
- if (SyncImage(image,exception) == MagickFalse)
- return(MagickFalse);
- if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
- return(MagickFalse);
- }
- image_view=AcquireAuthenticCacheView(image,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
-#endif
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- MagickBooleanType
- sync;
-
- register ssize_t
- x;
-
- register Quantum
- *restrict q;
-
- if (status == MagickFalse)
- continue;
- q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
- exception);
- if (q == (Quantum *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- double
- blue,
- green,
- red;
-
- red=InversesRGBCompandor((double) GetPixelRed(image,q));
- green=InversesRGBCompandor((double) GetPixelGreen(image,q));
- blue=InversesRGBCompandor((double) GetPixelBlue(image,q));
- SetPixelRed(image,ClampToQuantum(red),q);
- SetPixelGreen(image,ClampToQuantum(green),q);
- SetPixelBlue(image,ClampToQuantum(blue),q);
- q+=GetPixelChannels(image);
- }
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
- status=MagickFalse;
- }
- image_view=DestroyCacheView(image_view);
- if (SetImageColorspace(image,colorspace,exception) == MagickFalse)
- return(MagickFalse);
- return(status);
- }
- case XYZColorspace:
- {
- /*
- Transform image from sRGB to XYZ.
- */
- if (image->storage_class == PseudoClass)
- {
- if (SyncImage(image,exception) == MagickFalse)
- return(MagickFalse);
- if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
- return(MagickFalse);
- }
- image_view=AcquireAuthenticCacheView(image,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
-#endif
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- MagickBooleanType
- sync;
-
- register ssize_t
- x;
-
- register Quantum
- *restrict q;
-
- if (status == MagickFalse)
- continue;
- q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
- exception);
- if (q == (Quantum *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- double
- blue,
- green,
- red,
- X,
- Y,
- Z;
-
- red=InversesRGBCompandor((double) GetPixelRed(image,q));
- green=InversesRGBCompandor((double) GetPixelGreen(image,q));
- blue=InversesRGBCompandor((double) GetPixelBlue(image,q));
- ConvertRGBToXYZ(red,green,blue,&X,&Y,&Z);
- SetPixelRed(image,ClampToQuantum(QuantumRange*X),q);
- SetPixelGreen(image,ClampToQuantum(QuantumRange*Y),q);
- SetPixelBlue(image,ClampToQuantum(QuantumRange*Z),q);
- q+=GetPixelChannels(image);
- }
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
- status=MagickFalse;
- }
- image_view=DestroyCacheView(image_view);
- if (SetImageColorspace(image,colorspace,exception) == MagickFalse)
- return(MagickFalse);
- return(status);
- }
- default:
- break;
- }
- /*
- Allocate the tables.
- */
- x_map=(TransformPacket *) AcquireQuantumMemory((size_t) MaxMap+1UL,
- sizeof(*x_map));
- y_map=(TransformPacket *) AcquireQuantumMemory((size_t) MaxMap+1UL,
- sizeof(*y_map));
- z_map=(TransformPacket *) AcquireQuantumMemory((size_t) MaxMap+1UL,
- sizeof(*z_map));
- if ((x_map == (TransformPacket *) NULL) ||
- (y_map == (TransformPacket *) NULL) ||
- (z_map == (TransformPacket *) NULL))
- ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
- image->filename);
- (void) ResetMagickMemory(&primary_info,0,sizeof(primary_info));
- switch (colorspace)
- {
- case OHTAColorspace:
- {
- /*
- Initialize OHTA tables:
-
- I1 = 0.33333*R+0.33334*G+0.33333*B
- I2 = 0.50000*R+0.00000*G-0.50000*B
- I3 =-0.25000*R+0.50000*G-0.25000*B
-
- I and Q, normally -0.5 through 0.5, are normalized to the range 0
- through QuantumRange.
- */
- primary_info.y=(double) (MaxMap+1.0)/2.0;
- primary_info.z=(double) (MaxMap+1.0)/2.0;
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static) \
- dynamic_number_threads(image,image->columns,1,1)
-#endif
- for (i=0; i <= (ssize_t) MaxMap; i++)
- {
- x_map[i].x=0.33333*(double) i;
- y_map[i].x=0.33334*(double) i;
- z_map[i].x=0.33333*(double) i;
- x_map[i].y=0.50000*(double) i;
- y_map[i].y=0.00000*(double) i;
- z_map[i].y=(-0.50000)*(double) i;
- x_map[i].z=(-0.25000)*(double) i;
- y_map[i].z=0.50000*(double) i;
- z_map[i].z=(-0.25000)*(double) i;
- }
- break;
- }
- case Rec601YCbCrColorspace:
- case YCbCrColorspace:
- {
- /*
- Initialize YCbCr tables (ITU-R BT.601):
-
- Y = 0.298839*R+0.586811*G+0.114350*B
- Cb= -0.168736*R-0.331264*G+0.500000*B
- Cr= 0.500000*R-0.418688*G-0.081312*B
-
- Cb and Cr, normally -0.5 through 0.5, are normalized to the range 0
- through QuantumRange.
- */
- primary_info.y=(double) (MaxMap+1.0)/2.0;
- primary_info.z=(double) (MaxMap+1.0)/2.0;
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static) \
- dynamic_number_threads(image,image->columns,1,1)
-#endif
- for (i=0; i <= (ssize_t) MaxMap; i++)
- {
- x_map[i].x=0.298839*(double) i;
- y_map[i].x=0.586811*(double) i;
- z_map[i].x=0.114350*(double) i;
- x_map[i].y=(-0.168730)*(double) i;
- y_map[i].y=(-0.331264)*(double) i;
- z_map[i].y=0.500000*(double) i;
- x_map[i].z=0.500000*(double) i;
- y_map[i].z=(-0.418688)*(double) i;
- z_map[i].z=(-0.081312)*(double) i;
- }
- break;
- }
- case Rec709YCbCrColorspace:
- {
- /*
- Initialize YCbCr tables (ITU-R BT.709):
-
- Y = 0.212600*R+0.715200*G+0.072200*B
- Cb= -0.114572*R-0.385428*G+0.500000*B
- Cr= 0.500000*R-0.454153*G-0.045847*B
-
- Cb and Cr, normally -0.5 through 0.5, are normalized to the range 0
- through QuantumRange.
- */
- primary_info.y=(double) (MaxMap+1.0)/2.0;
- primary_info.z=(double) (MaxMap+1.0)/2.0;
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static) \
- dynamic_number_threads(image,image->columns,1,1)
-#endif
- for (i=0; i <= (ssize_t) MaxMap; i++)
- {
- x_map[i].x=0.212600*(double) i;
- y_map[i].x=0.715200*(double) i;
- z_map[i].x=0.072200*(double) i;
- x_map[i].y=(-0.114572)*(double) i;
- y_map[i].y=(-0.385428)*(double) i;
- z_map[i].y=0.500000*(double) i;
- x_map[i].z=0.500000*(double) i;
- y_map[i].z=(-0.454153)*(double) i;
- z_map[i].z=(-0.045847)*(double) i;
- }
- break;
- }
- case YCCColorspace:
- {
- /*
- Initialize YCC tables:
-
- Y = 0.298839*R+0.586811*G+0.114350*B
- C1= -0.298839*R-0.586811*G+0.88600*B
- C2= 0.70100*R-0.586811*G-0.114350*B
-
- YCC is scaled by 1.3584. C1 zero is 156 and C2 is at 137.
- */
- primary_info.y=(double) ScaleQuantumToMap(ScaleCharToQuantum(156));
- primary_info.z=(double) ScaleQuantumToMap(ScaleCharToQuantum(137));
- for (i=0; i <= (ssize_t) (0.018*MaxMap); i++)
- {
- x_map[i].x=0.003962014134275617*(double) i;
- y_map[i].x=0.007778268551236748*(double) i;
- z_map[i].x=0.001510600706713781*(double) i;
- x_map[i].y=(-0.002426619775463276)*(double) i;
- y_map[i].y=(-0.004763965913702149)*(double) i;
- z_map[i].y=0.007190585689165425*(double) i;
- x_map[i].z=0.006927257754597858*(double) i;
- y_map[i].z=(-0.005800713697502058)*(double) i;
- z_map[i].z=(-0.0011265440570958)*(double) i;
- }
- for ( ; i <= (ssize_t) MaxMap; i++)
- {
- x_map[i].x=0.2201118963486454*(1.099*(double) i-0.099);
- y_map[i].x=0.4321260306242638*(1.099*(double) i-0.099);
- z_map[i].x=0.08392226148409894*(1.099*(double) i-0.099);
- x_map[i].y=(-0.1348122097479598)*(1.099*(double) i-0.099);
- y_map[i].y=(-0.2646647729834528)*(1.099*(double) i-0.099);
- z_map[i].y=0.3994769827314126*(1.099*(double) i-0.099);
- x_map[i].z=0.3848476530332144*(1.099*(double) i-0.099);
- y_map[i].z=(-0.3222618720834477)*(1.099*(double) i-0.099);
- z_map[i].z=(-0.06258578094976668)*(1.099*(double) i-0.099);
- }
- break;
- }
- case YIQColorspace:
- {
- /*
- Initialize YIQ tables:
-
- Y = 0.298839*R+0.586811*G+0.114350*B
- I = 0.59600*R-0.27400*G-0.32200*B
- Q = 0.21100*R-0.52300*G+0.31200*B
-
- I and Q, normally -0.5 through 0.5, are normalized to the range 0
- through QuantumRange.
- */
- primary_info.y=(double) (MaxMap+1.0)/2.0;
- primary_info.z=(double) (MaxMap+1.0)/2.0;
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static) \
- dynamic_number_threads(image,image->columns,1,1)
-#endif
- for (i=0; i <= (ssize_t) MaxMap; i++)
- {
- x_map[i].x=0.298839*(double) i;
- y_map[i].x=0.586811*(double) i;
- z_map[i].x=0.114350*(double) i;
- x_map[i].y=0.59600*(double) i;
- y_map[i].y=(-0.27400)*(double) i;
- z_map[i].y=(-0.32200)*(double) i;
- x_map[i].z=0.21100*(double) i;
- y_map[i].z=(-0.52300)*(double) i;
- z_map[i].z=0.31200*(double) i;
- }
- break;
- }
- case YPbPrColorspace:
- {
- /*
- Initialize YPbPr tables (ITU-R BT.601):
-
- Y = 0.298839*R+0.586811*G+0.114350*B
- Pb= -0.168736*R-0.331264*G+0.500000*B
- Pr= 0.500000*R-0.418688*G-0.081312*B
-
- Pb and Pr, normally -0.5 through 0.5, are normalized to the range 0
- through QuantumRange.
- */
- primary_info.y=(double) (MaxMap+1.0)/2.0;
- primary_info.z=(double) (MaxMap+1.0)/2.0;
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static) \
- dynamic_number_threads(image,image->columns,1,1)
-#endif
- for (i=0; i <= (ssize_t) MaxMap; i++)
- {
- x_map[i].x=0.298839*(double) i;
- y_map[i].x=0.586811*(double) i;
- z_map[i].x=0.114350*(double) i;
- x_map[i].y=(-0.168736)*(double) i;
- y_map[i].y=(-0.331264)*(double) i;
- z_map[i].y=0.500000*(double) i;
- x_map[i].z=0.500000*(double) i;
- y_map[i].z=(-0.418688)*(double) i;
- z_map[i].z=(-0.081312)*(double) i;
- }
- break;
- }
- case YUVColorspace:
- {
- /*
- Initialize YUV tables:
-
- Y = 0.298839*R+0.586811*G+0.114350*B
- U = -0.168736*R-0.331264*G+0.500000*B
- V = 0.500000*R-0.418688*G-0.081312*B
-
- U and V, normally -0.5 through 0.5, are normalized to the range 0
- through QuantumRange. Note that U = 0.493*(B-Y), V = 0.877*(R-Y).
- */
- primary_info.y=(double) (MaxMap+1.0)/2.0;
- primary_info.z=(double) (MaxMap+1.0)/2.0;
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static) \
- dynamic_number_threads(image,image->columns,1,1)
-#endif
- for (i=0; i <= (ssize_t) MaxMap; i++)
- {
- x_map[i].x=0.298839*(double) i;
- y_map[i].x=0.586811*(double) i;
- z_map[i].x=0.114350*(double) i;
- x_map[i].y=(-0.168736)*(double) i;
- y_map[i].y=(-0.331264)*(double) i;
- z_map[i].y=0.500000*(double) i;
- x_map[i].z=0.500000*(double) i;
- y_map[i].z=(-0.418688)*(double) i;
- z_map[i].z=(-0.081312)*(double) i;
- }
- break;
- }
- default:
- {
- /*
- Linear conversion tables.
- */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static) \
- dynamic_number_threads(image,image->columns,1,1)
-#endif
- for (i=0; i <= (ssize_t) MaxMap; i++)
- {
- x_map[i].x=(double) i;
- y_map[i].x=0.0f;
- z_map[i].x=0.0f;
- x_map[i].y=0.0f;
- y_map[i].y=(double) i;
- z_map[i].y=0.0f;
- x_map[i].z=0.0f;
- y_map[i].z=0.0f;
- z_map[i].z=(double) i;
- }
- break;
- }
- }
- /*
- Convert from sRGB.
- */
- switch (image->storage_class)
- {
- case DirectClass:
- default:
- {
- /*
- Convert DirectClass image.
- */
- image_view=AcquireAuthenticCacheView(image,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
-#endif
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- MagickBooleanType
- sync;
-
- PixelInfo
- pixel;
-
- register Quantum
- *restrict q;
-
- register ssize_t
- x;
-
- register unsigned int
- blue,
- green,
- red;
-
- if (status == MagickFalse)
- continue;
- q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
- exception);
- if (q == (Quantum *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- red=ScaleQuantumToMap(ClampToQuantum(InversesRGBCompandor((double)
- GetPixelRed(image,q))));
- green=ScaleQuantumToMap(ClampToQuantum(InversesRGBCompandor((double)
- GetPixelGreen(image,q))));
- blue=ScaleQuantumToMap(ClampToQuantum(InversesRGBCompandor((double)
- GetPixelBlue(image,q))));
- pixel.red=(x_map[red].x+y_map[green].x+z_map[blue].x)+
- primary_info.x;
- pixel.green=(x_map[red].y+y_map[green].y+z_map[blue].y)+
- primary_info.y;
- pixel.blue=(x_map[red].z+y_map[green].z+z_map[blue].z)+
- primary_info.z;
- SetPixelRed(image,ScaleMapToQuantum(pixel.red),q);
- SetPixelGreen(image,ScaleMapToQuantum(pixel.green),q);
- SetPixelBlue(image,ScaleMapToQuantum(pixel.blue),q);
- q+=GetPixelChannels(image);
- }
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
- status=MagickFalse;
- if (image->progress_monitor != (MagickProgressMonitor) NULL)
- {
- MagickBooleanType
- proceed;
-
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp critical (MagickCore_sRGBTransformImage)
-#endif
- proceed=SetImageProgress(image,sRGBTransformImageTag,progress++,
- image->rows);
- if (proceed == MagickFalse)
- status=MagickFalse;
- }
- }
- image_view=DestroyCacheView(image_view);
- break;
- }
- case PseudoClass:
- {
- register unsigned int
- blue,
- green,
- red;
-
- /*
- Convert PseudoClass image.
+ Convert PseudoClass image.
*/
for (i=0; i < (ssize_t) image->colors; i++)
{
PixelInfo
pixel;
- red=ScaleQuantumToMap(ClampToQuantum(InversesRGBCompandor(
- image->colormap[i].red)));
- green=ScaleQuantumToMap(ClampToQuantum(InversesRGBCompandor(
- image->colormap[i].green)));
- blue=ScaleQuantumToMap(ClampToQuantum(InversesRGBCompandor(
- image->colormap[i].blue)));
+ red=ScaleQuantumToMap(ClampToQuantum(image->colormap[i].red));
+ green=ScaleQuantumToMap(ClampToQuantum(image->colormap[i].green));
+ blue=ScaleQuantumToMap(ClampToQuantum(image->colormap[i].blue));
pixel.red=x_map[red].x+y_map[green].x+z_map[blue].x+primary_info.x;
pixel.green=x_map[red].y+y_map[green].y+z_map[blue].y+primary_info.y;
pixel.blue=x_map[red].z+y_map[green].z+z_map[blue].z+primary_info.z;
MagickExport MagickBooleanType SetImageColorspace(Image *image,
const ColorspaceType colorspace,ExceptionInfo *exception)
{
+ ImageType
+ type;
+
+ MagickBooleanType
+ status;
+
if (image->colorspace == colorspace)
return(MagickTrue);
image->colorspace=colorspace;
image->rendering_intent=UndefinedIntent;
- image->gamma=1.000;
+ image->gamma=1.000/2.200;
(void) ResetMagickMemory(&image->chromaticity,0,sizeof(image->chromaticity));
- if (IssRGBColorspace(colorspace) != MagickFalse)
+ type=image->type;
+ if (IsGrayColorspace(colorspace) != MagickFalse)
{
- image->rendering_intent=PerceptualIntent;
- image->gamma=1.000/2.200;
- image->chromaticity.red_primary.x=0.6400;
- image->chromaticity.red_primary.y=0.3300;
- image->chromaticity.red_primary.z=0.0300;
- image->chromaticity.green_primary.x=0.3000;
- image->chromaticity.green_primary.y=0.6000;
- image->chromaticity.green_primary.z=0.1000;
- image->chromaticity.blue_primary.x=0.1500;
- image->chromaticity.blue_primary.y=0.0600;
- image->chromaticity.blue_primary.z=0.7900;
- image->chromaticity.white_point.x=0.3127;
- image->chromaticity.white_point.y=0.3290;
- image->chromaticity.white_point.z=0.3583f;
+ if ((image->intensity == Rec601LuminancePixelIntensityMethod) ||
+ (image->intensity == Rec709LuminancePixelIntensityMethod))
+ image->gamma=1.000;
+ type=GrayscaleType;
}
- if (IsGrayColorspace(colorspace) != MagickFalse)
- image->type=GrayscaleType;
- return(SyncImagePixelCache(image,exception));
+ else
+ if ((IsRGBColorspace(colorspace) != MagickFalse) ||
+ (colorspace == XYZColorspace))
+ image->gamma=1.000;
+ else
+ {
+ image->rendering_intent=PerceptualIntent;
+ image->chromaticity.red_primary.x=0.6400;
+ image->chromaticity.red_primary.y=0.3300;
+ image->chromaticity.red_primary.z=0.0300;
+ image->chromaticity.green_primary.x=0.3000;
+ image->chromaticity.green_primary.y=0.6000;
+ image->chromaticity.green_primary.z=0.1000;
+ image->chromaticity.blue_primary.x=0.1500;
+ image->chromaticity.blue_primary.y=0.0600;
+ image->chromaticity.blue_primary.z=0.7900;
+ image->chromaticity.white_point.x=0.3127;
+ image->chromaticity.white_point.y=0.3290;
+ image->chromaticity.white_point.z=0.3583;
+ }
+ status=SyncImagePixelCache(image,exception);
+ image->type=type;
+ return(status);
}
\f
/*
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+ if (image->colorspace == colorspace)
+ return(MagickTrue);
+ if ((image->colorspace == GRAYColorspace) && (image->gamma != 1.0) &&
+ (colorspace == sRGBColorspace))
+ return(MagickTrue);
if (colorspace == UndefinedColorspace)
return(SetImageColorspace(image,colorspace,exception));
- if (image->colorspace == colorspace)
- return(MagickTrue); /* same colorspace: no op */
/*
Convert the reference image from an alternate colorspace to sRGB.
*/
- (void) DeleteImageProfile(thumbnail_image,"icc");
- (void) DeleteImageProfile(thumbnail_image,"icm");
+ (void) DeleteImageProfile(image,"icc");
+ (void) DeleteImageProfile(image,"icm");
if (IssRGBColorspace(colorspace) != MagickFalse)
- return(TransformsRGBImage(image,colorspace,exception));
+ return(TransformsRGBImage(image,exception));
status=MagickTrue;
if (IssRGBColorspace(image->colorspace) == MagickFalse)
- status=TransformsRGBImage(image,image->colorspace,exception);
+ status=TransformsRGBImage(image,exception);
if (status == MagickFalse)
return(status);
/*
% The format of the TransformsRGBImage method is:
%
% MagickBooleanType TransformsRGBImage(Image *image,
-% const ColorspaceType colorspace,ExceptionInfo *exception)
+% ExceptionInfo *exception)
%
% A description of each parameter follows:
%
% o image: the image.
%
-% o colorspace: the colorspace to transform the image to.
-%
% o exception: return any errors or warnings in this structure.
%
*/
-static inline void ConvertLabToXYZ(const double L,const double a,const double b,
+static inline void ConvertCMYToRGB(const double cyan,const double magenta,
+ const double yellow,double *red,double *green,double *blue)
+{
+ *red=QuantumRange*(1.0-cyan);
+ *green=QuantumRange*(1.0-magenta);
+ *blue=QuantumRange*(1.0-yellow);
+}
+
+static inline void ConvertLMSToXYZ(const double L,const double M,const double S,
double *X,double *Y,double *Z)
+{
+ *X=1.096123820835514*L-0.278869000218287*M+0.182745179382773*S;
+ *Y=0.454369041975359*L+0.473533154307412*M+0.072097803717229*S;
+ *Z=(-0.009627608738429)*L-0.005698031216113*M+1.015325639954543*S;
+}
+
+static inline void ConvertLMSToRGB(const double L,const double M,
+ const double S,double *red,double *green,double *blue)
{
double
- x,
- y,
- z;
+ X,
+ Y,
+ Z;
- assert(X != (double *) NULL);
- assert(Y != (double *) NULL);
- assert(Z != (double *) NULL);
- y=(100.0*L+16.0)/116.0;
- x=y+255.0*(a-0.5)/500.0;
- z=y-255.0*(b-0.5)/200.0;
- if ((x*x*x) > CIEEpsilon)
- x=(x*x*x);
- else
- x=(116.0*x-16.0)/CIEK;
- if ((y*y*y) > CIEEpsilon)
- y=(y*y*y);
- else
- y=(100.0*L)/CIEK;
- if ((z*z*z) > CIEEpsilon)
- z=(z*z*z);
- else
- z=(116*z-16.0)/CIEK;
- *X=D65X*x;
- *Y=D65Y*y;
- *Z=D65Z*z;
+ ConvertLMSToXYZ(L,M,S,&X,&Y,&Z);
+ ConvertXYZToRGB(X,Y,Z,red,green,blue);
}
-static inline void ConvertLuvToXYZ(const double L,const double u,const double v,
- double *X,double *Y,double *Z)
+static inline void ConvertLuvToRGB(const double L,const double u,
+ const double v,double *red,double *green,double *blue)
{
- assert(X != (double *) NULL);
- assert(Y != (double *) NULL);
- assert(Z != (double *) NULL);
- if ((100.0*L) > (CIEK*CIEEpsilon))
- *Y=(double) pow(((100.0*L)+16.0)/116.0,3.0);
- else
- *Y=(100.0*L)/CIEK;
- *X=((*Y*((39.0*(100.0*L)/((262.0*v-140.0)+13.0*(100.0*L)*(9.0*D65Y/(D65X+
- 15.0*D65Y+3.0*D65Z))))-5.0))+5.0*(*Y))/((((52.0*(100.0*L)/((354.0*u-134.0)+
- 13.0*(100.0*L)*(4.0*D65X/(D65X+15.0*D65Y+3.0*D65Z))))-1.0)/3.0)-(-1.0/3.0));
- *Z=(*X*(((52.0*(100.0*L)/((354.0*u-134.0)+13.0*(100.0*L)*(4.0*D65X/(D65X+
- 15.0*D65Y+3.0*D65Z))))-1.0)/3.0))-5.0*(*Y);
+ double
+ X,
+ Y,
+ Z;
+
+ ConvertLuvToXYZ(100.0*L,354.0*u-134.0,262.0*v-140.0,&X,&Y,&Z);
+ ConvertXYZToRGB(X,Y,Z,red,green,blue);
}
static inline ssize_t RoundToYCC(const double value)
return((ssize_t) (value+0.5));
}
-static inline void ConvertXYZToRGB(const double x,const double y,
- const double z,double *red,double *green,double *blue)
-{
- double
- b,
- g,
- r;
-
- /*
- Convert XYZ to sRGB colorspace.
- */
- assert(red != (double *) NULL);
- assert(green != (double *) NULL);
- assert(blue != (double *) NULL);
- r=3.2404542*x-1.5371385*y-0.4985314*z;
- g=(-0.9692660*x+1.8760108*y+0.0415560*z);
- b=0.0556434*x-0.2040259*y+1.0572252*z;
- *red=QuantumRange*r;
- *green=QuantumRange*g;
- *blue=QuantumRange*b;
-}
-
static inline void ConvertCMYKToRGB(PixelInfo *pixel)
{
pixel->red=((QuantumRange-(QuantumScale*pixel->red*
(QuantumRange-pixel->black)+pixel->black)));
}
+static inline void ConvertLabToRGB(const double L,const double a,
+ const double b,double *red,double *green,double *blue)
+{
+ double
+ X,
+ Y,
+ Z;
+
+ ConvertLabToXYZ(100.0*L,255.0*(a-0.5),255.0*(b-0.5),&X,&Y,&Z);
+ ConvertXYZToRGB(X,Y,Z,red,green,blue);
+}
+
+static void ConvertYPbPrToRGB(const double Y,const double Pb,const double Pr,
+ double *red,double *green,double *blue)
+{
+ *red=QuantumRange*(0.99999999999914679361*Y-1.2188941887145875e-06*(Pb-0.5)+
+ 1.4019995886561440468*(Pr-0.5));
+ *green=QuantumRange*(0.99999975910502514331*Y-0.34413567816504303521*(Pb-0.5)-
+ 0.71413649331646789076*(Pr-0.5));
+ *blue=QuantumRange*(1.00000124040004623180*Y+1.77200006607230409200*(Pb-0.5)+
+ 2.1453384174593273e-06*(Pr-0.5));
+}
+
+static void ConvertYCbCrToRGB(const double Y,const double Cb,
+ const double Cr,double *red,double *green,double *blue)
+{
+ ConvertYPbPrToRGB(Y,Cb,Cr,red,green,blue);
+}
+
+static void ConvertYIQToRGB(const double Y,const double I,const double Q,
+ double *red,double *green,double *blue)
+{
+ *red=QuantumRange*(Y+0.9562957197589482261*(I-0.5)+0.6210244164652610754*
+ (Q-0.5));
+ *green=QuantumRange*(Y-0.2721220993185104464*(I-0.5)-0.6473805968256950427*
+ (Q-0.5));
+ *blue=QuantumRange*(Y-1.1069890167364901945*(I-0.5)+1.7046149983646481374*
+ (Q-0.5));
+}
+
+static void ConvertYDbDrToRGB(const double Y,const double Db,const double Dr,
+ double *red,double *green,double *blue)
+{
+ *red=QuantumRange*(Y+9.2303716147657e-05*(Db-0.5)-
+ 0.52591263066186533*(Dr-0.5));
+ *green=QuantumRange*(Y-0.12913289889050927*(Db-0.5)+
+ 0.26789932820759876*(Dr-0.5));
+ *blue=QuantumRange*(Y+0.66467905997895482*(Db-0.5)-
+ 7.9202543533108e-05*(Dr-0.5));
+}
+
+static void ConvertYUVToRGB(const double Y,const double U,const double V,
+ double *red,double *green,double *blue)
+{
+ *red=QuantumRange*(Y-3.945707070708279e-05*(U-0.5)+1.1398279671717170825*
+ (V-0.5));
+ *green=QuantumRange*(Y-0.3946101641414141437*(U-0.5)-0.5805003156565656797*
+ (V-0.5));
+ *blue=QuantumRange*(Y+2.0319996843434342537*(U-0.5)-4.813762626262513e-04*
+ (V-0.5));
+}
+
static MagickBooleanType TransformsRGBImage(Image *image,
- const ColorspaceType colorspace,ExceptionInfo *exception)
+ ExceptionInfo *exception)
{
#define TransformsRGBImageTag "Transform/Image"
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
static const float
YCCMap[1389] =
{
0.812680f, 0.813401f, 0.814121f, 0.814842f, 0.815562f, 0.816282f,
0.817003f, 0.817723f, 0.818444f, 0.819164f, 0.819885f, 0.820605f,
0.821326f, 0.822046f, 0.822767f, 0.823487f, 0.824207f, 0.824928f,
- 0.825648f, 0.826369f, 0.827089f, 0.827810f, 0.828530f, 0.829251f,
- 0.829971f, 0.830692f, 0.831412f, 0.832133f, 0.832853f, 0.833573f,
- 0.834294f, 0.835014f, 0.835735f, 0.836455f, 0.837176f, 0.837896f,
- 0.838617f, 0.839337f, 0.840058f, 0.840778f, 0.841499f, 0.842219f,
- 0.842939f, 0.843660f, 0.844380f, 0.845101f, 0.845821f, 0.846542f,
- 0.847262f, 0.847983f, 0.848703f, 0.849424f, 0.850144f, 0.850865f,
- 0.851585f, 0.852305f, 0.853026f, 0.853746f, 0.854467f, 0.855187f,
- 0.855908f, 0.856628f, 0.857349f, 0.858069f, 0.858790f, 0.859510f,
- 0.860231f, 0.860951f, 0.861671f, 0.862392f, 0.863112f, 0.863833f,
- 0.864553f, 0.865274f, 0.865994f, 0.866715f, 0.867435f, 0.868156f,
- 0.868876f, 0.869597f, 0.870317f, 0.871037f, 0.871758f, 0.872478f,
- 0.873199f, 0.873919f, 0.874640f, 0.875360f, 0.876081f, 0.876801f,
- 0.877522f, 0.878242f, 0.878963f, 0.879683f, 0.880403f, 0.881124f,
- 0.881844f, 0.882565f, 0.883285f, 0.884006f, 0.884726f, 0.885447f,
- 0.886167f, 0.886888f, 0.887608f, 0.888329f, 0.889049f, 0.889769f,
- 0.890490f, 0.891210f, 0.891931f, 0.892651f, 0.893372f, 0.894092f,
- 0.894813f, 0.895533f, 0.896254f, 0.896974f, 0.897695f, 0.898415f,
- 0.899135f, 0.899856f, 0.900576f, 0.901297f, 0.902017f, 0.902738f,
- 0.903458f, 0.904179f, 0.904899f, 0.905620f, 0.906340f, 0.907061f,
- 0.907781f, 0.908501f, 0.909222f, 0.909942f, 0.910663f, 0.911383f,
- 0.912104f, 0.912824f, 0.913545f, 0.914265f, 0.914986f, 0.915706f,
- 0.916427f, 0.917147f, 0.917867f, 0.918588f, 0.919308f, 0.920029f,
- 0.920749f, 0.921470f, 0.922190f, 0.922911f, 0.923631f, 0.924352f,
- 0.925072f, 0.925793f, 0.926513f, 0.927233f, 0.927954f, 0.928674f,
- 0.929395f, 0.930115f, 0.930836f, 0.931556f, 0.932277f, 0.932997f,
- 0.933718f, 0.934438f, 0.935158f, 0.935879f, 0.936599f, 0.937320f,
- 0.938040f, 0.938761f, 0.939481f, 0.940202f, 0.940922f, 0.941643f,
- 0.942363f, 0.943084f, 0.943804f, 0.944524f, 0.945245f, 0.945965f,
- 0.946686f, 0.947406f, 0.948127f, 0.948847f, 0.949568f, 0.950288f,
- 0.951009f, 0.951729f, 0.952450f, 0.953170f, 0.953891f, 0.954611f,
- 0.955331f, 0.956052f, 0.956772f, 0.957493f, 0.958213f, 0.958934f,
- 0.959654f, 0.960375f, 0.961095f, 0.961816f, 0.962536f, 0.963256f,
- 0.963977f, 0.964697f, 0.965418f, 0.966138f, 0.966859f, 0.967579f,
- 0.968300f, 0.969020f, 0.969741f, 0.970461f, 0.971182f, 0.971902f,
- 0.972622f, 0.973343f, 0.974063f, 0.974784f, 0.975504f, 0.976225f,
- 0.976945f, 0.977666f, 0.978386f, 0.979107f, 0.979827f, 0.980548f,
- 0.981268f, 0.981988f, 0.982709f, 0.983429f, 0.984150f, 0.984870f,
- 0.985591f, 0.986311f, 0.987032f, 0.987752f, 0.988473f, 0.989193f,
- 0.989914f, 0.990634f, 0.991354f, 0.992075f, 0.992795f, 0.993516f,
- 0.994236f, 0.994957f, 0.995677f, 0.996398f, 0.997118f, 0.997839f,
- 0.998559f, 0.999280f, 1.000000f
- };
-#endif
-
- CacheView
- *image_view;
-
- MagickBooleanType
- status;
-
- MagickOffsetType
- progress;
-
- register ssize_t
- i;
-
- ssize_t
- y;
-
- TransformPacket
- *y_map,
- *x_map,
- *z_map;
-
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- status=MagickTrue;
- progress=0;
- switch (image->colorspace)
- {
- case CMYColorspace:
- {
- /*
- Transform image from CMY to sRGB.
- */
- if (image->storage_class == PseudoClass)
- {
- if (SyncImage(image,exception) == MagickFalse)
- return(MagickFalse);
- if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
- return(MagickFalse);
- }
- image_view=AcquireAuthenticCacheView(image,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
-#endif
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- MagickBooleanType
- sync;
-
- register ssize_t
- x;
-
- register Quantum
- *restrict q;
-
- if (status == MagickFalse)
- continue;
- q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
- exception);
- if (q == (Quantum *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- double
- cyan,
- magenta,
- yellow;
-
- cyan=sRGBCompandor((double) (QuantumRange-
- GetPixelCyan(image,q)));
- magenta=sRGBCompandor((double) (QuantumRange-
- GetPixelMagenta(image,q)));
- yellow=sRGBCompandor((double) (QuantumRange-
- GetPixelYellow(image,q)));
- SetPixelCyan(image,ClampToQuantum(cyan),q);
- SetPixelMagenta(image,ClampToQuantum(magenta),q);
- SetPixelYellow(image,ClampToQuantum(yellow),q);
- q+=GetPixelChannels(image);
- }
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
- status=MagickFalse;
- }
- image_view=DestroyCacheView(image_view);
- if (SetImageColorspace(image,sRGBColorspace,exception) == MagickFalse)
- return(MagickFalse);
- return(status);
- }
- case CMYKColorspace:
- {
- PixelInfo
- zero;
-
- /*
- Transform image from CMYK to sRGB.
- */
- if (image->storage_class == PseudoClass)
- {
- if (SyncImage(image,exception) == MagickFalse)
- return(MagickFalse);
- if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
- return(MagickFalse);
- }
- GetPixelInfo(image,&zero);
- image_view=AcquireAuthenticCacheView(image,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
-#endif
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- MagickBooleanType
- sync;
-
- PixelInfo
- pixel;
+ 0.825648f, 0.826369f, 0.827089f, 0.827810f, 0.828530f, 0.829251f,
+ 0.829971f, 0.830692f, 0.831412f, 0.832133f, 0.832853f, 0.833573f,
+ 0.834294f, 0.835014f, 0.835735f, 0.836455f, 0.837176f, 0.837896f,
+ 0.838617f, 0.839337f, 0.840058f, 0.840778f, 0.841499f, 0.842219f,
+ 0.842939f, 0.843660f, 0.844380f, 0.845101f, 0.845821f, 0.846542f,
+ 0.847262f, 0.847983f, 0.848703f, 0.849424f, 0.850144f, 0.850865f,
+ 0.851585f, 0.852305f, 0.853026f, 0.853746f, 0.854467f, 0.855187f,
+ 0.855908f, 0.856628f, 0.857349f, 0.858069f, 0.858790f, 0.859510f,
+ 0.860231f, 0.860951f, 0.861671f, 0.862392f, 0.863112f, 0.863833f,
+ 0.864553f, 0.865274f, 0.865994f, 0.866715f, 0.867435f, 0.868156f,
+ 0.868876f, 0.869597f, 0.870317f, 0.871037f, 0.871758f, 0.872478f,
+ 0.873199f, 0.873919f, 0.874640f, 0.875360f, 0.876081f, 0.876801f,
+ 0.877522f, 0.878242f, 0.878963f, 0.879683f, 0.880403f, 0.881124f,
+ 0.881844f, 0.882565f, 0.883285f, 0.884006f, 0.884726f, 0.885447f,
+ 0.886167f, 0.886888f, 0.887608f, 0.888329f, 0.889049f, 0.889769f,
+ 0.890490f, 0.891210f, 0.891931f, 0.892651f, 0.893372f, 0.894092f,
+ 0.894813f, 0.895533f, 0.896254f, 0.896974f, 0.897695f, 0.898415f,
+ 0.899135f, 0.899856f, 0.900576f, 0.901297f, 0.902017f, 0.902738f,
+ 0.903458f, 0.904179f, 0.904899f, 0.905620f, 0.906340f, 0.907061f,
+ 0.907781f, 0.908501f, 0.909222f, 0.909942f, 0.910663f, 0.911383f,
+ 0.912104f, 0.912824f, 0.913545f, 0.914265f, 0.914986f, 0.915706f,
+ 0.916427f, 0.917147f, 0.917867f, 0.918588f, 0.919308f, 0.920029f,
+ 0.920749f, 0.921470f, 0.922190f, 0.922911f, 0.923631f, 0.924352f,
+ 0.925072f, 0.925793f, 0.926513f, 0.927233f, 0.927954f, 0.928674f,
+ 0.929395f, 0.930115f, 0.930836f, 0.931556f, 0.932277f, 0.932997f,
+ 0.933718f, 0.934438f, 0.935158f, 0.935879f, 0.936599f, 0.937320f,
+ 0.938040f, 0.938761f, 0.939481f, 0.940202f, 0.940922f, 0.941643f,
+ 0.942363f, 0.943084f, 0.943804f, 0.944524f, 0.945245f, 0.945965f,
+ 0.946686f, 0.947406f, 0.948127f, 0.948847f, 0.949568f, 0.950288f,
+ 0.951009f, 0.951729f, 0.952450f, 0.953170f, 0.953891f, 0.954611f,
+ 0.955331f, 0.956052f, 0.956772f, 0.957493f, 0.958213f, 0.958934f,
+ 0.959654f, 0.960375f, 0.961095f, 0.961816f, 0.962536f, 0.963256f,
+ 0.963977f, 0.964697f, 0.965418f, 0.966138f, 0.966859f, 0.967579f,
+ 0.968300f, 0.969020f, 0.969741f, 0.970461f, 0.971182f, 0.971902f,
+ 0.972622f, 0.973343f, 0.974063f, 0.974784f, 0.975504f, 0.976225f,
+ 0.976945f, 0.977666f, 0.978386f, 0.979107f, 0.979827f, 0.980548f,
+ 0.981268f, 0.981988f, 0.982709f, 0.983429f, 0.984150f, 0.984870f,
+ 0.985591f, 0.986311f, 0.987032f, 0.987752f, 0.988473f, 0.989193f,
+ 0.989914f, 0.990634f, 0.991354f, 0.992075f, 0.992795f, 0.993516f,
+ 0.994236f, 0.994957f, 0.995677f, 0.996398f, 0.997118f, 0.997839f,
+ 0.998559f, 0.999280f, 1.000000f
+ };
- register ssize_t
- x;
+ CacheView
+ *image_view;
- register Quantum
- *restrict q;
+ MagickBooleanType
+ status;
- if (status == MagickFalse)
- continue;
- q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
- exception);
- if (q == (Quantum *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- pixel=zero;
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- GetPixelInfoPixel(image,q,&pixel);
- ConvertCMYKToRGB(&pixel);
- pixel.red=sRGBCompandor(pixel.red);
- pixel.green=sRGBCompandor(pixel.green);
- pixel.blue=sRGBCompandor(pixel.blue);
- SetPixelInfoPixel(image,&pixel,q);
- q+=GetPixelChannels(image);
- }
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
- status=MagickFalse;
- }
- image_view=DestroyCacheView(image_view);
- if (SetImageColorspace(image,sRGBColorspace,exception) == MagickFalse)
- return(MagickFalse);
- return(status);
- }
- case GRAYColorspace:
- case Rec601LumaColorspace:
- case Rec709LumaColorspace:
- {
- /*
- Transform linear GRAY to sRGB colorspace.
- */
- if (image->storage_class == PseudoClass)
- {
- if (SyncImage(image,exception) == MagickFalse)
- return(MagickFalse);
- if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
- return(MagickFalse);
- }
- if (SetImageColorspace(image,sRGBColorspace,exception) == MagickFalse)
- return(MagickFalse);
- image_view=AcquireAuthenticCacheView(image,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
-#endif
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- MagickBooleanType
- sync;
+ MagickOffsetType
+ progress;
- register ssize_t
- x;
+ register ssize_t
+ i;
- register Quantum
- *restrict q;
+ ssize_t
+ y;
- if (status == MagickFalse)
- continue;
- q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
- exception);
- if (q == (Quantum *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- for (x=(ssize_t) image->columns; x != 0; x--)
- {
- double
- gray;
+ TransformPacket
+ *y_map,
+ *x_map,
+ *z_map;
- gray=sRGBCompandor((double) GetPixelGray(image,q));
- SetPixelRed(image,ClampToQuantum(gray),q);
- SetPixelGreen(image,ClampToQuantum(gray),q);
- SetPixelBlue(image,ClampToQuantum(gray),q);
- q+=GetPixelChannels(image);
- }
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
- status=MagickFalse;
- }
- image_view=DestroyCacheView(image_view);
- if (SetImageColorspace(image,sRGBColorspace,exception) == MagickFalse)
- return(MagickFalse);
- return(status);
- }
- case HCLColorspace:
+ assert(image != (Image *) NULL);
+ assert(image->signature == MagickSignature);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+ status=MagickTrue;
+ progress=0;
+ switch (image->colorspace)
+ {
+ case CMYKColorspace:
{
- /*
- Transform image from HCL to sRGB.
- */
- if (image->storage_class == PseudoClass)
- {
- if (SyncImage(image,exception) == MagickFalse)
- return(MagickFalse);
- if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
- return(MagickFalse);
- }
- image_view=AcquireAuthenticCacheView(image,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
-#endif
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- MagickBooleanType
- sync;
-
- register ssize_t
- x;
-
- register Quantum
- *restrict q;
-
- if (status == MagickFalse)
- continue;
- q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
- exception);
- if (q == (Quantum *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- double
- blue,
- chroma,
- green,
- hue,
- luma,
- red;
+ PixelInfo
+ zero;
- hue=(double) (QuantumScale*GetPixelRed(image,q));
- chroma=(double) (QuantumScale*GetPixelGreen(image,q));
- luma=(double) (QuantumScale*GetPixelBlue(image,q));
- ConvertHCLToRGB(hue,chroma,luma,&red,&green,&blue);
- SetPixelRed(image,ClampToQuantum(sRGBCompandor(red)),q);
- SetPixelGreen(image,ClampToQuantum(sRGBCompandor(green)),q);
- SetPixelBlue(image,ClampToQuantum(sRGBCompandor(blue)),q);
- q+=GetPixelChannels(image);
- }
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
- status=MagickFalse;
- }
- image_view=DestroyCacheView(image_view);
- if (SetImageColorspace(image,sRGBColorspace,exception) == MagickFalse)
- return(MagickFalse);
- return(status);
- }
- case HSBColorspace:
- {
/*
- Transform image from HSB to sRGB.
+ Transform image from CMYK to sRGB.
*/
if (image->storage_class == PseudoClass)
{
if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
return(MagickFalse);
}
+ GetPixelInfo(image,&zero);
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
MagickBooleanType
sync;
- register ssize_t
- x;
-
- register Quantum
- *restrict q;
-
- if (status == MagickFalse)
- continue;
- q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
- exception);
- if (q == (Quantum *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- double
- blue,
- brightness,
- green,
- hue,
- red,
- saturation;
-
- hue=(double) (QuantumScale*GetPixelRed(image,q));
- saturation=(double) (QuantumScale*GetPixelGreen(image,q));
- brightness=(double) (QuantumScale*GetPixelBlue(image,q));
- ConvertHSBToRGB(hue,saturation,brightness,&red,&green,&blue);
- SetPixelRed(image,ClampToQuantum(sRGBCompandor(red)),q);
- SetPixelGreen(image,ClampToQuantum(sRGBCompandor(green)),q);
- SetPixelBlue(image,ClampToQuantum(sRGBCompandor(blue)),q);
- q+=GetPixelChannels(image);
- }
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
- status=MagickFalse;
- }
- image_view=DestroyCacheView(image_view);
- if (SetImageColorspace(image,sRGBColorspace,exception) == MagickFalse)
- return(MagickFalse);
- return(status);
- }
- case HSLColorspace:
- {
- /*
- Transform image from HSL to sRGB.
- */
- if (image->storage_class == PseudoClass)
- {
- if (SyncImage(image,exception) == MagickFalse)
- return(MagickFalse);
- if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
- return(MagickFalse);
- }
- image_view=AcquireAuthenticCacheView(image,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
-#endif
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- MagickBooleanType
- sync;
+ PixelInfo
+ pixel;
register ssize_t
x;
status=MagickFalse;
continue;
}
+ pixel=zero;
for (x=0; x < (ssize_t) image->columns; x++)
{
- double
- blue,
- green,
- hue,
- lightness,
- red,
- saturation;
-
- hue=(double) (QuantumScale*GetPixelRed(image,q));
- saturation=(double) (QuantumScale*GetPixelGreen(image,q));
- lightness=(double) (QuantumScale*GetPixelBlue(image,q));
- ConvertHSLToRGB(hue,saturation,lightness,&red,&green,&blue);
- SetPixelRed(image,ClampToQuantum(sRGBCompandor(red)),q);
- SetPixelGreen(image,ClampToQuantum(sRGBCompandor(green)),q);
- SetPixelBlue(image,ClampToQuantum(sRGBCompandor(blue)),q);
+ GetPixelInfoPixel(image,q,&pixel);
+ ConvertCMYKToRGB(&pixel);
+ SetPixelInfoPixel(image,&pixel,q);
q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
return(MagickFalse);
return(status);
}
- case HWBColorspace:
+ case GRAYColorspace:
{
/*
- Transform image from HWB to sRGB.
+ Transform linear GRAY to sRGB colorspace.
*/
if (image->storage_class == PseudoClass)
{
if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
return(MagickFalse);
}
+ if (SetImageColorspace(image,sRGBColorspace,exception) == MagickFalse)
+ return(MagickFalse);
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
status=MagickFalse;
continue;
}
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=(ssize_t) image->columns; x != 0; x--)
{
- double
- blackness,
- blue,
- green,
- hue,
- red,
- whiteness;
-
- hue=(double) (QuantumScale*GetPixelRed(image,q));
- whiteness=(double) (QuantumScale*GetPixelGreen(image,q));
- blackness=(double) (QuantumScale*GetPixelBlue(image,q));
- ConvertHWBToRGB(hue,whiteness,blackness,&red,&green,&blue);
- SetPixelRed(image,ClampToQuantum(sRGBCompandor(red)),q);
- SetPixelGreen(image,ClampToQuantum(sRGBCompandor(green)),q);
- SetPixelBlue(image,ClampToQuantum(sRGBCompandor(blue)),q);
+ MagickRealType
+ gray;
+
+ gray=(MagickRealType) GetPixelGray(image,q);
+ if ((image->intensity == Rec601LuminancePixelIntensityMethod) ||
+ (image->intensity == Rec709LuminancePixelIntensityMethod))
+ gray=EncodePixelGamma(gray);
+ SetPixelRed(image,ClampToQuantum(gray),q);
+ SetPixelGreen(image,ClampToQuantum(gray),q);
+ SetPixelBlue(image,ClampToQuantum(gray),q);
q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
return(MagickFalse);
return(status);
}
+ case CMYColorspace:
+ case HCLColorspace:
+ case HCLpColorspace:
+ case HSBColorspace:
+ case HSIColorspace:
+ case HSLColorspace:
+ case HSVColorspace:
+ case HWBColorspace:
case LabColorspace:
+ case LCHColorspace:
+ case LCHabColorspace:
+ case LCHuvColorspace:
+ case LMSColorspace:
+ case LuvColorspace:
+ case XYZColorspace:
+ case YCbCrColorspace:
+ case YDbDrColorspace:
+ case YIQColorspace:
+ case YPbPrColorspace:
+ case YUVColorspace:
{
/*
- Transform image from Lab to sRGB.
+ Transform image from source colorspace to sRGB.
*/
if (image->storage_class == PseudoClass)
{
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
for (x=0; x < (ssize_t) image->columns; x++)
{
double
- a,
- b,
blue,
green,
- L,
red,
X,
Y,
Z;
- L=QuantumScale*GetPixelRed(image,q);
- a=QuantumScale*GetPixelGreen(image,q);
- b=QuantumScale*GetPixelBlue(image,q);
- ConvertLabToXYZ(L,a,b,&X,&Y,&Z);
- ConvertXYZToRGB(X,Y,Z,&red,&green,&blue);
- SetPixelRed(image,ClampToQuantum(sRGBCompandor(red)),q);
- SetPixelGreen(image,ClampToQuantum(sRGBCompandor(green)),q);
- SetPixelBlue(image,ClampToQuantum(sRGBCompandor(blue)),q);
+ X=QuantumScale*GetPixelRed(image,q);
+ Y=QuantumScale*GetPixelGreen(image,q);
+ Z=QuantumScale*GetPixelBlue(image,q);
+ switch (image->colorspace)
+ {
+ case CMYColorspace:
+ {
+ ConvertCMYToRGB(X,Y,Z,&red,&green,&blue);
+ break;
+ }
+ case HCLColorspace:
+ {
+ ConvertHCLToRGB(X,Y,Z,&red,&green,&blue);
+ break;
+ }
+ case HCLpColorspace:
+ {
+ ConvertHCLpToRGB(X,Y,Z,&red,&green,&blue);
+ break;
+ }
+ case HSBColorspace:
+ {
+ ConvertHSBToRGB(X,Y,Z,&red,&green,&blue);
+ break;
+ }
+ case HSIColorspace:
+ {
+ ConvertHSIToRGB(X,Y,Z,&red,&green,&blue);
+ break;
+ }
+ case HSLColorspace:
+ {
+ ConvertHSLToRGB(X,Y,Z,&red,&green,&blue);
+ break;
+ }
+ case HSVColorspace:
+ {
+ ConvertHSVToRGB(X,Y,Z,&red,&green,&blue);
+ break;
+ }
+ case HWBColorspace:
+ {
+ ConvertHWBToRGB(X,Y,Z,&red,&green,&blue);
+ break;
+ }
+ case LabColorspace:
+ {
+ ConvertLabToRGB(X,Y,Z,&red,&green,&blue);
+ break;
+ }
+ case LCHColorspace:
+ case LCHabColorspace:
+ {
+ ConvertLCHabToRGB(X,Y,Z,&red,&green,&blue);
+ break;
+ }
+ case LCHuvColorspace:
+ {
+ ConvertLCHuvToRGB(X,Y,Z,&red,&green,&blue);
+ break;
+ }
+ case LMSColorspace:
+ {
+ ConvertLMSToRGB(X,Y,Z,&red,&green,&blue);
+ break;
+ }
+ case LuvColorspace:
+ {
+ ConvertLuvToRGB(X,Y,Z,&red,&green,&blue);
+ break;
+ }
+ case XYZColorspace:
+ {
+ ConvertXYZToRGB(X,Y,Z,&red,&green,&blue);
+ break;
+ }
+ case YCbCrColorspace:
+ {
+ ConvertYCbCrToRGB(X,Y,Z,&red,&green,&blue);
+ break;
+ }
+ case YDbDrColorspace:
+ {
+ ConvertYDbDrToRGB(X,Y,Z,&red,&green,&blue);
+ break;
+ }
+ case YIQColorspace:
+ {
+ ConvertYIQToRGB(X,Y,Z,&red,&green,&blue);
+ break;
+ }
+ case YPbPrColorspace:
+ {
+ ConvertYPbPrToRGB(X,Y,Z,&red,&green,&blue);
+ break;
+ }
+ case YUVColorspace:
+ {
+ ConvertYUVToRGB(X,Y,Z,&red,&green,&blue);
+ break;
+ }
+ default:
+ {
+ red=QuantumRange*X;
+ green=QuantumRange*Y;
+ blue=QuantumRange*Z;
+ break;
+ }
+ }
+ SetPixelRed(image,ClampToQuantum(red),q);
+ SetPixelGreen(image,ClampToQuantum(green),q);
+ SetPixelBlue(image,ClampToQuantum(blue),q);
q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
gamma=DisplayGamma;
value=GetImageProperty(image,"gamma",exception);
if (value != (const char *) NULL)
- gamma=MagickEpsilonReciprocal(StringToDouble(value,(char **) NULL));
+ gamma=PerceptibleReciprocal(StringToDouble(value,(char **) NULL));
film_gamma=FilmGamma;
value=GetImageProperty(image,"film-gamma",exception);
if (value != (const char *) NULL)
if (logmap == (Quantum *) NULL)
ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
image->filename);
- black=pow(10.0,(reference_black-reference_white)*(gamma/density)*
- 0.002/film_gamma);
+ black=pow(10.0,(reference_black-reference_white)*(gamma/density)*0.002/
+ film_gamma);
for (i=0; i <= (ssize_t) (reference_black*MaxMap/1024.0); i++)
logmap[i]=(Quantum) 0;
for ( ; i < (ssize_t) (reference_white*MaxMap/1024.0); i++)
logmap[i]=ClampToQuantum(QuantumRange/(1.0-black)*
- (pow(10.0,(1024.0*i/MaxMap-reference_white)*
- (gamma/density)*0.002/film_gamma)-black));
+ (pow(10.0,(1024.0*i/MaxMap-reference_white)*(gamma/density)*0.002/
+ film_gamma)-black));
for ( ; i <= (ssize_t) MaxMap; i++)
logmap[i]=QuantumRange;
if (image->storage_class == PseudoClass)
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
green,
red;
- red=sRGBCompandor((double) logmap[ScaleQuantumToMap(
- GetPixelRed(image,q))]);
- green=sRGBCompandor((double) logmap[ScaleQuantumToMap(
- GetPixelGreen(image,q))]);
- blue=sRGBCompandor((double) logmap[ScaleQuantumToMap(
- GetPixelBlue(image,q))]);
- SetPixelRed(image,ClampToQuantum(red),q);
- SetPixelGreen(image,ClampToQuantum(green),q);
- SetPixelBlue(image,ClampToQuantum(blue),q);
+ red=(double) logmap[ScaleQuantumToMap(GetPixelRed(image,q))];
+ green=(double) logmap[ScaleQuantumToMap(GetPixelGreen(image,q))];
+ blue=(double) logmap[ScaleQuantumToMap(GetPixelBlue(image,q))];
+ SetPixelRed(image,ClampToQuantum(EncodePixelGamma((MagickRealType)
+ red)),q);
+ SetPixelGreen(image,ClampToQuantum(EncodePixelGamma((MagickRealType)
+ green)),q);
+ SetPixelBlue(image,ClampToQuantum(EncodePixelGamma((MagickRealType)
+ blue)),q);
q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
return(MagickFalse);
return(status);
}
- case LuvColorspace:
- {
- /*
- Transform image from Luv to sRGB.
- */
- if (image->storage_class == PseudoClass)
- {
- if (SyncImage(image,exception) == MagickFalse)
- return(MagickFalse);
- if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
- return(MagickFalse);
- }
- image_view=AcquireAuthenticCacheView(image,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
-#endif
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- MagickBooleanType
- sync;
-
- register ssize_t
- x;
-
- register Quantum
- *restrict q;
-
- if (status == MagickFalse)
- continue;
- q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
- exception);
- if (q == (Quantum *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- double
- blue,
- green,
- L,
- red,
- u,
- v,
- X,
- Y,
- Z;
-
- L=QuantumScale*GetPixelRed(image,q);
- u=QuantumScale*GetPixelGreen(image,q);
- v=QuantumScale*GetPixelBlue(image,q);
- ConvertLuvToXYZ(L,u,v,&X,&Y,&Z);
- ConvertXYZToRGB(X,Y,Z,&red,&green,&blue);
- SetPixelRed(image,ClampToQuantum(sRGBCompandor(red)),q);
- SetPixelGreen(image,ClampToQuantum(sRGBCompandor(green)),q);
- SetPixelBlue(image,ClampToQuantum(sRGBCompandor(blue)),q);
- q+=GetPixelChannels(image);
- }
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
- status=MagickFalse;
- }
- image_view=DestroyCacheView(image_view);
- if (SetImageColorspace(image,sRGBColorspace,exception) == MagickFalse)
- return(MagickFalse);
- return(status);
- }
case RGBColorspace:
+ case scRGBColorspace:
{
/*
Transform linear RGB to sRGB colorspace.
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
green,
red;
- red=sRGBCompandor((double) GetPixelRed(image,q));
- green=sRGBCompandor((double) GetPixelGreen(image,q));
- blue=sRGBCompandor((double) GetPixelBlue(image,q));
+ red=EncodePixelGamma((MagickRealType) GetPixelRed(image,q));
+ green=EncodePixelGamma((MagickRealType) GetPixelGreen(image,q));
+ blue=EncodePixelGamma((MagickRealType) GetPixelBlue(image,q));
SetPixelRed(image,ClampToQuantum(red),q);
SetPixelGreen(image,ClampToQuantum(green),q);
SetPixelBlue(image,ClampToQuantum(blue),q);
return(MagickFalse);
return(status);
}
- case XYZColorspace:
- {
- /*
- Transform image from XYZ to sRGB.
- */
- if (image->storage_class == PseudoClass)
- {
- if (SyncImage(image,exception) == MagickFalse)
- return(MagickFalse);
- if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
- return(MagickFalse);
- }
- image_view=AcquireAuthenticCacheView(image,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
-#endif
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- MagickBooleanType
- sync;
-
- register ssize_t
- x;
-
- register Quantum
- *restrict q;
-
- if (status == MagickFalse)
- continue;
- q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
- exception);
- if (q == (Quantum *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- double
- blue,
- green,
- red,
- X,
- Y,
- Z;
-
- X=QuantumScale*GetPixelRed(image,q);
- Y=QuantumScale*GetPixelGreen(image,q);
- Z=QuantumScale*GetPixelBlue(image,q);
- ConvertXYZToRGB(X,Y,Z,&red,&green,&blue);
- SetPixelRed(image,ClampToQuantum(sRGBCompandor(red)),q);
- SetPixelGreen(image,ClampToQuantum(sRGBCompandor(green)),q);
- SetPixelBlue(image,ClampToQuantum(sRGBCompandor(blue)),q);
- q+=GetPixelChannels(image);
- }
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
- status=MagickFalse;
- }
- image_view=DestroyCacheView(image_view);
- if (SetImageColorspace(image,sRGBColorspace,exception) == MagickFalse)
- return(MagickFalse);
- return(status);
- }
default:
break;
}
/*
Initialize OHTA tables:
+ I1 = 0.33333*R+0.33334*G+0.33333*B
+ I2 = 0.50000*R+0.00000*G-0.50000*B
+ I3 =-0.25000*R+0.50000*G-0.25000*B
R = I1+1.00000*I2-0.66668*I3
G = I1+0.00000*I2+1.33333*I3
B = I1-1.00000*I2-0.66668*I3
through QuantumRange.
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static) \
- dynamic_number_threads(image,image->columns,1,1)
+ #pragma omp parallel for schedule(static,4) \
+ magick_threads(image,image,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
- x_map[i].x=(double) i;
- y_map[i].x=0.500000*(2.000000*(double) i-(double)
- MaxMap);
- z_map[i].x=(-0.333340)*(2.000000*(double) i-(double)
- MaxMap);
- x_map[i].y=(double) i;
- y_map[i].y=0.000000;
- z_map[i].y=0.666665*(2.000000*(double) i-(double)
- MaxMap);
- x_map[i].z=(double) i;
- y_map[i].z=(-0.500000)*(2.000000*(double) i-(double)
- MaxMap);
- z_map[i].z=(-0.333340)*(2.000000*(double) i-(double)
- MaxMap);
+ x_map[i].x=(MagickRealType) (1.0*(double) i);
+ y_map[i].x=(MagickRealType) (0.5*1.00000*(2.0*(double) i-MaxMap));
+ z_map[i].x=(MagickRealType) (-0.5*0.66668*(2.0*(double) i-MaxMap));
+ x_map[i].y=(MagickRealType) (1.0*(double) i);
+ y_map[i].y=(MagickRealType) (0.5*0.00000*(2.0*(double) i-MaxMap));
+ z_map[i].y=(MagickRealType) (0.5*1.33333*(2.0*(double) i-MaxMap));
+ x_map[i].z=(MagickRealType) (1.0*(double) i);
+ y_map[i].z=(MagickRealType) (-0.5*1.00000*(2.0*(double) i-MaxMap));
+ z_map[i].z=(MagickRealType) (-0.5*0.66668*(2.0*(double) i-MaxMap));
}
break;
}
case Rec601YCbCrColorspace:
- case YCbCrColorspace:
{
/*
Initialize YCbCr tables:
through QuantumRange.
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static) \
- dynamic_number_threads(image,image->columns,1,1)
+ #pragma omp parallel for schedule(static,4) \
+ magick_threads(image,image,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
- x_map[i].x=(double) i;
- y_map[i].x=0.000000;
- z_map[i].x=(1.402000*0.500000)*(2.000000*(double) i-
- (double) MaxMap);
- x_map[i].y=(double) i;
- y_map[i].y=(-0.344136*0.500000)*(2.000000*(double) i-
- (double) MaxMap);
- z_map[i].y=(-0.714136*0.500000)*(2.000000*(double) i-
- (double) MaxMap);
- x_map[i].z=(double) i;
- y_map[i].z=(1.772000*0.500000)*(2.000000*(double) i-
- (double) MaxMap);
- z_map[i].z=0.000000;
+ x_map[i].x=0.99999999999914679361*(double) i;
+ y_map[i].x=0.5*(-1.2188941887145875e-06)*(2.00*(double) i-MaxMap);
+ z_map[i].x=0.5*1.4019995886561440468*(2.00*(double) i-MaxMap);
+ x_map[i].y=0.99999975910502514331*(double) i;
+ y_map[i].y=0.5*(-0.34413567816504303521)*(2.00*(double) i-MaxMap);
+ z_map[i].y=0.5*(-0.71413649331646789076)*(2.00*(double) i-MaxMap);
+ x_map[i].z=1.00000124040004623180*(double) i;
+ y_map[i].z=0.5*1.77200006607230409200*(2.00*(double) i-MaxMap);
+ z_map[i].z=0.5*2.1453384174593273e-06*(2.00*(double) i-MaxMap);
}
break;
}
through QuantumRange.
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static) \
- dynamic_number_threads(image,image->columns,1,1)
+ #pragma omp parallel for schedule(static,4) \
+ magick_threads(image,image,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
- x_map[i].x=(double) i;
- y_map[i].x=0.000000;
- z_map[i].x=(1.574800*0.50000)*(2.00000*(double) i-
- (double) MaxMap);
- x_map[i].y=(double) i;
- y_map[i].y=(-0.187324*0.50000)*(2.00000*(double) i-
- (double) MaxMap);
- z_map[i].y=(-0.468124*0.50000)*(2.00000*(double) i-
- (double) MaxMap);
- x_map[i].z=(double) i;
- y_map[i].z=(1.855600*0.50000)*(2.00000*(double) i-
- (double) MaxMap);
- z_map[i].z=0.00000;
+ x_map[i].x=(MagickRealType) (1.0*i);
+ y_map[i].x=(MagickRealType) (0.5*0.000000*(2.0*i-MaxMap));
+ z_map[i].x=(MagickRealType) (0.5*1.574800*(2.0*i-MaxMap));
+ x_map[i].y=(MagickRealType) (1.0*i);
+ y_map[i].y=(MagickRealType) (0.5*(-0.187324)*(2.0*i-MaxMap));
+ z_map[i].y=(MagickRealType) (0.5*(-0.468124)*(2.0*i-MaxMap));
+ x_map[i].z=(MagickRealType) (1.0*i);
+ y_map[i].z=(MagickRealType) (0.5*1.855600*(2.0*i-MaxMap));
+ z_map[i].z=(MagickRealType) (0.5*0.000000*(2.0*i-MaxMap));
}
break;
}
YCC is scaled by 1.3584. C1 zero is 156 and C2 is at 137.
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static) \
- dynamic_number_threads(image,image->columns,1,1)
-#endif
- for (i=0; i <= (ssize_t) MaxMap; i++)
- {
- x_map[i].x=1.3584000*(double) i;
- y_map[i].x=0.0000000;
- z_map[i].x=1.8215000*((double) i-(double)
- ScaleQuantumToMap(ScaleCharToQuantum(137)));
- x_map[i].y=1.3584000*(double) i;
- y_map[i].y=(-0.4302726)*((double) i-(double)
- ScaleQuantumToMap(ScaleCharToQuantum(156)));
- z_map[i].y=(-0.9271435)*((double) i-(double)
- ScaleQuantumToMap(ScaleCharToQuantum(137)));
- x_map[i].z=1.3584000*(double) i;
- y_map[i].z=2.2179000*((double) i-(double)
- ScaleQuantumToMap(ScaleCharToQuantum(156)));
- z_map[i].z=0.0000000;
- }
- break;
- }
- case YIQColorspace:
- {
- /*
- Initialize YIQ tables:
-
- R = Y+0.95620*I+0.62140*Q
- G = Y-0.27270*I-0.64680*Q
- B = Y-1.10370*I+1.70060*Q
-
- I and Q, normally -0.5 through 0.5, must be normalized to the range 0
- through QuantumRange.
- */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static) \
- dynamic_number_threads(image,image->columns,1,1)
-#endif
- for (i=0; i <= (ssize_t) MaxMap; i++)
- {
- x_map[i].x=(double) i;
- y_map[i].x=0.47810*(2.00000*(double) i-(double)
- MaxMap);
- z_map[i].x=0.31070*(2.00000*(double) i-(double)
- MaxMap);
- x_map[i].y=(double) i;
- y_map[i].y=(-0.13635)*(2.00000*(double) i-(double)
- MaxMap);
- z_map[i].y=(-0.32340)*(2.00000*(double) i-(double)
- MaxMap);
- x_map[i].z=(double) i;
- y_map[i].z=(-0.55185)*(2.00000*(double) i-(double)
- MaxMap);
- z_map[i].z=0.85030*(2.00000*(double) i-(double)
- MaxMap);
- }
- break;
- }
- case YPbPrColorspace:
- {
- /*
- Initialize YPbPr tables:
-
- R = Y +1.402000*C2
- G = Y-0.344136*C1+0.714136*C2
- B = Y+1.772000*C1
-
- Pb and Pr, normally -0.5 through 0.5, must be normalized to the range 0
- through QuantumRange.
- */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static) \
- dynamic_number_threads(image,image->columns,1,1)
-#endif
- for (i=0; i <= (ssize_t) MaxMap; i++)
- {
- x_map[i].x=(double) i;
- y_map[i].x=0.000000;
- z_map[i].x=0.701000*(2.00000*(double) i-(double)
- MaxMap);
- x_map[i].y=(double) i;
- y_map[i].y=(-0.172068)*(2.00000*(double) i-(double)
- MaxMap);
- z_map[i].y=0.357068*(2.00000*(double) i-(double)
- MaxMap);
- x_map[i].z=(double) i;
- y_map[i].z=0.88600*(2.00000*(double) i-(double)
- MaxMap);
- z_map[i].z=0.00000;
- }
- break;
- }
- case YUVColorspace:
- {
- /*
- Initialize YUV tables:
-
- R = Y +1.4075*V
- G = Y-0.3455*U-0.7169*V
- B = Y+1.7790*U
-
- U and V, normally -0.5 through 0.5, must be normalized to the range 0
- through QuantumRange.
- */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static) \
- dynamic_number_threads(image,image->columns,1,1)
+ #pragma omp parallel for schedule(static,4) \
+ magick_threads(image,image,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
- x_map[i].x=(double) i;
- y_map[i].x=0.00000;
- z_map[i].x=0.70375*(2.0000*(double) i-(double) MaxMap);
- x_map[i].y=(double) i;
- y_map[i].y=(-0.17275)*(2.00000*(double) i-(double)
- MaxMap);
- z_map[i].y=(-0.35845)*(2.00000*(double) i-(double)
- MaxMap);
- x_map[i].z=(double) i;
- y_map[i].z=0.8895*(2.00000*(double) i-(double) MaxMap);
- z_map[i].z=0.00000;
+ x_map[i].x=(MagickRealType) (1.3584000*(double) i);
+ y_map[i].x=(MagickRealType) 0.0000000;
+ z_map[i].x=(MagickRealType) (1.8215000*(1.0*(double) i-(double)
+ ScaleQuantumToMap(ScaleCharToQuantum(137))));
+ x_map[i].y=(MagickRealType) (1.3584000*(double) i);
+ y_map[i].y=(MagickRealType) (-0.4302726*(1.0*(double) i-(double)
+ ScaleQuantumToMap(ScaleCharToQuantum(156))));
+ z_map[i].y=(MagickRealType) (-0.9271435*(1.0*(double) i-(double)
+ ScaleQuantumToMap(ScaleCharToQuantum(137))));
+ x_map[i].z=(MagickRealType) (1.3584000*(double) i);
+ y_map[i].z=(MagickRealType) (2.2179000*(1.0*(double) i-(double)
+ ScaleQuantumToMap(ScaleCharToQuantum(156))));
+ z_map[i].z=(MagickRealType) 0.0000000;
}
break;
}
Linear conversion tables.
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static) \
- dynamic_number_threads(image,image->columns,1,1)
+ #pragma omp parallel for schedule(static,4) \
+ magick_threads(image,image,1,1)
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
- x_map[i].x=(double) i;
- y_map[i].x=0.0;
- z_map[i].x=0.0;
- x_map[i].y=0.0;
- y_map[i].y=(double) i;
- z_map[i].y=0.0;
- x_map[i].z=0.0;
- y_map[i].z=0.0;
- z_map[i].z=(double) i;
+ x_map[i].x=(MagickRealType) (1.0*(double) i);
+ y_map[i].x=(MagickRealType) 0.0;
+ z_map[i].x=(MagickRealType) 0.0;
+ x_map[i].y=(MagickRealType) 0.0;
+ y_map[i].y=(MagickRealType) (1.0*(double) i);
+ z_map[i].y=(MagickRealType) 0.0;
+ x_map[i].z=(MagickRealType) 0.0;
+ y_map[i].z=(MagickRealType) 0.0;
+ z_map[i].z=(MagickRealType) (1.0*(double) i);
}
break;
}
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
pixel.red=x_map[red].x+y_map[green].x+z_map[blue].x;
pixel.green=x_map[red].y+y_map[green].y+z_map[blue].y;
pixel.blue=x_map[red].z+y_map[green].z+z_map[blue].z;
- if (colorspace == YCCColorspace)
+ if (image->colorspace == YCCColorspace)
{
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
- pixel.red=QuantumRange*YCCMap[RoundToYCC(1024.0*QuantumScale*
- pixel.red)];
- pixel.green=QuantumRange*YCCMap[RoundToYCC(1024.0*QuantumScale*
- pixel.green)];
- pixel.blue=QuantumRange*YCCMap[RoundToYCC(1024.0*QuantumScale*
- pixel.blue)];
-#endif
+ pixel.red=QuantumRange*YCCMap[RoundToYCC(1024.0*pixel.red/
+ (double) MaxMap)];
+ pixel.green=QuantumRange*YCCMap[RoundToYCC(1024.0*pixel.green/
+ (double) MaxMap)];
+ pixel.blue=QuantumRange*YCCMap[RoundToYCC(1024.0*pixel.blue/
+ (double) MaxMap)];
+ }
+ else
+ {
+ pixel.red=(MagickRealType) ScaleMapToQuantum(pixel.red);
+ pixel.green=(MagickRealType) ScaleMapToQuantum(pixel.green);
+ pixel.blue=(MagickRealType) ScaleMapToQuantum(pixel.blue);
}
- SetPixelRed(image,ClampToQuantum(sRGBCompandor((double)
- ScaleMapToQuantum(pixel.red))),q);
- SetPixelGreen(image,ClampToQuantum(sRGBCompandor((double)
- ScaleMapToQuantum(pixel.green))),q);
- SetPixelBlue(image,ClampToQuantum(sRGBCompandor((double)
- ScaleMapToQuantum(pixel.blue))),q);
+ SetPixelRed(image,ClampToQuantum(pixel.red),q);
+ SetPixelGreen(image,ClampToQuantum(pixel.green),q);
+ SetPixelBlue(image,ClampToQuantum(pixel.blue),q);
q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
*/
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,1,1)
+ magick_threads(image,image,1,1)
#endif
for (i=0; i < (ssize_t) image->colors; i++)
{
pixel.red=x_map[red].x+y_map[green].x+z_map[blue].x;
pixel.green=x_map[red].y+y_map[green].y+z_map[blue].y;
pixel.blue=x_map[red].z+y_map[green].z+z_map[blue].z;
- if (colorspace == YCCColorspace)
+ if (image->colorspace == YCCColorspace)
{
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
- pixel.red=QuantumRange*YCCMap[RoundToYCC(1024.0*QuantumScale*
- pixel.red)];
- pixel.green=QuantumRange*YCCMap[RoundToYCC(1024.0*QuantumScale*
- pixel.green)];
- pixel.blue=QuantumRange*YCCMap[RoundToYCC(1024.0*QuantumScale*
- pixel.blue)];
-#endif
+ pixel.red=QuantumRange*YCCMap[RoundToYCC(1024.0*pixel.red/
+ (double) MaxMap)];
+ pixel.green=QuantumRange*YCCMap[RoundToYCC(1024.0*pixel.green/
+ (double) MaxMap)];
+ pixel.blue=QuantumRange*YCCMap[RoundToYCC(1024.0*pixel.blue/
+ (double) MaxMap)];
+ }
+ else
+ {
+ pixel.red=(MagickRealType) ScaleMapToQuantum(pixel.red);
+ pixel.green=(MagickRealType) ScaleMapToQuantum(pixel.green);
+ pixel.blue=(MagickRealType) ScaleMapToQuantum(pixel.blue);
}
- image->colormap[i].red=(double) ClampToQuantum(
- sRGBCompandor((double) ScaleMapToQuantum(pixel.red)));
- image->colormap[i].green=(double) ClampToQuantum(
- sRGBCompandor((double) ScaleMapToQuantum(pixel.green)));
- image->colormap[i].blue=(double) ClampToQuantum(
- sRGBCompandor((double) ScaleMapToQuantum(pixel.blue)));
+ image->colormap[i].red=(double) ClampToQuantum(pixel.red);
+ image->colormap[i].green=(double) ClampToQuantum(pixel.green);
+ image->colormap[i].blue=(double) ClampToQuantum(pixel.blue);
}
(void) SyncImage(image,exception);
break;