Commit 4d3d052db for imagemagick.org
commit 4d3d052dbc3839c4e31c084b3b87a8c3be48994b
Author: Cristy <urban-warrior@imagemagick.org>
Date: Sun Aug 2 06:52:35 2026 -0400
correct exception tag
diff --git a/coders/dds.c b/coders/dds.c
index 329319888..767b0a6f5 100644
--- a/coders/dds.c
+++ b/coders/dds.c
@@ -2583,7 +2583,7 @@ static MagickBooleanType ReadUncompressedRGB(const ImageInfo *image_info,
(void) SetImageType(image,GrayscaleType,exception);
else if (dds_info->pixelformat.rgb_bitcount == 16 && !IsBitMask(
dds_info->pixelformat,0xf800,0x07e0,0x001f,0x0000))
- ThrowBinaryException(CorruptImageError,"ImageTypeNotSupported",
+ ThrowBinaryException(ImageError,"ImageTypeNotSupported",
image->filename);
if (ReadUncompressedRGBPixels(image,dds_info,exception) == MagickFalse)
@@ -2601,7 +2601,7 @@ static MagickBooleanType ReadUncompressedAlpha(const ImageInfo *image_info,
ExceptionInfo *exception)
{
if (dds_info->pixelformat.rgb_bitcount != 8)
- ThrowBinaryException(CorruptImageError,"ImageTypeNotSupported",
+ ThrowBinaryException(ImageError,"ImageTypeNotSupported",
image->filename);
if (ReadUncompressedAlphaPixels(image,dds_info,exception) == MagickFalse)
@@ -2926,7 +2926,7 @@ static Image *ReadDDSImage(const ImageInfo *image_info,ExceptionInfo *exception)
{
if (dds_info.extDimension != DDSEXT_DIMENSION_TEX2D)
{
- ThrowReaderException(CorruptImageError,"ImageTypeNotSupported");
+ ThrowReaderException(ImageError,"ImageTypeNotSupported");
}
switch (dds_info.extFormat)
@@ -3019,7 +3019,7 @@ static Image *ReadDDSImage(const ImageInfo *image_info,ExceptionInfo *exception)
default:
{
/* Unknown format */
- ThrowReaderException(CorruptImageError,"ImageTypeNotSupported");
+ ThrowReaderException(ImageError,"ImageTypeNotSupported");
}
}
@@ -3032,14 +3032,14 @@ static Image *ReadDDSImage(const ImageInfo *image_info,ExceptionInfo *exception)
default:
{
/* Unknown FOURCC */
- ThrowReaderException(CorruptImageError,"ImageTypeNotSupported");
+ ThrowReaderException(ImageError,"ImageTypeNotSupported");
}
}
}
else
{
/* Neither compressed nor uncompressed... thus unsupported */
- ThrowReaderException(CorruptImageError,"ImageTypeNotSupported");
+ ThrowReaderException(ImageError,"ImageTypeNotSupported");
}
num_images = 1;
diff --git a/coders/fpx.c b/coders/fpx.c
index 732baa895..5de9190ca 100644
--- a/coders/fpx.c
+++ b/coders/fpx.c
@@ -258,7 +258,7 @@ static Image *ReadFPXImage(const ImageInfo *image_info,ExceptionInfo *exception)
{
FPXRelinquishSummaryInfo(&summary_info);
FPX_ClearSystem();
- ThrowReaderException(CorruptImageError,"ImageTypeNotSupported");
+ ThrowReaderException(ImageError,"ImageTypeNotSupported");
}
option=GetImageOption(image_info,"fpx:view");
if (option == (const char *) NULL)
diff --git a/coders/heic.c b/coders/heic.c
index 77aa64df9..c44cec158 100644
--- a/coders/heic.c
+++ b/coders/heic.c
@@ -1033,7 +1033,7 @@ static Image *ReadHEICImage(const ImageInfo *image_info,ExceptionInfo *exception
#else
if (heif_check_filetype(magic,sizeof(magic)) == heif_filetype_no)
#endif
- ThrowReaderException(CorruptImageError,"ImageTypeNotSupported");
+ ThrowReaderException(ImageError,"ImageTypeNotSupported");
(void) CloseBlob(image);
#if LIBHEIF_NUMERIC_VERSION >= HEIC_COMPUTE_NUMERIC_VERSION(1,11,0)
if (heif_has_compatible_brand(magic,sizeof(magic), "avif") == 1)
diff --git a/coders/inline.c b/coders/inline.c
index f20979a18..6ba59254a 100644
--- a/coders/inline.c
+++ b/coders/inline.c
@@ -318,7 +318,7 @@ static MagickBooleanType WriteINLINEImage(const ImageInfo *image_info,
(GetMagickMimeType(magick_info) == (const char *) NULL))
{
write_info=DestroyImageInfo(write_info);
- ThrowWriterException(CorruptImageError,"ImageTypeNotSupported");
+ ThrowWriterException(ImageError,"ImageTypeNotSupported");
}
(void) CopyMagickString(image->filename,write_info->filename,
MagickPathExtent);
diff --git a/coders/jpeg.c b/coders/jpeg.c
index 6f7158708..abefdea74 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1897,7 +1897,7 @@ static Image *ReadOneJPEGImage(const ImageInfo *image_info,
(jpeg_info->output_components != 4))
{
client_info=JPEGCleanup(jpeg_info,client_info);
- ThrowReaderException(CorruptImageError,"ImageTypeNotSupported");
+ ThrowReaderException(ImageError,"ImageTypeNotSupported");
}
bytes_per_pixel=((size_t) jpeg_info->data_precision+7)/8;
memory_info=AcquireVirtualMemory((size_t) image->columns,
diff --git a/coders/qoi.c b/coders/qoi.c
index 12a71ee94..43cc4db2c 100644
--- a/coders/qoi.c
+++ b/coders/qoi.c
@@ -487,7 +487,7 @@ static MagickBooleanType WriteQOIImage(const ImageInfo *image_info,Image *image,
(quantum_type == IndexAlphaQuantum))
channels=4;
else
- ThrowWriterException(CorruptImageError,"ImageTypeNotSupported");
+ ThrowWriterException(ImageError,"ImageTypeNotSupported");
/*
Write QOI header.
*/
diff --git a/coders/sf3.c b/coders/sf3.c
index 45b097cb6..ba747151c 100644
--- a/coders/sf3.c
+++ b/coders/sf3.c
@@ -645,7 +645,7 @@ static MagickBooleanType WriteSF3Image(const ImageInfo *image_info,Image *image,
break;
default:
quantum_info=DestroyQuantumInfo(quantum_info);
- ThrowWriterException(CorruptImageError,"ImageTypeNotSupported");
+ ThrowWriterException(ImageError,"ImageTypeNotSupported");
break;
}
switch (quantum_format)
@@ -715,7 +715,7 @@ static MagickBooleanType WriteSF3Image(const ImageInfo *image_info,Image *image,
break;
default:
quantum_info=DestroyQuantumInfo(quantum_info);
- ThrowWriterException(CorruptImageError,"ImageTypeNotSupported");
+ ThrowWriterException(ImageError,"ImageTypeNotSupported");
break;
}
/*
diff --git a/coders/tim2.c b/coders/tim2.c
index fd6a51e85..9f6208088 100644
--- a/coders/tim2.c
+++ b/coders/tim2.c
@@ -656,7 +656,7 @@ static Image *ReadTIM2Image(const ImageInfo *image_info,
ThrowReaderException(CorruptImageError,"ImproperImageHeader");
file_header.format_vers=(unsigned char) ReadBlobByte(image);
if (file_header.format_vers != 0x04)
- ThrowReaderException(CorruptImageError,"ImageTypeNotSupported");
+ ThrowReaderException(ImageError,"ImageTypeNotSupported");
file_header.format_type=(unsigned char) ReadBlobByte(image);
file_header.image_count=ReadBlobLSBShort(image);
if (DiscardBlobBytes(image,8) == MagickFalse) /* reserved */
diff --git a/config/english.xml b/config/english.xml
index 71dad49d5..f8453ace9 100644
--- a/config/english.xml
+++ b/config/english.xml
@@ -261,9 +261,6 @@
<message name="ImageFileDoesNotContainAnyImageData">
image file does not contain any image data
</message>
- <message name="ImageTypeNotSupported">
- image type not supported
- </message>
<message name="ImproperImageHeader">
improper image header
</message>
@@ -530,6 +527,9 @@
<message name="ImageSizeLimitExceeded">
Image dimension exceeds maximum supported size
</message>
+ <message name="ImageTypeNotSupported">
+ image type not supported
+ </message>
<message name="NegativeOrZeroImageSize">
negative or zero image size
</message>
diff --git a/config/francais.xml b/config/francais.xml
index a1f880688..7d4a70640 100644
--- a/config/francais.xml
+++ b/config/francais.xml
@@ -261,12 +261,6 @@
<message name="ImageFileDoesNotContainAnyImageData">
le fichier image ne contient pas de données d'image
</message>
- <message name="ImageTypeNotSupported">
- type d'image non supporté
- </message>
- <message name="ImproperImageHeader">
- En-tête d'image incorrect
- </message>
<message name="InsufficientImageDataInFile">
Pas assez de données d'image dans le fichier
</message>
@@ -540,6 +534,9 @@
<message name="ImageSizeLimitExceeded">
Image dimension exceeds maximum supported size
</message>
+ <message name="ImproperImageHeader">
+ En-tête d'image incorrect
+ </message>
<message name="NegativeOrZeroImageSize">
Taille d'image négative ou nulle
</message>