Commit 08333f255 for imagemagick.org
commit 08333f255df84043a30286cfd2b8392063c6b534
Author: Cristy <urban-warrior@imagemagick.org>
Date: Fri Nov 20 18:18:02 2026 -0500
24-bit integer output fell through into the 64-bit writer
diff --git a/MagickCore/quantum-export.c b/MagickCore/quantum-export.c
index 2e7dc1240..482e1dda8 100644
--- a/MagickCore/quantum-export.c
+++ b/MagickCore/quantum-export.c
@@ -113,14 +113,15 @@ static inline unsigned char *PopQuantumDoublePixel(QuantumInfo *quantum_info,
const double pixel,unsigned char *magick_restrict pixels)
{
double
- *p;
+ value;
unsigned char
quantum[8];
(void) memset(quantum,0,sizeof(quantum));
- p=(double *) quantum;
- *p=(double) (pixel*quantum_info->state.inverse_scale+quantum_info->minimum);
+ value=(double) (pixel*quantum_info->state.inverse_scale+
+ quantum_info->minimum);
+ (void) memcpy(quantum,&value,sizeof(value));
if (quantum_info->endian == LSBEndian)
{
*pixels++=quantum[0];
@@ -148,15 +149,15 @@ static inline unsigned char *PopQuantumFloatPixel(QuantumInfo *quantum_info,
const float pixel,unsigned char *magick_restrict pixels)
{
float
- *p;
+ value;
unsigned char
quantum[4];
(void) memset(quantum,0,sizeof(quantum));
- p=(float *) quantum;
- *p=(float) ((double) pixel*quantum_info->state.inverse_scale+
+ value=(float) ((double) pixel*quantum_info->state.inverse_scale+
quantum_info->minimum);
+ (void) memcpy(quantum,&value,sizeof(value));
if (quantum_info->endian == LSBEndian)
{
*pixels++=quantum[0];
@@ -403,7 +404,14 @@ static void ExportPixelChannel(const Image *image,QuantumInfo *quantum_info,
}
break;
}
- magick_fallthrough;
+ range=GetQuantumRange(quantum_info->depth);
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ q=PopQuantumPixel(quantum_info,ScaleQuantumToAny(*p,range),q);
+ p+=(ptrdiff_t) GetPixelChannels(image);
+ q+=(ptrdiff_t) quantum_info->pad;
+ }
+ break;
}
case 64:
{
@@ -490,9 +498,9 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info,
for (x=0; x < (ssize_t) number_pixels; x++)
{
pixel=(unsigned int) (
- ScaleQuantumToAny(GetPixelRed(image,p),range) << 22 |
+ ScaleQuantumToAny(GetPixelBlue(image,p),range) << 22 |
ScaleQuantumToAny(GetPixelGreen(image,p),range) << 12 |
- ScaleQuantumToAny(GetPixelBlue(image,p),range) << 2);
+ ScaleQuantumToAny(GetPixelRed(image,p),range) << 2);
q=PopLongPixel(quantum_info->endian,pixel,q);
p+=(ptrdiff_t) GetPixelChannels(image);
q+=(ptrdiff_t) quantum_info->pad;
@@ -503,12 +511,12 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info,
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopQuantumLongPixel(quantum_info,pixel,q);
pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(image,p),
range);
q=PopQuantumLongPixel(quantum_info,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopQuantumLongPixel(quantum_info,pixel,q);
p+=(ptrdiff_t) GetPixelChannels(image);
q+=(ptrdiff_t) quantum_info->pad;
@@ -517,11 +525,11 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info,
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopQuantumPixel(quantum_info,pixel,q);
pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(image,p),range);
q=PopQuantumPixel(quantum_info,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopQuantumPixel(quantum_info,pixel,q);
p+=(ptrdiff_t) GetPixelChannels(image);
q+=(ptrdiff_t) quantum_info->pad;
@@ -543,7 +551,7 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info,
default:
case 0:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),
range);
break;
}
@@ -555,7 +563,7 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info,
}
case 2:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),
range);
p+=(ptrdiff_t) GetPixelChannels(image);
break;
@@ -570,7 +578,7 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info,
default:
case 0:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),
range);
break;
}
@@ -582,7 +590,7 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info,
}
case 2:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),
range);
p+=(ptrdiff_t) GetPixelChannels(image);
break;
@@ -600,7 +608,7 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info,
default:
case 0:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),
range);
break;
}
@@ -612,7 +620,7 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info,
}
case 2:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),
range);
p+=(ptrdiff_t) GetPixelChannels(image);
break;
@@ -631,12 +639,12 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info,
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopQuantumLongPixel(quantum_info,pixel,q);
pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(image,p),
range);
q=PopQuantumLongPixel(quantum_info,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopQuantumLongPixel(quantum_info,pixel,q);
p+=(ptrdiff_t) GetPixelChannels(image);
q+=(ptrdiff_t) quantum_info->pad;
@@ -645,11 +653,11 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info,
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopQuantumPixel(quantum_info,pixel,q);
pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(image,p),range);
q=PopQuantumPixel(quantum_info,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopQuantumPixel(quantum_info,pixel,q);
p+=(ptrdiff_t) GetPixelChannels(image);
q+=(ptrdiff_t) quantum_info->pad;
@@ -701,9 +709,9 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info,
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopQuantumFloatPixel(quantum_info,(float) GetPixelRed(image,p),q);
- q=PopQuantumFloatPixel(quantum_info,(float) GetPixelGreen(image,p),q);
q=PopQuantumFloatPixel(quantum_info,(float) GetPixelBlue(image,p),q);
+ q=PopQuantumFloatPixel(quantum_info,(float) GetPixelGreen(image,p),q);
+ q=PopQuantumFloatPixel(quantum_info,(float) GetPixelRed(image,p),q);
p+=(ptrdiff_t) GetPixelChannels(image);
q+=(ptrdiff_t) quantum_info->pad;
}
@@ -728,9 +736,9 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info,
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopQuantumDoublePixel(quantum_info,(double) GetPixelRed(image,p),q);
- q=PopQuantumDoublePixel(quantum_info,(double) GetPixelGreen(image,p),q);
q=PopQuantumDoublePixel(quantum_info,(double) GetPixelBlue(image,p),q);
+ q=PopQuantumDoublePixel(quantum_info,(double) GetPixelGreen(image,p),q);
+ q=PopQuantumDoublePixel(quantum_info,(double) GetPixelRed(image,p),q);
p+=(ptrdiff_t) GetPixelChannels(image);
q+=(ptrdiff_t) quantum_info->pad;
}
@@ -743,11 +751,11 @@ static void ExportBGRQuantum(const Image *image,QuantumInfo *quantum_info,
range=GetQuantumRange(quantum_info->depth);
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopQuantumPixel(quantum_info,ScaleQuantumToAny(GetPixelRed(image,p),
+ q=PopQuantumPixel(quantum_info,ScaleQuantumToAny(GetPixelBlue(image,p),
range),q);
q=PopQuantumPixel(quantum_info,ScaleQuantumToAny(GetPixelGreen(image,p),
range),q);
- q=PopQuantumPixel(quantum_info,ScaleQuantumToAny(GetPixelBlue(image,p),
+ q=PopQuantumPixel(quantum_info,ScaleQuantumToAny(GetPixelRed(image,p),
range),q);
p+=(ptrdiff_t) GetPixelChannels(image);
q+=(ptrdiff_t) quantum_info->pad;
@@ -815,9 +823,9 @@ static void ExportBGRAQuantum(const Image *image,QuantumInfo *quantum_info,
{
switch (i)
{
- case 0: quantum=(size_t) GetPixelRed(image,p); break;
+ case 0: quantum=(size_t) GetPixelBlue(image,p); break;
case 1: quantum=(size_t) GetPixelGreen(image,p); break;
- case 2: quantum=(size_t) GetPixelBlue(image,p); break;
+ case 2: quantum=(size_t) GetPixelRed(image,p); break;
case 3: quantum=(size_t) GetPixelAlpha(image,p); break;
}
switch (n % 3)
@@ -854,12 +862,12 @@ static void ExportBGRAQuantum(const Image *image,QuantumInfo *quantum_info,
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopQuantumLongPixel(quantum_info,pixel,q);
pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(image,p),
range);
q=PopQuantumLongPixel(quantum_info,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopQuantumLongPixel(quantum_info,pixel,q);
pixel=(unsigned int) ScaleQuantumToAny(GetPixelAlpha(image,p),
range);
@@ -871,11 +879,11 @@ static void ExportBGRAQuantum(const Image *image,QuantumInfo *quantum_info,
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopQuantumPixel(quantum_info,pixel,q);
pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(image,p),range);
q=PopQuantumPixel(quantum_info,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopQuantumPixel(quantum_info,pixel,q);
pixel=(unsigned int) ScaleQuantumToAny(GetPixelAlpha(image,p),range);
q=PopQuantumPixel(quantum_info,pixel,q);
@@ -937,9 +945,9 @@ static void ExportBGRAQuantum(const Image *image,QuantumInfo *quantum_info,
float
float_pixel;
- q=PopQuantumFloatPixel(quantum_info,(float) GetPixelRed(image,p),q);
- q=PopQuantumFloatPixel(quantum_info,(float) GetPixelGreen(image,p),q);
q=PopQuantumFloatPixel(quantum_info,(float) GetPixelBlue(image,p),q);
+ q=PopQuantumFloatPixel(quantum_info,(float) GetPixelGreen(image,p),q);
+ q=PopQuantumFloatPixel(quantum_info,(float) GetPixelRed(image,p),q);
float_pixel=(float) GetPixelAlpha(image,p);
q=PopQuantumFloatPixel(quantum_info,float_pixel,q);
p+=(ptrdiff_t) GetPixelChannels(image);
@@ -971,9 +979,9 @@ static void ExportBGRAQuantum(const Image *image,QuantumInfo *quantum_info,
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopQuantumDoublePixel(quantum_info,(double) GetPixelRed(image,p),q);
- q=PopQuantumDoublePixel(quantum_info,(double) GetPixelGreen(image,p),q);
q=PopQuantumDoublePixel(quantum_info,(double) GetPixelBlue(image,p),q);
+ q=PopQuantumDoublePixel(quantum_info,(double) GetPixelGreen(image,p),q);
+ q=PopQuantumDoublePixel(quantum_info,(double) GetPixelRed(image,p),q);
pixel=(double) GetPixelAlpha(image,p);
q=PopQuantumDoublePixel(quantum_info,pixel,q);
p+=(ptrdiff_t) GetPixelChannels(image);
@@ -1062,9 +1070,9 @@ static void ExportBGROQuantum(const Image *image,QuantumInfo *quantum_info,
{
switch (i)
{
- case 0: quantum=(size_t) GetPixelRed(image,p); break;
+ case 0: quantum=(size_t) GetPixelBlue(image,p); break;
case 1: quantum=(size_t) GetPixelGreen(image,p); break;
- case 2: quantum=(size_t) GetPixelBlue(image,p); break;
+ case 2: quantum=(size_t) GetPixelRed(image,p); break;
case 3: quantum=(size_t) GetPixelOpacity(image,p); break;
}
switch (n % 3)
@@ -1101,12 +1109,12 @@ static void ExportBGROQuantum(const Image *image,QuantumInfo *quantum_info,
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopQuantumLongPixel(quantum_info,pixel,q);
pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(image,p),
range);
q=PopQuantumLongPixel(quantum_info,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopQuantumLongPixel(quantum_info,pixel,q);
pixel=(unsigned int) ScaleQuantumToAny(GetPixelOpacity(image,p),
range);
@@ -1118,11 +1126,11 @@ static void ExportBGROQuantum(const Image *image,QuantumInfo *quantum_info,
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopQuantumPixel(quantum_info,pixel,q);
pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(image,p),range);
q=PopQuantumPixel(quantum_info,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopQuantumPixel(quantum_info,pixel,q);
pixel=(unsigned int) ScaleQuantumToAny(GetPixelOpacity(image,p),range);
q=PopQuantumPixel(quantum_info,pixel,q);
@@ -1184,9 +1192,9 @@ static void ExportBGROQuantum(const Image *image,QuantumInfo *quantum_info,
float
float_pixel;
- q=PopQuantumFloatPixel(quantum_info,(float) GetPixelRed(image,p),q);
- q=PopQuantumFloatPixel(quantum_info,(float) GetPixelGreen(image,p),q);
q=PopQuantumFloatPixel(quantum_info,(float) GetPixelBlue(image,p),q);
+ q=PopQuantumFloatPixel(quantum_info,(float) GetPixelGreen(image,p),q);
+ q=PopQuantumFloatPixel(quantum_info,(float) GetPixelRed(image,p),q);
float_pixel=(float) GetPixelOpacity(image,p);
q=PopQuantumFloatPixel(quantum_info,float_pixel,q);
p+=(ptrdiff_t) GetPixelChannels(image);
@@ -1218,9 +1226,9 @@ static void ExportBGROQuantum(const Image *image,QuantumInfo *quantum_info,
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopQuantumDoublePixel(quantum_info,(double) GetPixelRed(image,p),q);
- q=PopQuantumDoublePixel(quantum_info,(double) GetPixelGreen(image,p),q);
q=PopQuantumDoublePixel(quantum_info,(double) GetPixelBlue(image,p),q);
+ q=PopQuantumDoublePixel(quantum_info,(double) GetPixelGreen(image,p),q);
+ q=PopQuantumDoublePixel(quantum_info,(double) GetPixelRed(image,p),q);
pixel=(double) GetPixelOpacity(image,p);
q=PopQuantumDoublePixel(quantum_info,pixel,q);
p+=(ptrdiff_t) GetPixelChannels(image);
@@ -2180,22 +2188,22 @@ static void ExportGrayAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
for (x=((ssize_t) number_pixels-3); x > 0; x-=4)
{
*q='\0';
- *q|=(GetPixelLuma(image,p) > threshold ? black : white) << 7;
+ *q|=(GetPixelLuma(image,p) < threshold ? black : white) << 7;
pixel=(unsigned char) (GetPixelAlpha(image,p) == OpaqueAlpha ?
0x00 : 0x01);
*q|=(((int) pixel != 0 ? 0x00 : 0x01) << 6);
p+=(ptrdiff_t) GetPixelChannels(image);
- *q|=(GetPixelLuma(image,p) > threshold ? black : white) << 5;
+ *q|=(GetPixelLuma(image,p) < threshold ? black : white) << 5;
pixel=(unsigned char) (GetPixelAlpha(image,p) == OpaqueAlpha ?
0x00 : 0x01);
*q|=(((int) pixel != 0 ? 0x00 : 0x01) << 4);
p+=(ptrdiff_t) GetPixelChannels(image);
- *q|=(GetPixelLuma(image,p) > threshold ? black : white) << 3;
+ *q|=(GetPixelLuma(image,p) < threshold ? black : white) << 3;
pixel=(unsigned char) (GetPixelAlpha(image,p) == OpaqueAlpha ?
0x00 : 0x01);
*q|=(((int) pixel != 0 ? 0x00 : 0x01) << 2);
p+=(ptrdiff_t) GetPixelChannels(image);
- *q|=(GetPixelLuma(image,p) > threshold ? black : white) << 1;
+ *q|=(GetPixelLuma(image,p) < threshold ? black : white) << 1;
pixel=(unsigned char) (GetPixelAlpha(image,p) == OpaqueAlpha ?
0x00 : 0x01);
*q|=(((int) pixel != 0 ? 0x00 : 0x01) << 0);
@@ -2205,9 +2213,9 @@ static void ExportGrayAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
if ((number_pixels % 4) != 0)
{
*q='\0';
- for (bit=0; bit <= (ssize_t) (number_pixels % 4); bit+=2)
+ for (bit=0; bit < (ssize_t) (2*(number_pixels % 4)); bit+=2)
{
- *q|=(GetPixelLuma(image,p) > threshold ? black : white) <<
+ *q|=(GetPixelLuma(image,p) < threshold ? black : white) <<
(7-bit);
pixel=(unsigned char) (GetPixelAlpha(image,p) == OpaqueAlpha ?
0x00 : 0x01);
@@ -2228,7 +2236,7 @@ static void ExportGrayAlphaQuantum(const Image *image,QuantumInfo *quantum_info,
{
pixel=ScaleQuantumToChar(ClampToQuantum(GetPixelLuma(image,p)));
*q=(((pixel >> 4) & 0xf) << 4);
- pixel=(unsigned char) (16.0*QuantumScale*(double)
+ pixel=(unsigned char) (15.0*QuantumScale*(double)
GetPixelAlpha(image,p)+0.5);
*q|=pixel & 0xf;
p+=(ptrdiff_t) GetPixelChannels(image);
@@ -2575,7 +2583,7 @@ static void ExportIndexAlphaQuantum(const Image *image,
if ((number_pixels % 4) != 0)
{
*q='\0';
- for (bit=3; bit >= (ssize_t) (4-(number_pixels % 4)); bit-=2)
+ for (bit=3; bit > (ssize_t) (3-2*(ssize_t) (number_pixels % 4)); bit-=2)
{
pixel=(unsigned char) ((ssize_t) GetPixelIndex(image,p));
*q|=((pixel & 0x01) << (unsigned char) (bit+4));
@@ -2597,7 +2605,7 @@ static void ExportIndexAlphaQuantum(const Image *image,
{
pixel=(unsigned char) ((ssize_t) GetPixelIndex(image,p));
*q=((pixel & 0xf) << 4);
- pixel=(unsigned char) (16.0*QuantumScale*(double)
+ pixel=(unsigned char) (15.0*QuantumScale*(double)
GetPixelAlpha(image,p)+0.5);
*q|=((pixel & 0xf) << 0);
p+=(ptrdiff_t) GetPixelChannels(image);
@@ -3827,7 +3835,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
r=GetAuthenticPixelQueue(image);
else
r=GetCacheViewAuthenticPixelQueue(image_view);
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < (ssize_t) number_pixels; x++)
{
ssize_t
i;