Commit 178bde994 for imagemagick.org
commit 178bde994c01b5fe939560da0d7ef68cdbd4558c
Author: Dirk Lemstra <dirk@lemstra.org>
Date: Tue Jan 27 21:28:14 2026 +0100
More changes to improve the readability.
diff --git a/coders/pcd.c b/coders/pcd.c
index 30eaf88d2..00924e58e 100644
--- a/coders/pcd.c
+++ b/coders/pcd.c
@@ -167,9 +167,7 @@ static MagickBooleanType DecodeImage(Image *image,unsigned char *luma,
size_t
bits,
- length,
plane,
- pcd_length[3],
row,
sum;
@@ -177,6 +175,7 @@ static MagickBooleanType DecodeImage(Image *image,unsigned char *luma,
i,
j,
pcd_count,
+ pcd_length[3],
quantum;
unsigned char
@@ -210,8 +209,8 @@ static MagickBooleanType DecodeImage(Image *image,unsigned char *luma,
for (i=0; i < pcd_count; i++)
{
PCDGetBits(8);
- length=(sum & 0xff)+1;
- pcd_table[i]=(PCDTable *) AcquireQuantumMemory(length,
+ pcd_length[i]=(ssize_t) (sum & 0xff)+1;
+ pcd_table[i]=(PCDTable *) AcquireQuantumMemory((size_t) pcd_length[i],
sizeof(*pcd_table[i]));
if (pcd_table[i] == (PCDTable *) NULL)
{
@@ -222,7 +221,7 @@ static MagickBooleanType DecodeImage(Image *image,unsigned char *luma,
image->filename);
}
r=pcd_table[i];
- for (j=0; j < (ssize_t) length; j++)
+ for (j=0; j < pcd_length[i]; j++)
{
PCDGetBits(8);
r->length=(unsigned int) (sum & 0xff)+1;
@@ -240,7 +239,6 @@ static MagickBooleanType DecodeImage(Image *image,unsigned char *luma,
r->mask=(~((1U << (32-r->length))-1));
r++;
}
- pcd_length[i]=(size_t) length;
}
if (EOFBlob(image) == MagickFalse)
{
@@ -259,7 +257,6 @@ static MagickBooleanType DecodeImage(Image *image,unsigned char *luma,
/*
Recover the Huffman encoded luminance and chrominance deltas.
*/
- length=0;
plane=0;
row=0;
for (q=luma; EOFBlob(image) == MagickFalse; )
@@ -304,14 +301,13 @@ static MagickBooleanType DecodeImage(Image *image,unsigned char *luma,
image->filename);
}
}
- length=pcd_length[plane];
continue;
}
/*
Decode luminance or chrominance deltas.
*/
r=pcd_table[plane];
- for (i=0; ((i < (ssize_t) length) && ((sum & r->mask) != r->sequence)); i++)
+ for (i=0; ((i < pcd_length[plane]) && ((sum & r->mask) != r->sequence)); i++)
r++;
if ((row > image->rows) || (r == (PCDTable *) NULL))
{