From: Dirk Lemstra Date: Sun, 22 Jan 2017 02:19:27 +0000 (+0100) Subject: Replaced CoderSeekableStreamFlag with CoderDecoderSeekableStreamFlag and CoderEncoder... X-Git-Tag: 7.0.4-6~24 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8974d77717c67f90b42255446a2a4db360035b1d;p=imagemagick Replaced CoderSeekableStreamFlag with CoderDecoderSeekableStreamFlag and CoderEncoderSeekableStreamFlag. --- diff --git a/ChangeLog b/ChangeLog index e72a37ac2..bd70aa8d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2017-01-22 7.0.4-6 Dirk Lemstra + * Replaced CoderSeekableStreamFlag with CoderDecoderSeekableStreamFlag and + CoderEncoderSeekableStreamFlag. + 2017-01-21 7.0.4-5 Cristy * Release ImageMagick version 7.0.4-5, GIT revision 19381:7ae396f:20170121. diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c index d3f93fe6f..7c943d28e 100644 --- a/MagickCore/constitute.c +++ b/MagickCore/constitute.c @@ -442,7 +442,7 @@ MagickExport Image *ReadImage(const ImageInfo *image_info, } } if ((magick_info != (const MagickInfo *) NULL) && - (GetMagickSeekableStream(magick_info) != MagickFalse)) + (GetMagickDecoderSeekableStream(magick_info) != MagickFalse)) { MagickBooleanType status; @@ -1071,7 +1071,7 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info, status=MagickFalse; temporary=MagickFalse; if ((magick_info != (const MagickInfo *) NULL) && - (GetMagickSeekableStream(magick_info) != MagickFalse)) + (GetMagickEncoderSeekableStream(magick_info) != MagickFalse)) { char image_filename[MagickPathExtent]; diff --git a/MagickCore/deprecate.c b/MagickCore/deprecate.c index 17c692429..1272499d8 100644 --- a/MagickCore/deprecate.c +++ b/MagickCore/deprecate.c @@ -89,5 +89,37 @@ #include "MagickCore/utility.h" #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % ++ G e t M a g i c k S e e k a b l e S t r e a m % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% GetMagickSeekableStream() returns MagickTrue if the magick supports a +% seekable stream. +% +% The format of the GetMagickSeekableStream method is: +% +% MagickBooleanType GetMagickSeekableStream(const MagickInfo *magick_info) +% +% A description of each parameter follows: +% +% o magick_info: The magick info. +% +*/ +MagickExport MagickBooleanType GetMagickSeekableStream( + const MagickInfo *magick_info) +{ + assert(magick_info != (MagickInfo *) NULL); + assert(magick_info->signature == MagickCoreSignature); + return(((magick_info->flags & CoderSeekableStreamFlag) == 0) ? MagickFalse : + MagickTrue); +} #endif diff --git a/MagickCore/deprecate.h b/MagickCore/deprecate.h index f50905071..6551760d8 100644 --- a/MagickCore/deprecate.h +++ b/MagickCore/deprecate.h @@ -24,6 +24,9 @@ extern "C" { #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED) +extern MagickExport MagickBooleanType + GetMagickSeekableStream(const MagickInfo *); + #endif #if defined(__cplusplus) || defined(c_plusplus) diff --git a/MagickCore/magick.c b/MagickCore/magick.c index b1f44aada..89dec54c7 100644 --- a/MagickCore/magick.c +++ b/MagickCore/magick.c @@ -378,6 +378,42 @@ MagickExport MagickBooleanType GetMagickBlobSupport( % % % % % % ++ G e t M a g i c k D e c o d e r S e e k a b l e S t r e a m % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% GetMagickDecoderSeekableStream() returns MagickTrue if the magick supports a +% seekable stream in the decoder. +% +% The format of the GetMagickDecoderSeekableStream method is: +% +% MagickBooleanType GetMagickDecoderSeekableStream( +% const MagickInfo *magick_info) +% +% A description of each parameter follows: +% +% o magick_info: The magick info. +% +*/ +MagickExport MagickBooleanType GetMagickDecoderSeekableStream( + const MagickInfo *magick_info) +{ + assert(magick_info != (MagickInfo *) NULL); + assert(magick_info->signature == MagickCoreSignature); + if ((magick_info->flags & CoderDecoderSeekableStreamFlag) == 0) + return(MagickFalse); + if ((magick_info->flags & CoderSeekableStreamFlag) == 0) + return(MagickFalse); + return(MagickTrue); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % + G e t M a g i c k D e c o d e r T h r e a d S u p p o r t % % % % % @@ -440,6 +476,42 @@ MagickExport const char *GetMagickDescription(const MagickInfo *magick_info) % % % % % % ++ G e t M a g i c k E n c o d e r S e e k a b l e S t r e a m % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% GetMagickEncoderSeekableStream() returns MagickTrue if the magick supports a +% seekable stream in the encoder. +% +% The format of the GetMagickEncoderSeekableStream method is: +% +% MagickBooleanType GetMagickEncoderSeekableStream( +% const MagickInfo *magick_info) +% +% A description of each parameter follows: +% +% o magick_info: The magick info. +% +*/ +MagickExport MagickBooleanType GetMagickEncoderSeekableStream( + const MagickInfo *magick_info) +{ + assert(magick_info != (MagickInfo *) NULL); + assert(magick_info->signature == MagickCoreSignature); + if ((magick_info->flags & CoderEncoderSeekableStreamFlag) == 0) + return(MagickFalse); + if ((magick_info->flags & CoderSeekableStreamFlag) == 0) + return(MagickFalse); + return(MagickTrue); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % + G e t M a g i c k E n c o d e r T h r e a d S u p p o r t % % % % % @@ -845,39 +917,8 @@ MagickExport MagickBooleanType GetMagickRawSupport( return(((magick_info->flags & CoderRawSupportFlag) == 0) ? MagickFalse : MagickTrue); } - -/* -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% % -% % -% % -+ G e t M a g i c k S e e k a b l e S t r e a m % -% % -% % -% % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% GetMagickSeekableStream() returns MagickTrue if the magick supports a -% seekable stream. -% -% The format of the GetMagickSeekableStream method is: -% -% MagickBooleanType GetMagickSeekableStream(const MagickInfo *magick_info) -% -% A description of each parameter follows: -% -% o magick_info: The magick info. -% -*/ -MagickExport MagickBooleanType GetMagickSeekableStream( - const MagickInfo *magick_info) -{ - assert(magick_info != (MagickInfo *) NULL); - assert(magick_info->signature == MagickCoreSignature); - return(((magick_info->flags & CoderSeekableStreamFlag) == 0) ? MagickFalse : - MagickTrue); -} - + + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % @@ -907,7 +948,8 @@ MagickExport MagickBooleanType GetMagickStealth(const MagickInfo *magick_info) return(((magick_info->flags & CoderStealthFlag) == 0) ? MagickFalse : MagickTrue); } - + + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % diff --git a/MagickCore/magick.h b/MagickCore/magick.h index 6b0418086..bfa3318f5 100644 --- a/MagickCore/magick.h +++ b/MagickCore/magick.h @@ -41,9 +41,12 @@ typedef enum CoderEncoderThreadSupportFlag = 0x0008, CoderEndianSupportFlag = 0x0010, CoderRawSupportFlag = 0x0020, - CoderSeekableStreamFlag = 0x0040, + CoderSeekableStreamFlag = 0x0040, /* deprecated */ CoderStealthFlag = 0x0080, - CoderUseExtensionFlag = 0x0100 + CoderUseExtensionFlag = 0x0100, + CoderDecoderSeekableStreamFlag = 0x0200, + CoderEncoderSeekableStreamFlag = 0x0400, + } MagickInfoFlag; typedef Image @@ -114,11 +117,12 @@ extern MagickExport MagickBooleanType GetImageMagick(const unsigned char *,const size_t,char *), GetMagickAdjoin(const MagickInfo *), GetMagickBlobSupport(const MagickInfo *), + GetMagickDecoderSeekableStream(const MagickInfo *), GetMagickDecoderThreadSupport(const MagickInfo *), + GetMagickEncoderSeekableStream(const MagickInfo *), GetMagickEncoderThreadSupport(const MagickInfo *), GetMagickEndianSupport(const MagickInfo *), GetMagickRawSupport(const MagickInfo *), - GetMagickSeekableStream(const MagickInfo *), GetMagickStealth(const MagickInfo *), GetMagickUseExtension(const MagickInfo *), IsMagickCoreInstantiated(void), diff --git a/coders/bmp.c b/coders/bmp.c index f6d5aeff6..04011f7b6 100644 --- a/coders/bmp.c +++ b/coders/bmp.c @@ -1446,19 +1446,19 @@ ModuleExport size_t RegisterBMPImage(void) entry->encoder=(EncodeImageHandler *) WriteBMPImage; entry->magick=(IsImageFormatHandler *) IsBMP; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("BMP","BMP2","Microsoft Windows bitmap image (V2)"); entry->encoder=(EncodeImageHandler *) WriteBMPImage; entry->magick=(IsImageFormatHandler *) IsBMP; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("BMP","BMP3","Microsoft Windows bitmap image (V3)"); entry->encoder=(EncodeImageHandler *) WriteBMPImage; entry->magick=(IsImageFormatHandler *) IsBMP; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/cut.c b/coders/cut.c index 179f6858b..6343371a5 100644 --- a/coders/cut.c +++ b/coders/cut.c @@ -636,7 +636,7 @@ ModuleExport size_t RegisterCUTImage(void) entry=AcquireMagickInfo("CUT","CUT","DR Halo"); entry->decoder=(DecodeImageHandler *) ReadCUTImage; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/dcm.c b/coders/dcm.c index 55972c5ec..3db81a380 100644 --- a/coders/dcm.c +++ b/coders/dcm.c @@ -4165,7 +4165,7 @@ ModuleExport size_t RegisterDCMImage(void) entry->decoder=(DecodeImageHandler *) ReadDCMImage; entry->magick=(IsImageFormatHandler *) IsDCM; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; entry->note=ConstantString(DCMNote); (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); diff --git a/coders/dds.c b/coders/dds.c index bcdaa82cd..742a148dc 100644 --- a/coders/dds.c +++ b/coders/dds.c @@ -2323,19 +2323,19 @@ ModuleExport size_t RegisterDDSImage(void) entry->decoder = (DecodeImageHandler *) ReadDDSImage; entry->encoder = (EncodeImageHandler *) WriteDDSImage; entry->magick = (IsImageFormatHandler *) IsDDS; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry = AcquireMagickInfo("DDS","DXT1","Microsoft DirectDraw Surface"); entry->decoder = (DecodeImageHandler *) ReadDDSImage; entry->encoder = (EncodeImageHandler *) WriteDDSImage; entry->magick = (IsImageFormatHandler *) IsDDS; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry = AcquireMagickInfo("DDS","DXT5","Microsoft DirectDraw Surface"); entry->decoder = (DecodeImageHandler *) ReadDDSImage; entry->encoder = (EncodeImageHandler *) WriteDDSImage; entry->magick = (IsImageFormatHandler *) IsDDS; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/dng.c b/coders/dng.c index 44b1df962..fe5b8d7fe 100644 --- a/coders/dng.c +++ b/coders/dng.c @@ -302,139 +302,116 @@ ModuleExport size_t RegisterDNGImage(void) entry=AcquireMagickInfo("DNG","3FR","Hasselblad CFV/H3D39II"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","ARW","Sony Alpha Raw Image Format"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","DNG","Digital Negative"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","CR2","Canon Digital Camera Raw Image Format"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","CRW","Canon Digital Camera Raw Image Format"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","DCR","Kodak Digital Camera Raw Image File"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","ERF","Epson RAW Format"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","IIQ","Phase One Raw Image Format"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","KDC","Kodak Digital Camera Raw Image Format"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","K25","Kodak Digital Camera Raw Image Format"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","MEF","Mamiya Raw Image File"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","MRW","Sony (Minolta) Raw Image File"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","NEF","Nikon Digital SLR Camera Raw Image File"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","NRW","Nikon Digital SLR Camera Raw Image File"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","ORF","Olympus Digital Camera Raw Image File"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","PEF","Pentax Electronic File"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","RAF","Fuji CCD-RAW Graphic File"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","RAW","Raw"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","RMF","Raw Media Format"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","RW2","Panasonic Lumix Raw Image"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","SRF","Sony Raw Format"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","SR2","Sony Raw Format 2"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("DNG","X3F","Sigma Camera RAW Picture File"); entry->decoder=(DecodeImageHandler *) ReadDNGImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->format_type=ExplicitFormatType; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); diff --git a/coders/dpx.c b/coders/dpx.c index f62d5203a..11b434c11 100644 --- a/coders/dpx.c +++ b/coders/dpx.c @@ -1338,7 +1338,7 @@ ModuleExport size_t RegisterDPXImage(void) entry->encoder=(EncodeImageHandler *) WriteDPXImage; entry->magick=(IsImageFormatHandler *) IsDPX; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; entry->note=ConstantString(DPXNote); (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); diff --git a/coders/ept.c b/coders/ept.c index af3b148ab..55d27b97f 100644 --- a/coders/ept.c +++ b/coders/ept.c @@ -284,7 +284,7 @@ ModuleExport size_t RegisterEPTImage(void) entry->decoder=(DecodeImageHandler *) ReadEPTImage; entry->encoder=(EncodeImageHandler *) WriteEPTImage; entry->magick=(IsImageFormatHandler *) IsEPT; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; entry->flags^=CoderAdjoinFlag; entry->flags^=CoderBlobSupportFlag; (void) RegisterMagickInfo(entry); @@ -294,7 +294,7 @@ ModuleExport size_t RegisterEPTImage(void) entry->encoder=(EncodeImageHandler *) WriteEPTImage; entry->magick=(IsImageFormatHandler *) IsEPT; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; entry->flags^=CoderBlobSupportFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("EPT","EPT3", @@ -302,7 +302,7 @@ ModuleExport size_t RegisterEPTImage(void) entry->decoder=(DecodeImageHandler *) ReadEPTImage; entry->encoder=(EncodeImageHandler *) WriteEPTImage; entry->magick=(IsImageFormatHandler *) IsEPT; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; entry->flags^=CoderBlobSupportFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); diff --git a/coders/fits.c b/coders/fits.c index d414fe3d4..2e8604826 100644 --- a/coders/fits.c +++ b/coders/fits.c @@ -542,14 +542,14 @@ ModuleExport size_t RegisterFITSImage(void) entry->encoder=(EncodeImageHandler *) WriteFITSImage; entry->magick=(IsImageFormatHandler *) IsFITS; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("FITS","FTS","Flexible Image Transport System"); entry->decoder=(DecodeImageHandler *) ReadFITSImage; entry->encoder=(EncodeImageHandler *) WriteFITSImage; entry->magick=(IsImageFormatHandler *) IsFITS; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/fpx.c b/coders/fpx.c index 3a87e1ef5..cccb8f6a9 100644 --- a/coders/fpx.c +++ b/coders/fpx.c @@ -503,7 +503,6 @@ ModuleExport size_t RegisterFPXImage(void) entry->encoder=(EncodeImageHandler *) WriteFPXImage; #endif entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; entry->flags^=CoderBlobSupportFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); diff --git a/coders/icon.c b/coders/icon.c index 3b5ee20e3..bbc2e70ec 100644 --- a/coders/icon.c +++ b/coders/icon.c @@ -772,18 +772,21 @@ ModuleExport size_t RegisterICONImage(void) entry->decoder=(DecodeImageHandler *) ReadICONImage; entry->encoder=(EncodeImageHandler *) WriteICONImage; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("ICON","ICO","Microsoft icon"); entry->decoder=(DecodeImageHandler *) ReadICONImage; entry->encoder=(EncodeImageHandler *) WriteICONImage; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("ICON","ICON","Microsoft icon"); entry->decoder=(DecodeImageHandler *) ReadICONImage; entry->encoder=(EncodeImageHandler *) WriteICONImage; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/jnx.c b/coders/jnx.c index ad3d9a678..7a1d3be58 100644 --- a/coders/jnx.c +++ b/coders/jnx.c @@ -358,7 +358,7 @@ ModuleExport size_t RegisterJNXImage(void) entry=AcquireMagickInfo("JNX","JNX","Garmin tile format"); entry->decoder=(DecodeImageHandler *) ReadJNXImage; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/jp2.c b/coders/jp2.c index 1c1fb61a7..f0d821c75 100644 --- a/coders/jp2.c +++ b/coders/jp2.c @@ -549,7 +549,8 @@ ModuleExport size_t RegisterJP2Image(void) entry->mime_type=ConstantString("image/jp2"); entry->magick=(IsImageFormatHandler *) IsJP2; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; #if defined(MAGICKCORE_LIBOPENJP2_DELEGATE) entry->decoder=(DecodeImageHandler *) ReadJP2Image; entry->encoder=(EncodeImageHandler *) WriteJP2Image; @@ -561,7 +562,8 @@ ModuleExport size_t RegisterJP2Image(void) entry->mime_type=ConstantString("image/jp2"); entry->magick=(IsImageFormatHandler *) IsJ2K; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; #if defined(MAGICKCORE_LIBOPENJP2_DELEGATE) entry->decoder=(DecodeImageHandler *) ReadJP2Image; entry->encoder=(EncodeImageHandler *) WriteJP2Image; @@ -573,7 +575,8 @@ ModuleExport size_t RegisterJP2Image(void) entry->mime_type=ConstantString("image/jp2"); entry->magick=(IsImageFormatHandler *) IsJ2K; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; #if defined(MAGICKCORE_LIBOPENJP2_DELEGATE) entry->decoder=(DecodeImageHandler *) ReadJP2Image; entry->encoder=(EncodeImageHandler *) WriteJP2Image; @@ -585,7 +588,8 @@ ModuleExport size_t RegisterJP2Image(void) entry->mime_type=ConstantString("image/jp2"); entry->magick=(IsImageFormatHandler *) IsJP2; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; #if defined(MAGICKCORE_LIBOPENJP2_DELEGATE) entry->decoder=(DecodeImageHandler *) ReadJP2Image; entry->encoder=(EncodeImageHandler *) WriteJP2Image; @@ -597,7 +601,8 @@ ModuleExport size_t RegisterJP2Image(void) entry->mime_type=ConstantString("image/jp2"); entry->magick=(IsImageFormatHandler *) IsJP2; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; #if defined(MAGICKCORE_LIBOPENJP2_DELEGATE) entry->decoder=(DecodeImageHandler *) ReadJP2Image; entry->encoder=(EncodeImageHandler *) WriteJP2Image; @@ -609,7 +614,8 @@ ModuleExport size_t RegisterJP2Image(void) entry->mime_type=ConstantString("image/jp2"); entry->magick=(IsImageFormatHandler *) IsJP2; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; #if defined(MAGICKCORE_LIBOPENJP2_DELEGATE) entry->decoder=(DecodeImageHandler *) ReadJP2Image; entry->encoder=(EncodeImageHandler *) WriteJP2Image; diff --git a/coders/mat.c b/coders/mat.c index acb14db1d..e1623a82e 100644 --- a/coders/mat.c +++ b/coders/mat.c @@ -1372,7 +1372,7 @@ ModuleExport size_t RegisterMATImage(void) entry->decoder=(DecodeImageHandler *) ReadMATImage; entry->encoder=(EncodeImageHandler *) WriteMATImage; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/meta.c b/coders/meta.c index 9dbaa5c35..370dc3780 100644 --- a/coders/meta.c +++ b/coders/meta.c @@ -1410,14 +1410,14 @@ ModuleExport size_t RegisterMETAImage(void) entry->encoder=(EncodeImageHandler *) WriteMETAImage; entry->flags^=CoderAdjoinFlag; entry->flags|=CoderStealthFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("META","8BIMTEXT","Photoshop resource text format"); entry->decoder=(DecodeImageHandler *) ReadMETAImage; entry->encoder=(EncodeImageHandler *) WriteMETAImage; entry->flags^=CoderAdjoinFlag; entry->flags|=CoderStealthFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("META","8BIMWTEXT", "Photoshop resource wide text format"); @@ -1425,70 +1425,70 @@ ModuleExport size_t RegisterMETAImage(void) entry->encoder=(EncodeImageHandler *) WriteMETAImage; entry->flags^=CoderAdjoinFlag; entry->flags|=CoderStealthFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("META","APP1","Raw application information"); entry->decoder=(DecodeImageHandler *) ReadMETAImage; entry->encoder=(EncodeImageHandler *) WriteMETAImage; entry->flags^=CoderAdjoinFlag; entry->flags|=CoderStealthFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("META","APP1JPEG","Raw JPEG binary data"); entry->decoder=(DecodeImageHandler *) ReadMETAImage; entry->encoder=(EncodeImageHandler *) WriteMETAImage; entry->flags^=CoderAdjoinFlag; entry->flags|=CoderStealthFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("META","EXIF","Exif digital camera binary data"); entry->decoder=(DecodeImageHandler *) ReadMETAImage; entry->encoder=(EncodeImageHandler *) WriteMETAImage; entry->flags^=CoderAdjoinFlag; entry->flags|=CoderStealthFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("META","XMP","Adobe XML metadata"); entry->decoder=(DecodeImageHandler *) ReadMETAImage; entry->encoder=(EncodeImageHandler *) WriteMETAImage; entry->flags^=CoderAdjoinFlag; entry->flags|=CoderStealthFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("META","ICM","ICC Color Profile"); entry->decoder=(DecodeImageHandler *) ReadMETAImage; entry->encoder=(EncodeImageHandler *) WriteMETAImage; entry->flags^=CoderAdjoinFlag; entry->flags|=CoderStealthFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("META","ICC","ICC Color Profile"); entry->decoder=(DecodeImageHandler *) ReadMETAImage; entry->encoder=(EncodeImageHandler *) WriteMETAImage; entry->flags^=CoderAdjoinFlag; entry->flags|=CoderStealthFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("META","IPTC","IPTC Newsphoto"); entry->decoder=(DecodeImageHandler *) ReadMETAImage; entry->encoder=(EncodeImageHandler *) WriteMETAImage; entry->flags^=CoderAdjoinFlag; entry->flags|=CoderStealthFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("META","IPTCTEXT","IPTC Newsphoto text format"); entry->decoder=(DecodeImageHandler *) ReadMETAImage; entry->encoder=(EncodeImageHandler *) WriteMETAImage; entry->flags^=CoderAdjoinFlag; entry->flags|=CoderStealthFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("META","IPTCWTEXT","IPTC Newsphoto text format"); entry->decoder=(DecodeImageHandler *) ReadMETAImage; entry->encoder=(EncodeImageHandler *) WriteMETAImage; entry->flags^=CoderAdjoinFlag; entry->flags|=CoderStealthFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/miff.c b/coders/miff.c index 7aa7921a5..954df7c56 100644 --- a/coders/miff.c +++ b/coders/miff.c @@ -1685,7 +1685,7 @@ ModuleExport size_t RegisterMIFFImage(void) entry->decoder=(DecodeImageHandler *) ReadMIFFImage; entry->encoder=(EncodeImageHandler *) WriteMIFFImage; entry->magick=(IsImageFormatHandler *) IsMIFF; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; if (*version != '\0') entry->version=ConstantString(version); (void) RegisterMagickInfo(entry); diff --git a/coders/mpeg.c b/coders/mpeg.c index 74e91d9e8..ba25aa957 100644 --- a/coders/mpeg.c +++ b/coders/mpeg.c @@ -254,63 +254,54 @@ ModuleExport size_t RegisterMPEGImage(void) entry->decoder=(DecodeImageHandler *) ReadMPEGImage; entry->magick=(IsImageFormatHandler *) IsAVI; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("MPEG","MKV","Multimedia Container"); entry->decoder=(DecodeImageHandler *) ReadMPEGImage; entry->encoder=(EncodeImageHandler *) WriteMPEGImage; entry->magick=(IsImageFormatHandler *) IsMPEG; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("MPEG","MOV","MPEG Video Stream"); entry->decoder=(DecodeImageHandler *) ReadMPEGImage; entry->encoder=(EncodeImageHandler *) WriteMPEGImage; entry->magick=(IsImageFormatHandler *) IsMPEG; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("MPEG","MPEG","MPEG Video Stream"); entry->decoder=(DecodeImageHandler *) ReadMPEGImage; entry->encoder=(EncodeImageHandler *) WriteMPEGImage; entry->magick=(IsImageFormatHandler *) IsMPEG; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("MPEG","MPG","MPEG Video Stream"); entry->decoder=(DecodeImageHandler *) ReadMPEGImage; entry->encoder=(EncodeImageHandler *) WriteMPEGImage; entry->magick=(IsImageFormatHandler *) IsMPEG; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("MPEG","MP4","MPEG-4 Video Stream"); entry->decoder=(DecodeImageHandler *) ReadMPEGImage; entry->encoder=(EncodeImageHandler *) WriteMPEGImage; entry->magick=(IsImageFormatHandler *) IsMPEG; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("MPEG","M2V","MPEG Video Stream"); entry->decoder=(DecodeImageHandler *) ReadMPEGImage; entry->encoder=(EncodeImageHandler *) WriteMPEGImage; entry->magick=(IsImageFormatHandler *) IsMPEG; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("MPEG","M4V","Raw MPEG-4 Video"); entry->decoder=(DecodeImageHandler *) ReadMPEGImage; entry->encoder=(EncodeImageHandler *) WriteMPEGImage; entry->magick=(IsImageFormatHandler *) IsMPEG; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("MPEG","WMV","Windows Media Video"); entry->decoder=(DecodeImageHandler *) ReadMPEGImage; entry->encoder=(EncodeImageHandler *) WriteMPEGImage; entry->magick=(IsImageFormatHandler *) IsMPEG; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/mvg.c b/coders/mvg.c index 668e77c8c..499e03573 100644 --- a/coders/mvg.c +++ b/coders/mvg.c @@ -255,7 +255,6 @@ ModuleExport size_t RegisterMVGImage(void) entry->magick=(IsImageFormatHandler *) IsMVG; entry->format_type=ImplicitFormatType; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/palm.c b/coders/palm.c index e5a56f2f3..d1a3f0f34 100644 --- a/coders/palm.c +++ b/coders/palm.c @@ -607,7 +607,8 @@ ModuleExport size_t RegisterPALMImage(void) entry=AcquireMagickInfo("PALM","PALM","Palm pixmap"); entry->decoder=(DecodeImageHandler *) ReadPALMImage; entry->encoder=(EncodeImageHandler *) WritePALMImage; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/pcd.c b/coders/pcd.c index a69df87ff..b3c2b4767 100644 --- a/coders/pcd.c +++ b/coders/pcd.c @@ -873,13 +873,13 @@ ModuleExport size_t RegisterPCDImage(void) entry->encoder=(EncodeImageHandler *) WritePCDImage; entry->magick=(IsImageFormatHandler *) IsPCD; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("PCD","PCDS","Photo CD"); entry->decoder=(DecodeImageHandler *) ReadPCDImage; entry->encoder=(EncodeImageHandler *) WritePCDImage; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/pcl.c b/coders/pcl.c index 31600b32c..fec9df883 100644 --- a/coders/pcl.c +++ b/coders/pcl.c @@ -422,7 +422,6 @@ ModuleExport size_t RegisterPCLImage(void) entry->magick=(IsImageFormatHandler *) IsPCL; entry->flags^=CoderBlobSupportFlag; entry->flags^=CoderDecoderThreadSupportFlag; - entry->flags|=CoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/pcx.c b/coders/pcx.c index a1f0e8a2b..f280df5bc 100644 --- a/coders/pcx.c +++ b/coders/pcx.c @@ -716,7 +716,8 @@ ModuleExport size_t RegisterPCXImage(void) entry=AcquireMagickInfo("PCX","DCX","ZSoft IBM PC multi-page Paintbrush"); entry->decoder=(DecodeImageHandler *) ReadPCXImage; entry->encoder=(EncodeImageHandler *) WritePCXImage; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; entry->magick=(IsImageFormatHandler *) IsDCX; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("PCX","PCX","ZSoft IBM PC Paintbrush"); @@ -724,7 +725,8 @@ ModuleExport size_t RegisterPCXImage(void) entry->encoder=(EncodeImageHandler *) WritePCXImage; entry->magick=(IsImageFormatHandler *) IsPCX; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/pdf.c b/coders/pdf.c index 5bd13e585..3ed1417cc 100644 --- a/coders/pdf.c +++ b/coders/pdf.c @@ -866,7 +866,6 @@ ModuleExport size_t RegisterPDFImage(void) entry->encoder=(EncodeImageHandler *) WritePDFImage; entry->flags^=CoderAdjoinFlag; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->mime_type=ConstantString("application/pdf"); (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("PDF","EPDF", @@ -875,7 +874,6 @@ ModuleExport size_t RegisterPDFImage(void) entry->encoder=(EncodeImageHandler *) WritePDFImage; entry->flags^=CoderAdjoinFlag; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->mime_type=ConstantString("application/pdf"); (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("PDF","PDF","Portable Document Format"); @@ -883,7 +881,6 @@ ModuleExport size_t RegisterPDFImage(void) entry->encoder=(EncodeImageHandler *) WritePDFImage; entry->magick=(IsImageFormatHandler *) IsPDF; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->mime_type=ConstantString("application/pdf"); (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("PDF","PDFA","Portable Document Archive Format"); @@ -891,7 +888,6 @@ ModuleExport size_t RegisterPDFImage(void) entry->encoder=(EncodeImageHandler *) WritePDFImage; entry->magick=(IsImageFormatHandler *) IsPDF; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->mime_type=ConstantString("application/pdf"); (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); diff --git a/coders/pict.c b/coders/pict.c index 7e6035004..37b2c6305 100644 --- a/coders/pict.c +++ b/coders/pict.c @@ -1521,14 +1521,14 @@ ModuleExport size_t RegisterPICTImage(void) entry->decoder=(DecodeImageHandler *) ReadPICTImage; entry->encoder=(EncodeImageHandler *) WritePICTImage; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; entry->magick=(IsImageFormatHandler *) IsPICT; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("PICT","PICT","Apple Macintosh QuickDraw/PICT"); entry->decoder=(DecodeImageHandler *) ReadPICTImage; entry->encoder=(EncodeImageHandler *) WritePICTImage; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; entry->magick=(IsImageFormatHandler *) IsPICT; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); diff --git a/coders/png.c b/coders/png.c index 23bdb54bc..2d8b7f4e0 100644 --- a/coders/png.c +++ b/coders/png.c @@ -7414,7 +7414,7 @@ ModuleExport size_t RegisterPNGImage(void) #endif entry=AcquireMagickInfo("PNG","MNG","Multiple-image Network Graphics"); - entry->flags|=CoderSeekableStreamFlag; /* To do: eliminate this. */ + entry->flags|=CoderDecoderSeekableStreamFlag; /* To do: eliminate this. */ #if defined(MAGICKCORE_PNG_DELEGATE) entry->decoder=(DecodeImageHandler *) ReadMNGImage; diff --git a/coders/ps.c b/coders/ps.c index 5d2d063cb..c2d45ebad 100644 --- a/coders/ps.c +++ b/coders/ps.c @@ -1040,7 +1040,6 @@ ModuleExport size_t RegisterPSImage(void) entry->magick=(IsImageFormatHandler *) IsPS; entry->flags^=CoderAdjoinFlag; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->mime_type=ConstantString("application/postscript"); (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("PS","EPS","Encapsulated PostScript"); @@ -1049,7 +1048,6 @@ ModuleExport size_t RegisterPSImage(void) entry->magick=(IsImageFormatHandler *) IsPS; entry->flags^=CoderAdjoinFlag; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->mime_type=ConstantString("application/postscript"); (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("PS","EPSF","Encapsulated PostScript"); @@ -1058,7 +1056,6 @@ ModuleExport size_t RegisterPSImage(void) entry->magick=(IsImageFormatHandler *) IsPS; entry->flags^=CoderAdjoinFlag; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->mime_type=ConstantString("application/postscript"); (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("PS","EPSI", @@ -1068,7 +1065,6 @@ ModuleExport size_t RegisterPSImage(void) entry->magick=(IsImageFormatHandler *) IsPS; entry->flags^=CoderAdjoinFlag; entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; entry->mime_type=ConstantString("application/postscript"); (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("PS","PS","PostScript"); @@ -1077,7 +1073,6 @@ ModuleExport size_t RegisterPSImage(void) entry->magick=(IsImageFormatHandler *) IsPS; entry->mime_type=ConstantString("application/postscript"); entry->flags^=CoderBlobSupportFlag; - entry->flags|=CoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/ps2.c b/coders/ps2.c index 04f404e90..80296132e 100644 --- a/coders/ps2.c +++ b/coders/ps2.c @@ -116,12 +116,12 @@ ModuleExport size_t RegisterPS2Image(void) entry=AcquireMagickInfo("PS2","EPS2","Level II Encapsulated PostScript"); entry->encoder=(EncodeImageHandler *) WritePS2Image; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; entry->mime_type=ConstantString("application/postscript"); (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("PS2","PS2","Level II PostScript"); entry->encoder=(EncodeImageHandler *) WritePS2Image; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; entry->mime_type=ConstantString("application/postscript"); (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); diff --git a/coders/ps3.c b/coders/ps3.c index fa346ee77..20246fd8a 100644 --- a/coders/ps3.c +++ b/coders/ps3.c @@ -132,12 +132,12 @@ ModuleExport size_t RegisterPS3Image(void) entry=AcquireMagickInfo("PS3","EPS3","Level III Encapsulated PostScript"); entry->encoder=(EncodeImageHandler *) WritePS3Image; entry->mime_type=ConstantString("application/postscript"); - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("PS3","PS3","Level III PostScript"); entry->encoder=(EncodeImageHandler *) WritePS3Image; entry->mime_type=ConstantString("application/postscript"); - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/psd.c b/coders/psd.c index 1b40c9f86..e29abf86e 100644 --- a/coders/psd.c +++ b/coders/psd.c @@ -2200,13 +2200,15 @@ ModuleExport size_t RegisterPSDImage(void) entry->decoder=(DecodeImageHandler *) ReadPSDImage; entry->encoder=(EncodeImageHandler *) WritePSDImage; entry->magick=(IsImageFormatHandler *) IsPSD; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("PSD","PSD","Adobe Photoshop bitmap"); entry->decoder=(DecodeImageHandler *) ReadPSDImage; entry->encoder=(EncodeImageHandler *) WritePSDImage; entry->magick=(IsImageFormatHandler *) IsPSD; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/rla.c b/coders/rla.c index cd9bfc3c1..d5416a90c 100644 --- a/coders/rla.c +++ b/coders/rla.c @@ -426,7 +426,7 @@ ModuleExport size_t RegisterRLAImage(void) entry=AcquireMagickInfo("RLA","RLA","Alias/Wavefront image"); entry->decoder=(DecodeImageHandler *) ReadRLAImage; entry->flags^=CoderAdjoinFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/sgi.c b/coders/sgi.c index 65dea05ba..3ee90e2a8 100644 --- a/coders/sgi.c +++ b/coders/sgi.c @@ -749,7 +749,7 @@ ModuleExport size_t RegisterSGIImage(void) entry->decoder=(DecodeImageHandler *) ReadSGIImage; entry->encoder=(EncodeImageHandler *) WriteSGIImage; entry->magick=(IsImageFormatHandler *) IsSGI; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/tiff.c b/coders/tiff.c index d9fe03192..863019064 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -2309,7 +2309,8 @@ ModuleExport size_t RegisterTIFFImage(void) #endif entry->flags|=CoderRawSupportFlag; entry->flags|=CoderEndianSupportFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; entry->flags^=CoderAdjoinFlag; entry->flags^=CoderUseExtensionFlag; entry->format_type=ImplicitFormatType; @@ -2321,7 +2322,8 @@ ModuleExport size_t RegisterTIFFImage(void) entry->encoder=(EncodeImageHandler *) WritePTIFImage; #endif entry->flags|=CoderEndianSupportFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; entry->flags^=CoderUseExtensionFlag; entry->mime_type=ConstantString("image/tiff"); (void) RegisterMagickInfo(entry); @@ -2331,7 +2333,8 @@ ModuleExport size_t RegisterTIFFImage(void) entry->encoder=(EncodeImageHandler *) WriteTIFFImage; #endif entry->flags|=CoderEndianSupportFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; entry->flags|=CoderStealthFlag; entry->flags^=CoderUseExtensionFlag; if (*version != '\0') @@ -2345,7 +2348,8 @@ ModuleExport size_t RegisterTIFFImage(void) #endif entry->magick=(IsImageFormatHandler *) IsTIFF; entry->flags|=CoderEndianSupportFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; entry->flags^=CoderUseExtensionFlag; if (*version != '\0') entry->version=ConstantString(version); @@ -2357,7 +2361,8 @@ ModuleExport size_t RegisterTIFFImage(void) entry->encoder=(EncodeImageHandler *) WriteTIFFImage; #endif entry->flags|=CoderEndianSupportFlag; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; + entry->flags|=CoderEncoderSeekableStreamFlag; entry->flags^=CoderAdjoinFlag; entry->flags^=CoderUseExtensionFlag; if (*version != '\0') diff --git a/coders/wmf.c b/coders/wmf.c index eaeb4a466..1e33088b8 100644 --- a/coders/wmf.c +++ b/coders/wmf.c @@ -2952,7 +2952,7 @@ ModuleExport size_t RegisterWMFImage(void) #if defined(MAGICKCORE_SANS_DELEGATE) || defined(MAGICKCORE_WMF_DELEGATE) entry->decoder=ReadWMFImage; #endif - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); entry=AcquireMagickInfo("WMF","WMF","Windows Meta File"); #if defined(MAGICKCORE_SANS_DELEGATE) || defined(MAGICKCORE_WMF_DELEGATE) diff --git a/coders/wpg.c b/coders/wpg.c index b6e8e91a5..ccc4c0545 100644 --- a/coders/wpg.c +++ b/coders/wpg.c @@ -1505,7 +1505,7 @@ ModuleExport size_t RegisterWPGImage(void) entry=AcquireMagickInfo("WPG","WPG","Word Perfect Graphics"); entry->decoder=(DecodeImageHandler *) ReadWPGImage; entry->magick=(IsImageFormatHandler *) IsWPG; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/xcf.c b/coders/xcf.c index b68bdfb6a..8098cd82f 100644 --- a/coders/xcf.c +++ b/coders/xcf.c @@ -1459,7 +1459,7 @@ ModuleExport size_t RegisterXCFImage(void) entry=AcquireMagickInfo("XCF","XCF","GIMP image"); entry->decoder=(DecodeImageHandler *) ReadXCFImage; entry->magick=(IsImageFormatHandler *) IsXCF; - entry->flags|=CoderSeekableStreamFlag; + entry->flags|=CoderDecoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } diff --git a/coders/xps.c b/coders/xps.c index 1f74ba4dc..eec9ddcc9 100644 --- a/coders/xps.c +++ b/coders/xps.c @@ -375,7 +375,6 @@ ModuleExport size_t RegisterXPSImage(void) entry->flags^=CoderAdjoinFlag; entry->flags^=CoderBlobSupportFlag; entry->flags^=CoderDecoderThreadSupportFlag; - entry->flags|=CoderSeekableStreamFlag; (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); }