File ImageMagick-CVE-2026-25576.patch of Package ImageMagick.42997
From 077b42643212d7da8c1a4f6b2cd0067ebca8ec0f Mon Sep 17 00:00:00 2001
From: Dirk Lemstra <dirk@lemstra.org>
Date: Sun, 25 Jan 2026 19:21:20 +0100
Subject: [PATCH] Fixed out of bounds read in multiple coders that read raw
pixel data (GHSA-jv4p-gjwq-9r2j)
---
coders/bgr.c | 22 ++++++++++++----------
coders/cmyk.c | 26 ++++++++++++++------------
coders/gray.c | 14 ++++++++------
coders/raw.c | 4 +++-
coders/rgb.c | 26 +++++++++++++++-----------
coders/ycbcr.c | 22 ++++++++++++----------
6 files changed, 64 insertions(+), 50 deletions(-)
Index: ImageMagick-7.1.1-21/coders/bgr.c
===================================================================
--- ImageMagick-7.1.1-21.orig/coders/bgr.c
+++ ImageMagick-7.1.1-21/coders/bgr.c
@@ -125,6 +125,7 @@ static Image *ReadBGRImage(const ImageIn
length;
ssize_t
+ columns,
count,
y;
@@ -203,6 +204,7 @@ static Image *ReadBGRImage(const ImageIn
scene=0;
status=MagickTrue;
stream=NULL;
+ columns=(ssize_t) MagickMin(image->columns,canvas_image->columns);
do
{
/*
@@ -264,7 +266,7 @@ static Image *ReadBGRImage(const ImageIn
if ((p == (const Quantum *) NULL) ||
(q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
@@ -347,7 +349,7 @@ static Image *ReadBGRImage(const ImageIn
if ((p == (const Quantum *) NULL) ||
(q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
switch (quantum_type)
{
@@ -443,7 +445,7 @@ static Image *ReadBGRImage(const ImageIn
if ((p == (const Quantum *) NULL) ||
(q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -496,7 +498,7 @@ static Image *ReadBGRImage(const ImageIn
if ((p == (const Quantum *) NULL) ||
(q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -549,7 +551,7 @@ static Image *ReadBGRImage(const ImageIn
if ((p == (const Quantum *) NULL) ||
(q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -611,7 +613,7 @@ static Image *ReadBGRImage(const ImageIn
if ((p == (const Quantum *) NULL) ||
(q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -702,7 +704,7 @@ static Image *ReadBGRImage(const ImageIn
if ((p == (const Quantum *) NULL) ||
(q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -773,7 +775,7 @@ static Image *ReadBGRImage(const ImageIn
if ((p == (const Quantum *) NULL) ||
(q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -844,7 +846,7 @@ static Image *ReadBGRImage(const ImageIn
if ((p == (const Quantum *) NULL) ||
(q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -917,7 +919,7 @@ static Image *ReadBGRImage(const ImageIn
if ((p == (const Quantum *) NULL) ||
(q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
Index: ImageMagick-7.1.1-21/coders/cmyk.c
===================================================================
--- ImageMagick-7.1.1-21.orig/coders/cmyk.c
+++ ImageMagick-7.1.1-21/coders/cmyk.c
@@ -125,6 +125,7 @@ static Image *ReadCMYKImage(const ImageI
length;
ssize_t
+ columns,
count,
y;
@@ -202,6 +203,7 @@ static Image *ReadCMYKImage(const ImageI
scene=0;
status=MagickTrue;
stream=NULL;
+ columns=(ssize_t) MagickMin(image->columns,canvas_image->columns);
do
{
/*
@@ -264,7 +266,7 @@ static Image *ReadCMYKImage(const ImageI
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
@@ -348,7 +350,7 @@ static Image *ReadCMYKImage(const ImageI
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
switch (quantum_type)
{
@@ -443,7 +445,7 @@ static Image *ReadCMYKImage(const ImageI
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -495,7 +497,7 @@ static Image *ReadCMYKImage(const ImageI
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -547,7 +549,7 @@ static Image *ReadCMYKImage(const ImageI
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -599,7 +601,7 @@ static Image *ReadCMYKImage(const ImageI
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelBlack(image,GetPixelBlack(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -654,7 +656,7 @@ static Image *ReadCMYKImage(const ImageI
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -744,7 +746,7 @@ static Image *ReadCMYKImage(const ImageI
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -814,7 +816,7 @@ static Image *ReadCMYKImage(const ImageI
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -885,7 +887,7 @@ static Image *ReadCMYKImage(const ImageI
if ((p == (const Quantum *) NULL) ||
(q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -956,7 +958,7 @@ static Image *ReadCMYKImage(const ImageI
if ((p == (const Quantum *) NULL) ||
(q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelBlack(image,GetPixelBlack(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -1029,7 +1031,7 @@ static Image *ReadCMYKImage(const ImageI
if ((p == (const Quantum *) NULL) ||
(q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
Index: ImageMagick-7.1.1-21/coders/gray.c
===================================================================
--- ImageMagick-7.1.1-21.orig/coders/gray.c
+++ ImageMagick-7.1.1-21/coders/gray.c
@@ -126,6 +126,7 @@ static Image *ReadGRAYImage(const ImageI
length;
ssize_t
+ columns,
count,
y;
@@ -203,6 +204,7 @@ static Image *ReadGRAYImage(const ImageI
scene=0;
status=MagickTrue;
stream=NULL;
+ columns=(ssize_t) MagickMin(image->columns,canvas_image->columns);
do
{
/*
@@ -263,7 +265,7 @@ static Image *ReadGRAYImage(const ImageI
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
@@ -343,7 +345,7 @@ static Image *ReadGRAYImage(const ImageI
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
switch (quantum_type)
{
@@ -423,7 +425,7 @@ static Image *ReadGRAYImage(const ImageI
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelGray(image,GetPixelGray(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -478,7 +480,7 @@ static Image *ReadGRAYImage(const ImageI
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -568,7 +570,7 @@ static Image *ReadGRAYImage(const ImageI
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -641,7 +643,7 @@ static Image *ReadGRAYImage(const ImageI
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
Index: ImageMagick-7.1.1-21/coders/raw.c
===================================================================
--- ImageMagick-7.1.1-21.orig/coders/raw.c
+++ ImageMagick-7.1.1-21/coders/raw.c
@@ -119,6 +119,7 @@ static Image *ReadRAWImage(const ImageIn
length;
ssize_t
+ columns,
count,
y;
@@ -187,6 +188,7 @@ static Image *ReadRAWImage(const ImageIn
length=0;
status=MagickTrue;
stream=NULL;
+ columns=(ssize_t) MagickMin(image->columns,canvas_image->columns);
do
{
/*
@@ -239,7 +241,7 @@ static Image *ReadRAWImage(const ImageIn
1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
Index: ImageMagick-7.1.1-21/coders/rgb.c
===================================================================
--- ImageMagick-7.1.1-21.orig/coders/rgb.c
+++ ImageMagick-7.1.1-21/coders/rgb.c
@@ -126,6 +126,7 @@ static Image *ReadRGBImage(const ImageIn
ssize_t
count,
+ columns,
y;
unsigned char
@@ -206,6 +207,7 @@ static Image *ReadRGBImage(const ImageIn
scene=0;
status=MagickTrue;
stream=NULL;
+ columns=(ssize_t) MagickMin(image->columns,canvas_image->columns);
do
{
/*
@@ -266,7 +268,7 @@ static Image *ReadRGBImage(const ImageIn
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
@@ -350,7 +352,7 @@ static Image *ReadRGBImage(const ImageIn
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
switch (quantum_type)
{
@@ -445,7 +447,7 @@ static Image *ReadRGBImage(const ImageIn
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -497,7 +499,7 @@ static Image *ReadRGBImage(const ImageIn
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -549,7 +551,7 @@ static Image *ReadRGBImage(const ImageIn
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -603,7 +605,7 @@ static Image *ReadRGBImage(const ImageIn
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -693,7 +695,7 @@ static Image *ReadRGBImage(const ImageIn
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -763,7 +765,7 @@ static Image *ReadRGBImage(const ImageIn
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -833,7 +835,7 @@ static Image *ReadRGBImage(const ImageIn
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -905,7 +907,7 @@ static Image *ReadRGBImage(const ImageIn
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -1021,6 +1023,7 @@ static Image *ReadRGB565Image(const Imag
length;
ssize_t
+ columns,
count,
y;
@@ -1090,6 +1093,7 @@ static Image *ReadRGB565Image(const Imag
scene=0;
status=MagickTrue;
stream=NULL;
+ columns=(ssize_t) MagickMin(image->columns,canvas_image->columns);
do
{
/*
@@ -1143,7 +1147,7 @@ static Image *ReadRGB565Image(const Imag
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
unsigned short
pixel;
Index: ImageMagick-7.1.1-21/coders/ycbcr.c
===================================================================
--- ImageMagick-7.1.1-21.orig/coders/ycbcr.c
+++ ImageMagick-7.1.1-21/coders/ycbcr.c
@@ -125,6 +125,7 @@ static Image *ReadYCBCRImage(const Image
length;
ssize_t
+ columns,
count,
y;
@@ -202,6 +203,7 @@ static Image *ReadYCBCRImage(const Image
scene=0;
status=MagickTrue;
stream=NULL;
+ columns=(ssize_t) MagickMin(image->columns,canvas_image->columns);
do
{
/*
@@ -264,7 +266,7 @@ static Image *ReadYCBCRImage(const Image
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
@@ -346,7 +348,7 @@ static Image *ReadYCBCRImage(const Image
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
switch (quantum_type)
{
@@ -436,7 +438,7 @@ static Image *ReadYCBCRImage(const Image
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -488,7 +490,7 @@ static Image *ReadYCBCRImage(const Image
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -540,7 +542,7 @@ static Image *ReadYCBCRImage(const Image
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -594,7 +596,7 @@ static Image *ReadYCBCRImage(const Image
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -684,7 +686,7 @@ static Image *ReadYCBCRImage(const Image
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -754,7 +756,7 @@ static Image *ReadYCBCRImage(const Image
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -824,7 +826,7 @@ static Image *ReadYCBCRImage(const Image
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
@@ -896,7 +898,7 @@ static Image *ReadYCBCRImage(const Image
image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (x=0; x < columns; x++)
{
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
p+=GetPixelChannels(canvas_image);
