diff --git a/Install-unix.txt b/Install-unix.txt
index cc999c4..6b8579b 100644
--- a/Install-unix.txt
+++ b/Install-unix.txt
@@ -64,7 +64,8 @@
JBIG --with-jbig= no
JPEG v1 --with-jpeg=yes yes
JPEG-2000 --with-jp2=yes yes
- LCMS --with-lcms=yes yes
+ LCMS v1 --with-lcms=yes yes
+ LCMS v2 --with-lcms2=yes yes
LQR --with-lqr=yes no
Magick++ --with-magick-plus-plus=yes yes
OpenEXR --with-openexr=yes yes
@@ -399,7 +400,10 @@
disable JPEG v2 support.
--without-lcms
- disable LCMS support.
+ disable lcms (v1.1X) support
+
+ --without-lcms2
+ disable lcms (v2.X) support
--without-lzma
disable LZMA support.
diff --git a/coders/gif.c b/coders/gif.c
index 62be0bf..23c285a 100644
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -446,7 +446,7 @@
break;
index=ConstrainColormapIndex(image,(size_t) c);
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
SetOpacityPixelComponent(q,(ssize_t) index == opacity ?
TransparentOpacity : OpaqueOpacity);
x++;
diff --git a/coders/jbig.c b/coders/jbig.c
index bb5cc99..89cb662 100644
--- a/coders/jbig.c
+++ b/coders/jbig.c
@@ -238,7 +238,7 @@
if (bit == 8)
bit=0;
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
diff --git a/coders/jpeg.c b/coders/jpeg.c
index 67f74d1..99eb411 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1246,7 +1246,7 @@
pixel=(size_t) ((GETJSAMPLE(*p) ^ 0x80) << 4);
index=ConstrainColormapIndex(image,pixel);
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
p++;
q++;
}
@@ -1284,7 +1284,7 @@
{
index=ConstrainColormapIndex(image,(size_t) GETJSAMPLE(*p));
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
p++;
q++;
}
diff --git a/coders/map.c b/coders/map.c
index 12c9a65..c745fe9 100644
--- a/coders/map.c
+++ b/coders/map.c
@@ -228,7 +228,7 @@
p++;
}
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/palm.c b/coders/palm.c
index 4291833..e639db2 100644
--- a/coders/palm.c
+++ b/coders/palm.c
@@ -494,7 +494,7 @@
ThrowReaderException(CorruptImageError,"CorruptImage");
index=(IndexPacket) (mask-(((*ptr) & (mask << bit)) >> bit));
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
if (bit)
bit-=bits_per_pixel;
else
diff --git a/coders/psd.c b/coders/psd.c
index 329b9de..5f35693 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -653,7 +653,7 @@
SetIndexPixelComponent(indexes+x,ScaleQuantumToChar(pixel));
else
SetIndexPixelComponent(indexes+x,ScaleQuantumToShort(pixel));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x));
if (image->depth == 1)
{
@@ -668,7 +668,7 @@
{
SetIndexPixelComponent(indexes+x,(((unsigned char) pixel) &
(0x01 << (7-bit))) != 0 ? 0 : 255);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x));
q++;
x++;
diff --git a/coders/wpg.c b/coders/wpg.c
index 7bdab7f..28ee1bd 100644
--- a/coders/wpg.c
+++ b/coders/wpg.c
@@ -297,7 +297,7 @@
{
index=((*p) & (0x80 >> bit) ? 0x01 : 0x00);
SetIndexPixelComponent(indexes+x+bit,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
q++;
}
p++;
@@ -308,7 +308,7 @@
{
index=((*p) & (0x80 >> bit) ? 0x01 : 0x00);
SetIndexPixelComponent(indexes+x+bit,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
q++;
}
p++;
@@ -327,19 +327,19 @@
{
index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
q++;
index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
q++;
index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
q++;
index=ConstrainColormapIndex(image,(*p) & 0x3);
SetIndexPixelComponent(indexes+x+1,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
p++;
q++;
}
@@ -347,21 +347,21 @@
{
index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
q++;
if ((image->columns % 4) >= 1)
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
q++;
if ((image->columns % 4) >= 2)
{
index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
q++;
}
}
@@ -382,11 +382,11 @@
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f);
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
q++;
index=ConstrainColormapIndex(image,(*p) & 0x0f);
SetIndexPixelComponent(indexes+x+1,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
p++;
q++;
}
@@ -394,7 +394,7 @@
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f);
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
p++;
q++;
}
@@ -412,7 +412,7 @@
{
index=ConstrainColormapIndex(image,*p);
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
p++;
q++;
}
diff --git a/coders/xwd.c b/coders/xwd.c
index a53c109..f28c21e 100644
--- a/coders/xwd.c
+++ b/coders/xwd.c
@@ -478,7 +478,7 @@
index=ConstrainColormapIndex(image,XGetPixel(ximage,(int) x,
(int) y));
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
diff --git a/magick/colormap.c b/magick/colormap.c
index 7985979..5f3aab3 100644
--- a/magick/colormap.c
+++ b/magick/colormap.c
@@ -237,7 +237,7 @@
if (index < 0)
index+=(ssize_t) image->colors;
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -378,7 +378,7 @@
{
index=(IndexPacket) pixels[(ssize_t) GetIndexPixelComponent(indexes+x)];
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/magick/compress.c b/magick/compress.c
index a87919e..c5c9031 100644
--- a/magick/compress.c
+++ b/magick/compress.c
@@ -638,7 +638,7 @@
{
index=(IndexPacket) (*p++);
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
diff --git a/magick/deprecate.c b/magick/deprecate.c
index 5ac2425..572d10f 100644
--- a/magick/deprecate.c
+++ b/magick/deprecate.c
@@ -5554,7 +5554,7 @@
threshold=(MagickRealType) QuantumRange*o4[(x%4)+4*(y%4)];
index=(IndexPacket) (intensity <= threshold ? 0 : 1);
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
q++;
}
}
@@ -5955,7 +5955,7 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetRGBOPixelComponent(q,&background_color);
+ SetRGBOPixelComponents(q,&background_color);
q++;
}
indexes=GetAuthenticIndexQueue(image);
@@ -5982,7 +5982,7 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetRGBOPixelComponent(q,&background_color);
+ SetRGBOPixelComponents(q,&background_color);
q++;
}
if (SyncAuthenticPixels(image,&image->exception) == MagickFalse)
@@ -6621,7 +6621,7 @@
index=(IndexPacket) ((MagickRealType) PixelIntensityToQuantum(q) <=
threshold ? 0 : 1);
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
q++;
}
if (!SyncAuthenticPixels(image,&image->exception))
diff --git a/magick/image.c b/magick/image.c
index cc7b964..3046a24 100644
--- a/magick/image.c
+++ b/magick/image.c
@@ -4299,9 +4299,9 @@
index=PushColormapIndex(image,(size_t) GetIndexPixelComponent(indexes+x),
&range_exception);
if (image->matte == MagickFalse)
- SetRGBPixelComponent(q,image->colormap+(ssize_t) index)
+ SetRGBPixelComponents(q,image->colormap+(ssize_t) index)
else
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
diff --git a/magick/pixel.h b/magick/pixel.h
index 294d76c..4505985 100644
--- a/magick/pixel.h
+++ b/magick/pixel.h
@@ -60,25 +60,25 @@
#define SetOpacityPixelComponent(pixel,value) \
((pixel)->opacity=(Quantum) (value))
#define SetRedPixelComponent(pixel,value) ((pixel)->red=(Quantum) (value))
-#define SetRGBPixelComponent(destination,source) \
+#define SetRGBPixelComponents(pixel,packet) \
{ \
- SetRedPixelComponent(destination,GetRedPixelComponent(source)); \
- SetGreenPixelComponent(destination,GetGreenPixelComponent(source)); \
- SetBluePixelComponent(destination,GetBluePixelComponent(source)); \
+ SetRedPixelComponent(pixel,(packet)->red); \
+ SetGreenPixelComponent(pixel,(packet)->green); \
+ SetBluePixelComponent(pixel,(packet)->blue); \
}
-#define SetRGBAPixelComponent(destination,source) \
+#define SetRGBAPixelComponents(pixel,packet) \
{ \
- SetRedPixelComponent(destination,GetRedPixelComponent(source)); \
- SetGreenPixelComponent(destination,GetGreenPixelComponent(source)); \
- SetBluePixelComponent(destination,GetBluePixelComponent(source)); \
- SetAlphaPixelComponent(destination,GetAlphaPixelComponent(source)); \
+ SetRedPixelComponent(pixel,(packet)->red); \
+ SetGreenPixelComponent(pixel,(packet)->green); \
+ SetBluePixelComponent(pixel,(packet)->blue); \
+ SetAlphaPixelComponent(pixel,(QuantumRange-(packet)->opacity)); \
}
-#define SetRGBOPixelComponent(destination,source) \
+#define SetRGBOPixelComponents(pixel,packet) \
{ \
- SetRedPixelComponent(destination,GetRedPixelComponent(source)); \
- SetGreenPixelComponent(destination,GetGreenPixelComponent(source)); \
- SetBluePixelComponent(destination,GetBluePixelComponent(source)); \
- SetOpacityPixelComponent(destination,GetOpacityPixelComponent(source)); \
+ SetRedPixelComponent(pixel,(packet)->red); \
+ SetGreenPixelComponent(pixel,(packet)->green); \
+ SetBluePixelComponent(pixel,(packet)->blue); \
+ SetOpacityPixelComponent(pixel,(packet)->opacity); \
}
#define SetYellowPixelComponent(pixel,value) ((pixel)->blue=(Quantum) (value))
#define SetYPixelComponent(pixel,value) ((pixel)->red=(Quantum) (value))
diff --git a/magick/quantize.c b/magick/quantize.c
index 64d5e07..d7cf748 100644
--- a/magick/quantize.c
+++ b/magick/quantize.c
@@ -610,7 +610,7 @@
SetIndexPixelComponent(indexes+x+i,index);
if (cube.quantize_info->measure_error == MagickFalse)
{
- SetRGBPixelComponent(q,image->colormap+index);
+ SetRGBPixelComponents(q,image->colormap+index);
if (cube.associate_alpha != MagickFalse)
SetOpacityPixelComponent(q,image->colormap[index].opacity);
}
@@ -1598,7 +1598,7 @@
SetIndexPixelComponent(indexes+u,index);
if (cube.quantize_info->measure_error == MagickFalse)
{
- SetRGBPixelComponent(q,image->colormap+index);
+ SetRGBPixelComponents(q,image->colormap+index);
if (cube.associate_alpha != MagickFalse)
SetOpacityPixelComponent(q+u,image->colormap[index].opacity);
}
@@ -1819,7 +1819,7 @@
*indexes=(IndexPacket) index;
if (cube_info->quantize_info->measure_error == MagickFalse)
{
- SetRGBPixelComponent(q,image->colormap+index);
+ SetRGBPixelComponents(q,image->colormap+index);
if (cube_info->associate_alpha != MagickFalse)
SetOpacityPixelComponent(q,image->colormap[index].opacity);
}
diff --git a/magick/quantum-import.c b/magick/quantum-import.c
index ce31134..c4c7236 100644
--- a/magick/quantum-import.c
+++ b/magick/quantum-import.c
@@ -346,7 +346,7 @@
0x00 : 0x01);
SetIndexPixelComponent(indexes+x+bit,PushColormapIndex(image,
pixel,&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x+bit));
q++;
}
@@ -362,7 +362,7 @@
0x00 : 0x01);
SetIndexPixelComponent(indexes+x+bit,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x+bit));
q++;
}
@@ -378,13 +378,13 @@
pixel=(unsigned char) ((*p >> 4) & 0xf);
SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x));
q++;
pixel=(unsigned char) ((*p) & 0xf);
SetIndexPixelComponent(indexes+x+1,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x+1));
p++;
q++;
@@ -394,7 +394,7 @@
pixel=(unsigned char) ((*p++ >> 4) & 0xf);
SetIndexPixelComponent(indexes+x+bit,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x+bit));
q++;
}
@@ -410,7 +410,7 @@
p=PushCharPixel(p,&pixel);
SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x));
p+=quantum_info->pad;
q++;
@@ -430,7 +430,7 @@
SetIndexPixelComponent(indexes+x,PushColormapIndex(image,
ClampToQuantum((MagickRealType) QuantumRange*
HalfToSinglePrecision(pixel)),&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x));
p+=quantum_info->pad;
q++;
@@ -442,7 +442,7 @@
p=PushShortPixel(endian,p,&pixel);
SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x));
p+=quantum_info->pad;
q++;
@@ -464,7 +464,7 @@
p=PushFloatPixel(&quantum_state,p,&pixel);
SetIndexPixelComponent(indexes+x,PushColormapIndex(image,
ClampToQuantum(pixel),&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x));
p+=quantum_info->pad;
q++;
@@ -476,7 +476,7 @@
p=PushLongPixel(endian,p,&pixel);
SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x));
p+=quantum_info->pad;
q++;
@@ -495,7 +495,7 @@
p=PushDoublePixel(&quantum_state,p,&pixel);
SetIndexPixelComponent(indexes+x,PushColormapIndex(image,
ClampToQuantum(pixel),&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x));
p+=quantum_info->pad;
q++;
@@ -510,7 +510,7 @@
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x));
p+=quantum_info->pad;
q++;
@@ -590,7 +590,7 @@
pixel=(unsigned char) ((*p >> 4) & 0xf);
SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x));
pixel=(unsigned char) ((*p) & 0xf);
SetOpacityPixelComponent(q,QuantumRange-ScaleAnyToQuantum(pixel,
@@ -610,7 +610,7 @@
p=PushCharPixel(p,&pixel);
SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x));
p=PushCharPixel(p,&pixel);
SetOpacityPixelComponent(q,QuantumRange-ScaleCharToQuantum(pixel));
@@ -632,7 +632,7 @@
SetIndexPixelComponent(indexes+x,PushColormapIndex(image,
ClampToQuantum((MagickRealType) QuantumRange*
HalfToSinglePrecision(pixel)),&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x));
p=PushShortPixel(endian,p,&pixel);
SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum(
@@ -647,7 +647,7 @@
p=PushShortPixel(endian,p,&pixel);
SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x));
p=PushShortPixel(endian,p,&pixel);
SetOpacityPixelComponent(q,QuantumRange-ScaleShortToQuantum(pixel));
@@ -671,7 +671,7 @@
p=PushFloatPixel(&quantum_state,p,&pixel);
SetIndexPixelComponent(indexes+x,PushColormapIndex(image,
ClampToQuantum(pixel),&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x));
p=PushFloatPixel(&quantum_state,p,&pixel);
SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum(pixel));
@@ -685,7 +685,7 @@
p=PushLongPixel(endian,p,&pixel);
SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x));
p=PushLongPixel(endian,p,&pixel);
SetOpacityPixelComponent(q,QuantumRange-ScaleLongToQuantum(pixel));
@@ -706,7 +706,7 @@
p=PushDoublePixel(&quantum_state,p,&pixel);
SetIndexPixelComponent(indexes+x,PushColormapIndex(image,
ClampToQuantum(pixel),&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x));
p=PushDoublePixel(&quantum_state,p,&pixel);
SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum(pixel));
@@ -724,7 +724,7 @@
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponent(q,image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t)
GetIndexPixelComponent(indexes+x));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
SetOpacityPixelComponent(q,QuantumRange-ScaleAnyToQuantum(pixel,
diff --git a/magick/threshold.c b/magick/threshold.c
index ab47ab8..dd4a145 100644
--- a/magick/threshold.c
+++ b/magick/threshold.c
@@ -1779,7 +1779,7 @@
GetPseudoRandomValue(random_info[id]));
index=(IndexPacket) (intensity <= threshold.index ? 0 : 1);
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,image->colormap+(ssize_t) index);
+ SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
q++;
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
diff --git a/magick/xwindow.c b/magick/xwindow.c
index 178f5e0..65edc69 100644
--- a/magick/xwindow.c
+++ b/magick/xwindow.c
@@ -4458,7 +4458,7 @@
{
index=(IndexPacket) XGetPixel(ximage,x,y);
SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponent(q,composite_image->colormap+(ssize_t)
+ SetRGBOPixelComponents(q,composite_image->colormap+(ssize_t)
index);
q++;
}