Commit 9f7e3cb14 for imagemagick.org
commit 9f7e3cb14c4d2a61fd72f9d6696ddd0d18dde216
Author: Cristy <urban-warrior@imagemagick.org>
Date: Tue Jun 23 09:36:56 2026 -0400
change coder flag name
diff --git a/MagickCore/constitute-private.h b/MagickCore/constitute-private.h
index 45ca0842c..36df9fc6a 100644
--- a/MagickCore/constitute-private.h
+++ b/MagickCore/constitute-private.h
@@ -39,15 +39,15 @@ static inline Image *StrictReadImage(const ImageInfo *image_info,
if (*magic != '\0')
{
const MagickInfo *magick_info = GetMagickInfo(magic,exception);
- if ((magick_info == (const MagickInfo *) NULL) ||
- (GetMagickStrictStream(magick_info) != MagickFalse))
+ if ((magick_info != (const MagickInfo *) NULL) &&
+ (GetMagickExplicitAllowed(magick_info) != MagickFalse))
+ return(ReadImage(image_info,exception));
+ else
{
(void) ThrowMagickException(exception,GetMagickModule(),ImageError,
"ExplicitCoderNotAllowed","`%s'",image_info->filename);
return((Image *) NULL);
}
- else
- return(ReadImage(image_info,exception));
}
if (IsPathAccessible(image_info->filename) == MagickFalse)
{
diff --git a/MagickCore/magick-private.h b/MagickCore/magick-private.h
index c5d61254e..c1b2b016b 100644
--- a/MagickCore/magick-private.h
+++ b/MagickCore/magick-private.h
@@ -22,12 +22,12 @@
extern "C" {
#endif
-static inline MagickBooleanType GetMagickStrictStream(
+static inline MagickBooleanType GetMagickExplicitAllowed(
const MagickInfo *magick_info)
{
assert(magick_info != (MagickInfo *) NULL);
assert(magick_info->signature == MagickCoreSignature);
- return(((magick_info->flags & CoderStrictStreamFlag) == 0) ? MagickFalse :
+ return(((magick_info->flags & CoderExplicitAllowedFlag) == 0) ? MagickFalse :
MagickTrue);
}
diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index 59c16099e..a72fd8241 100644
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -187,7 +187,7 @@ MagickExport MagickInfo *AcquireMagickInfo(const char *magick_module,
magick_info->description=ConstantString(description);
magick_info->flags=CoderAdjoinFlag | CoderBlobSupportFlag |
CoderDecoderThreadSupportFlag | CoderEncoderThreadSupportFlag |
- CoderUseExtensionFlag | CoderStrictStreamFlag;
+ CoderUseExtensionFlag;
magick_info->signature=MagickCoreSignature;
return(magick_info);
}
diff --git a/MagickCore/magick.h b/MagickCore/magick.h
index 265ff2952..2480ed3e1 100644
--- a/MagickCore/magick.h
+++ b/MagickCore/magick.h
@@ -52,7 +52,7 @@ typedef enum
CoderUseExtensionFlag = 0x0100,
CoderDecoderSeekableStreamFlag = 0x0200,
CoderEncoderSeekableStreamFlag = 0x0400,
- CoderStrictStreamFlag = 0x0800
+ CoderExplicitAllowedFlag = 0x0800
} MagickInfoFlag;
typedef Image
diff --git a/coders/inline.c b/coders/inline.c
index 9ee14ab6b..f20979a18 100644
--- a/coders/inline.c
+++ b/coders/inline.c
@@ -211,13 +211,13 @@ ModuleExport size_t RegisterINLINEImage(void)
entry->decoder=(DecodeImageHandler *) ReadINLINEImage;
entry->encoder=(EncodeImageHandler *) WriteINLINEImage;
entry->format_type=ImplicitFormatType;
- entry->flags^=CoderStrictStreamFlag;
+ entry->flags|=CoderExplicitAllowedFlag;
(void) RegisterMagickInfo(entry);
entry=AcquireMagickInfo("INLINE","INLINE","Base64-encoded inline images");
entry->decoder=(DecodeImageHandler *) ReadINLINEImage;
entry->encoder=(EncodeImageHandler *) WriteINLINEImage;
entry->format_type=ImplicitFormatType;
- entry->flags^=CoderStrictStreamFlag;
+ entry->flags|=CoderExplicitAllowedFlag;
(void) RegisterMagickInfo(entry);
return(MagickImageCoderSignature);
}
diff --git a/coders/mpr.c b/coders/mpr.c
index 62996d201..11d2a81aa 100644
--- a/coders/mpr.c
+++ b/coders/mpr.c
@@ -142,15 +142,15 @@ ModuleExport size_t RegisterMPRImage(void)
entry->encoder=(EncodeImageHandler *) WriteMPRImage;
entry->format_type=ImplicitFormatType;
entry->flags|=CoderStealthFlag;
+ entry->flags|=CoderExplicitAllowedFlag;
entry->flags^=CoderAdjoinFlag;
- entry->flags^=CoderStrictStreamFlag;
(void) RegisterMagickInfo(entry);
entry=AcquireMagickInfo("MPR","MPRI","Magick Persistent Registry");
entry->decoder=(DecodeImageHandler *) ReadMPRImage;
entry->encoder=(EncodeImageHandler *) WriteMPRImage;
entry->format_type=ImplicitFormatType;
entry->flags|=CoderStealthFlag;
- entry->flags^=CoderStrictStreamFlag;
+ entry->flags|=CoderExplicitAllowedFlag;
entry->flags^=CoderAdjoinFlag;
(void) RegisterMagickInfo(entry);
return(MagickImageCoderSignature);