Commit a651fab9f for imagemagick.org
commit a651fab9f2257d6dcaa2350b57514548fe795ab2
Author: Dirk Lemstra <dirk@lemstra.org>
Date: Sat Nov 7 21:22:56 2026 +0100
Use a more readable style to check the status.
diff --git a/coders/dds.c b/coders/dds.c
index 46f0ec7e9..fd43aba0c 100644
--- a/coders/dds.c
+++ b/coders/dds.c
@@ -4064,9 +4064,12 @@ static MagickBooleanType WriteFourCC(Image *image, const size_t compression,
*p;
status=MagickTrue;
- for (y=0; (y < (ssize_t) image->rows) && (status != MagickFalse); y+=4)
+ for (y=0; y < (ssize_t) image->rows; y+=4)
{
- for (x=0; (x < (ssize_t) image->columns) && (status != MagickFalse); x+=4)
+ if (status == MagickFalse)
+ break;
+
+ for (x=0; x < (ssize_t) image->columns; x+=4)
{
MagickBooleanType
match;
@@ -4091,6 +4094,8 @@ static MagickBooleanType WriteFourCC(Image *image, const size_t compression,
unsigned char
alpha;
+ if (status == MagickFalse)
+ break;
if ((size_t) (x+(ssize_t) columns) >= image->columns)
columns = (size_t) ((ssize_t) image->columns-x);
diff --git a/coders/ftxt.c b/coders/ftxt.c
index 80f46a8ba..7b318dea1 100644
--- a/coders/ftxt.c
+++ b/coders/ftxt.c
@@ -924,15 +924,17 @@ static MagickBooleanType WriteFTXTImage(const ImageInfo *image_info,
y;
GetPixelInfo(image,&pixel);
- for (y=0; (y < (long) image->rows) && (status != MagickFalse); y++)
+ for (y=0; y < (long) image->rows; y++)
{
+ if (status == MagickFalse)
+ break;
p=GetVirtualPixels(image,0,y,image->columns,1,exception);
if (p == (const Quantum *) NULL)
{
status=MagickFalse;
break;
}
- for (x=0; (x < (long) image->columns) && (status != MagickFalse); x++)
+ for (x=0; x < (long) image->columns; x++)
{
const char
*pFmt;
@@ -944,12 +946,16 @@ static MagickBooleanType WriteFTXTImage(const ImageInfo *image_info,
fltHexFmt,
hexFmt;
+ if (status == MagickFalse)
+ break;
valMult=1.0;
hexFmt=MagickFalse;
fltHexFmt=MagickFalse;
pFmt=sFmt;
- while ((*pFmt != '\0') && (status != MagickFalse))
+ while (*pFmt != '\0')
{
+ if (status == MagickFalse)
+ break;
if (*pFmt == chEsc)
{
pFmt++;
@@ -1015,8 +1021,7 @@ static MagickBooleanType WriteFTXTImage(const ImageInfo *image_info,
}
/* Output all "-channel" channels. */
sSep[0]=sSep[1]='\0';
- for (i=0; (i < (ssize_t) GetPixelChannels (image)) &&
- (status != MagickFalse); i++)
+ for (i=0; i < (ssize_t) GetPixelChannels (image); i++)
{
PixelChannel
channel;
@@ -1024,6 +1029,8 @@ static MagickBooleanType WriteFTXTImage(const ImageInfo *image_info,
PixelTrait
traits;
+ if (status == MagickFalse)
+ break;
channel=GetPixelChannelChannel(image,i);
traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) != UpdatePixelTrait)