Renamed new enumeration.

diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index 884ccc0806b82c1705f388155277a6d101ebde9a..bc9a7f35db353f39fe3f67160b4c40947fb095e2 100644 (file)
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -282,7 +282,8 @@ MagickExport MagickBooleanType GetMagickAdjoin(const MagickInfo *magick_info)
 {
   assert(magick_info != (MagickInfo *) NULL);
   assert(magick_info->signature == MagickSignature);
-  return(((magick_info->flags & Adjoin) == 0) ? MagickFalse : MagickTrue);
+  return(((magick_info->flags & CoderAdjoinFlag) == 0) ? MagickFalse :
+    MagickTrue);
 }
 \f
 /*
@@ -312,7 +313,7 @@ MagickExport MagickBooleanType GetMagickBlobSupport(
 {
   assert(magick_info != (MagickInfo *) NULL);
   assert(magick_info->signature == MagickSignature);
-  return(((magick_info->flags & BlobSupport) == 0) ? MagickFalse :
+  return(((magick_info->flags & CoderBlobSupportFlag) == 0) ? MagickFalse :
     MagickTrue);
 }
 \f
@@ -345,8 +346,8 @@ MagickExport MagickBooleanType GetMagickDecoderThreadSupport(
 {
   assert(magick_info != (MagickInfo *) NULL);
   assert(magick_info->signature == MagickSignature);
-  return(((magick_info->flags & DecoderThreadSupport) == 0) ? MagickFalse :
-    MagickTrue);
+  return(((magick_info->flags & CoderDecoderThreadSupportFlag) == 0) ?
+    MagickFalse : MagickTrue);
 }
 \f
 /*
@@ -407,8 +408,8 @@ MagickExport MagickBooleanType GetMagickEncoderThreadSupport(
 {
   assert(magick_info != (MagickInfo *) NULL);
   assert(magick_info->signature == MagickSignature);
-  return(((magick_info->flags & DecoderThreadSupport) == 0) ? MagickFalse :
-    MagickTrue);
+  return(((magick_info->flags & CoderDecoderThreadSupportFlag) == 0) ?
+    MagickFalse : MagickTrue);
 }
 \f
 /*
@@ -439,7 +440,7 @@ MagickExport MagickBooleanType GetMagickEndianSupport(
 {
   assert(magick_info != (MagickInfo *) NULL);
   assert(magick_info->signature == MagickSignature);
-  return(((magick_info->flags & EndianSupport) == 0) ? MagickFalse :
+  return(((magick_info->flags & CoderEndianSupportFlag) == 0) ? MagickFalse :
     MagickTrue);
 }
 \f
@@ -785,7 +786,8 @@ MagickExport MagickBooleanType GetMagickRawSupport(
 {
   assert(magick_info != (MagickInfo *) NULL);
   assert(magick_info->signature == MagickSignature);
-  return(((magick_info->flags & RawSupport) == 0) ? MagickFalse : MagickTrue);
+  return(((magick_info->flags & CoderRawSupportFlag) == 0) ? MagickFalse :
+    MagickTrue);
 }
 \f
 /*
@@ -816,7 +818,7 @@ MagickExport MagickBooleanType GetMagickSeekableStream(
 {
   assert(magick_info != (MagickInfo *) NULL);
   assert(magick_info->signature == MagickSignature);
-  return(((magick_info->flags & SeekableStream) == 0) ? MagickFalse :
+  return(((magick_info->flags & CoderSeekableStreamFlag) == 0) ? MagickFalse :
     MagickTrue);
 }
 
@@ -846,7 +848,8 @@ MagickExport MagickBooleanType GetMagickStealth(const MagickInfo *magick_info)
 {
   assert(magick_info != (MagickInfo *) NULL);
   assert(magick_info->signature == MagickSignature);
-  return(((magick_info->flags & Stealth) == 0) ? MagickFalse : MagickTrue);
+  return(((magick_info->flags & CoderStealthFlag) == 0) ? MagickFalse :
+    MagickTrue);
 }
 
 /*
@@ -878,7 +881,7 @@ MagickExport MagickBooleanType GetMagickUseExtension(
 {
   assert(magick_info != (MagickInfo *) NULL);
   assert(magick_info->signature == MagickSignature);
-  return(((magick_info->flags & UseExtension) == 0) ? MagickFalse :
+  return(((magick_info->flags & CoderUseExtensionFlag) == 0) ? MagickFalse :
     MagickTrue);
 }
 \f
@@ -951,13 +954,13 @@ static MagickBooleanType IsMagickTreeInstantiated(ExceptionInfo *exception)
             ThrowFatalException(ResourceLimitFatalError,
               "MemoryAllocationFailed");
           magick_info=SetMagickInfo("ephemeral");
-          magick_info->flags|=Stealth;
+          magick_info->flags|=CoderStealthFlag;
           status=AddValueToSplayTree(magick_list,magick_info->name,magick_info);
           if (status == MagickFalse)
             ThrowFatalException(ResourceLimitFatalError,
               "MemoryAllocationFailed");
           magick_info=SetMagickInfo("clipmask");
-          magick_info->flags|=Stealth;
+          magick_info->flags|=CoderStealthFlag;
           status=AddValueToSplayTree(magick_list,magick_info->name,magick_info);
           if (status == MagickFalse)
             ThrowFatalException(ResourceLimitFatalError,
@@ -1590,8 +1593,9 @@ MagickExport MagickInfo *SetMagickInfo(const char *name)
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
   (void) ResetMagickMemory(magick_info,0,sizeof(*magick_info));
   magick_info->name=ConstantString(name);
-  magick_info->flags=Adjoin | BlobSupport | DecoderThreadSupport |
-    EncoderThreadSupport | UseExtension;
+  magick_info->flags=CoderAdjoinFlag | CoderBlobSupportFlag |
+    CoderDecoderThreadSupportFlag | CoderEncoderThreadSupportFlag |
+    CoderUseExtensionFlag;
   magick_info->signature=MagickSignature;
   return(magick_info);
 }

diff --git a/MagickCore/magick.h b/MagickCore/magick.h
index d0c9e47f1759f989b8062f30bee3d36ae7273d2d..2c43a83c4d58dbc0e1861c05d777465a8a421028 100644 (file)
--- a/MagickCore/magick.h
+++ b/MagickCore/magick.h
@@ -34,17 +34,17 @@ typedef enum
 
 typedef enum
 {
-  NoFlag = 0x0000,
-  Adjoin = 0x0001,
-  BlobSupport = 0x0002,
-  DecoderThreadSupport = 0x0004,
-  EncoderThreadSupport = 0x0008,
-  EndianSupport = 0x0010,
-  RawSupport = 0x0020,
-  SeekableStream = 0x0040,
-  Stealth = 0x0080,
-  UseExtension = 0x0100
-} MagickFlagType;
+  CoderNoFlag = 0x0000,
+  CoderAdjoinFlag = 0x0001,
+  CoderBlobSupportFlag = 0x0002,
+  CoderDecoderThreadSupportFlag = 0x0004,
+  CoderEncoderThreadSupportFlag = 0x0008,
+  CoderEndianSupportFlag = 0x0010,
+  CoderRawSupportFlag = 0x0020,
+  CoderSeekableStreamFlag = 0x0040,
+  CoderStealthFlag = 0x0080,
+  CoderUseExtensionFlag = 0x0100
+} MagickInfoFlag;
 
 typedef Image
   *DecodeImageHandler(const ImageInfo *,ExceptionInfo *);

diff --git a/coders/art.c b/coders/art.c
index d650c29e03b28f69292b5ef560a794fe8a775864..c26778b36dfe7b05e607a21989b85b082591bedb 100644 (file)
--- a/coders/art.c
+++ b/coders/art.c
@@ -218,8 +218,8 @@ ModuleExport size_t RegisterARTImage(void)
   entry=SetMagickInfo("ART");
   entry->decoder=(DecodeImageHandler *) ReadARTImage;
   entry->encoder=(EncodeImageHandler *) WriteARTImage;
-  entry->flags|=RawSupport;
-  entry->flags^=Adjoin;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("PFS: 1st Publisher Clip Art");
   entry->module=ConstantString("ART");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/bgr.c b/coders/bgr.c
index 8740494a0410a19a5891eaebf47a178be7d4382b..60fd8c86b4b7976fe42d40dda5eca920145fb466 100644 (file)
--- a/coders/bgr.c
+++ b/coders/bgr.c
@@ -1017,16 +1017,16 @@ ModuleExport size_t RegisterBGRImage(void)
   entry=SetMagickInfo("BGR");
   entry->decoder=(DecodeImageHandler *) ReadBGRImage;
   entry->encoder=(EncodeImageHandler *) WriteBGRImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Raw blue, green, and red samples");
   entry->module=ConstantString("BGR");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("BGRA");
   entry->decoder=(DecodeImageHandler *) ReadBGRImage;
   entry->encoder=(EncodeImageHandler *) WriteBGRImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Raw blue, green, red, and alpha samples");
   entry->module=ConstantString("BGR");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/bmp.c b/coders/bmp.c
index 7cd355b8f88365ff2829b28f4aab81c845cba622..508e530cb7b4a52f8491c4b188db8bcb25011641 100644 (file)
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -1431,24 +1431,24 @@ ModuleExport size_t RegisterBMPImage(void)
   entry->magick=(IsImageFormatHandler *) IsBMP;
   entry->description=ConstantString("Microsoft Windows bitmap image");
   entry->module=ConstantString("BMP");
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("BMP2");
   entry->encoder=(EncodeImageHandler *) WriteBMPImage;
   entry->magick=(IsImageFormatHandler *) IsBMP;
   entry->description=ConstantString("Microsoft Windows bitmap image (V2)");
   entry->module=ConstantString("BMP");
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("BMP3");
   entry->encoder=(EncodeImageHandler *) WriteBMPImage;
   entry->magick=(IsImageFormatHandler *) IsBMP;
   entry->description=ConstantString("Microsoft Windows bitmap image (V3)");
   entry->module=ConstantString("BMP");
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);
 }

diff --git a/coders/braille.c b/coders/braille.c
index 2e116d7ed24f2015782c2f21a814a4dc32671af5..dca8deee233d7ce3b5e74f721ce57cc7798c1681 100644 (file)
--- a/coders/braille.c
+++ b/coders/braille.c
@@ -98,19 +98,19 @@ ModuleExport size_t RegisterBRAILLEImage(void)
 
   entry=SetMagickInfo("BRF");
   entry->encoder=(EncodeImageHandler *) WriteBRAILLEImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=AcquireString("BRF ASCII Braille format");
   entry->module=AcquireString("BRAILLE");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("UBRL");
   entry->encoder=(EncodeImageHandler *) WriteBRAILLEImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=AcquireString("Unicode Text format");
   entry->module=AcquireString("BRAILLE");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("ISOBRL");
   entry->encoder=(EncodeImageHandler *) WriteBRAILLEImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=AcquireString("ISO/TR 11548-1 format");
   entry->module=AcquireString("BRAILLE");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/cals.c b/coders/cals.c
index 99d58b2a2ccf8f31f8a5155f8ff52e4f039aecb4..dde4871f9fed0805894fb355c6c31580676a2e14 100644 (file)
--- a/coders/cals.c
+++ b/coders/cals.c
@@ -327,7 +327,7 @@ ModuleExport size_t RegisterCALSImage(void)
 #if defined(MAGICKCORE_TIFF_DELEGATE)
   entry->encoder=(EncodeImageHandler *) WriteCALSImage;
 #endif
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->magick=(IsImageFormatHandler *) IsCALS;
   entry->description=ConstantString(CALSDescription);
   entry->note=ConstantString(CALSNote);
@@ -338,7 +338,7 @@ ModuleExport size_t RegisterCALSImage(void)
 #if defined(MAGICKCORE_TIFF_DELEGATE)
   entry->encoder=(EncodeImageHandler *) WriteCALSImage;
 #endif
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->magick=(IsImageFormatHandler *) IsCALS;
   entry->description=ConstantString(CALSDescription);
   entry->note=ConstantString(CALSNote);

diff --git a/coders/caption.c b/coders/caption.c
index f4fe72bbf22f40f0eaeeb71b47bcb2abbe904ef6..516829ccc2defaec5ca5db8050c869fd27809b59 100644 (file)
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -328,7 +328,7 @@ ModuleExport size_t RegisterCAPTIONImage(void)
   entry=SetMagickInfo("CAPTION");
   entry->decoder=(DecodeImageHandler *) ReadCAPTIONImage;
   entry->description=ConstantString("Caption");
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->module=ConstantString("CAPTION");
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);

diff --git a/coders/cin.c b/coders/cin.c
index 92670447127fc4a770189dca570c26cb8df5eb93..805ce0712066ffaf8c0e9181c81c2670b850992e 100644 (file)
--- a/coders/cin.c
+++ b/coders/cin.c
@@ -814,7 +814,7 @@ ModuleExport size_t RegisterCINImage(void)
   entry->decoder=(DecodeImageHandler *) ReadCINImage;
   entry->encoder=(EncodeImageHandler *) WriteCINImage;
   entry->magick=(IsImageFormatHandler *) IsCIN;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Cineon Image File");
   entry->module=ConstantString("CIN");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/cip.c b/coders/cip.c
index 187e5566726a5377b93272db3236e5e5ba22c92b..d1369aafd210867cba1b68c074717041bb7a524c 100644 (file)
--- a/coders/cip.c
+++ b/coders/cip.c
@@ -100,7 +100,7 @@ ModuleExport size_t RegisterCIPImage(void)
 
   entry=SetMagickInfo("CIP");
   entry->encoder=(EncodeImageHandler *) WriteCIPImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Cisco IP phone image format");
   entry->module=ConstantString("CIP");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/clipboard.c b/coders/clipboard.c
index bdc097c3e1c78546ba8499c80db4a9a8f1d723cc..516a60116e1f3fe21403e2285f2a7b3d37f2e239 100644 (file)
--- a/coders/clipboard.c
+++ b/coders/clipboard.c
@@ -273,7 +273,7 @@ ModuleExport size_t RegisterCLIPBOARDImage(void)
   entry->decoder=(DecodeImageHandler *) ReadCLIPBOARDImage;
   entry->encoder=(EncodeImageHandler *) WriteCLIPBOARDImage;
 #endif
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->format_type=ImplicitFormatType;
   entry->description=ConstantString("The system clipboard");
   entry->module=ConstantString("CLIPBOARD");

diff --git a/coders/cmyk.c b/coders/cmyk.c
index 54a205013486ca32a2c63d2da451af6d4f4291e4..6d05da517c1c39e9e7fc35ccbb5f5661a597460a 100644 (file)
--- a/coders/cmyk.c
+++ b/coders/cmyk.c
@@ -1142,8 +1142,8 @@ ModuleExport size_t RegisterCMYKImage(void)
   entry=SetMagickInfo("CMYK");
   entry->decoder=(DecodeImageHandler *) ReadCMYKImage;
   entry->encoder=(EncodeImageHandler *) WriteCMYKImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Raw cyan, magenta, yellow, and black "
     "samples");
   entry->module=ConstantString("CMYK");
@@ -1151,8 +1151,8 @@ ModuleExport size_t RegisterCMYKImage(void)
   entry=SetMagickInfo("CMYKA");
   entry->decoder=(DecodeImageHandler *) ReadCMYKImage;
   entry->encoder=(EncodeImageHandler *) WriteCMYKImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Raw cyan, magenta, yellow, black, and "
     "alpha samples");
   entry->module=ConstantString("CMYK");

diff --git a/coders/cut.c b/coders/cut.c
index 979c483c3a36361ab4ed39f9c8b71b20c33ffd20..78dd94eb0e3b70bd7a3ccfb033152b9896b978a0 100644 (file)
--- a/coders/cut.c
+++ b/coders/cut.c
@@ -641,7 +641,7 @@ ModuleExport size_t RegisterCUTImage(void)
 
   entry=SetMagickInfo("CUT");
   entry->decoder=(DecodeImageHandler *) ReadCUTImage;
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("DR Halo");
   entry->module=ConstantString("CUT");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/dcm.c b/coders/dcm.c
index 1cc63156c78a2853a1fd1d7cf516073b9f3cd373..0b2808f6cbfa1b3b315b9c4b162957e78cc0519f 100644 (file)
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -4145,8 +4145,8 @@ ModuleExport size_t RegisterDCMImage(void)
   entry=SetMagickInfo("DCM");
   entry->decoder=(DecodeImageHandler *) ReadDCMImage;
   entry->magick=(IsImageFormatHandler *) IsDCM;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString(
     "Digital Imaging and Communications in Medicine image");
   entry->note=ConstantString(DCMNote);

diff --git a/coders/dds.c b/coders/dds.c
index b37249ed1b599265e37271c76cb6474deb839c97..9e2a4c327a52657a874b1046793aac11fd48b03a 100644 (file)
--- a/coders/dds.c
+++ b/coders/dds.c
@@ -2308,7 +2308,7 @@ ModuleExport size_t RegisterDDSImage(void)
   entry->decoder = (DecodeImageHandler *) ReadDDSImage;
   entry->encoder = (EncodeImageHandler *) WriteDDSImage;
   entry->magick = (IsImageFormatHandler *) IsDDS;
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description = ConstantString("Microsoft DirectDraw Surface");
   entry->module = ConstantString("DDS");
   (void) RegisterMagickInfo(entry);
@@ -2316,7 +2316,7 @@ ModuleExport size_t RegisterDDSImage(void)
   entry->decoder = (DecodeImageHandler *) ReadDDSImage;
   entry->encoder = (EncodeImageHandler *) WriteDDSImage;
   entry->magick = (IsImageFormatHandler *) IsDDS;
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description = ConstantString("Microsoft DirectDraw Surface");
   entry->module = ConstantString("DDS");
   (void) RegisterMagickInfo(entry);
@@ -2324,7 +2324,7 @@ ModuleExport size_t RegisterDDSImage(void)
   entry->decoder = (DecodeImageHandler *) ReadDDSImage;
   entry->encoder = (EncodeImageHandler *) WriteDDSImage;
   entry->magick = (IsImageFormatHandler *) IsDDS;
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description = ConstantString("Microsoft DirectDraw Surface");
   entry->module = ConstantString("DDS");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/debug.c b/coders/debug.c
index 788bc65a0fd754bde00734d62292d5720abd3b50..e51bd0537890bbc7df8c2acb255dacfeba571a52 100644 (file)
--- a/coders/debug.c
+++ b/coders/debug.c
@@ -104,8 +104,8 @@ ModuleExport size_t RegisterDEBUGImage(void)
 
   entry=SetMagickInfo("DEBUG");
   entry->encoder=(EncodeImageHandler *) WriteDEBUGImage;
-  entry->flags|=RawSupport;
-  entry->flags|=Stealth;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderStealthFlag;
   entry->description=ConstantString("Image pixel values for debugging");
   entry->module=ConstantString("DEBUG");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/dib.c b/coders/dib.c
index 9fa1d95e398a52c355f061435706db976e0c7b0a..5ab95f382626f1c2b07b416b0ac01659a47b3251 100644 (file)
--- a/coders/dib.c
+++ b/coders/dib.c
@@ -935,8 +935,8 @@ ModuleExport size_t RegisterDIBImage(void)
   entry->decoder=(DecodeImageHandler *) ReadDIBImage;
   entry->encoder=(EncodeImageHandler *) WriteDIBImage;
   entry->magick=(IsImageFormatHandler *) IsDIB;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
   entry->description=ConstantString(
     "Microsoft Windows 3.X Packed Device-Independent Bitmap");
   entry->module=ConstantString("DIB");

diff --git a/coders/djvu.c b/coders/djvu.c
index 3df5d2f1121d7789f79274bb162da405ab605e7a..02105706f3d60ab83448c918c2f7d8a61b9ebfde 100644 (file)
--- a/coders/djvu.c
+++ b/coders/djvu.c
@@ -951,8 +951,8 @@ ModuleExport size_t RegisterDJVUImage(void)
   entry->decoder=(DecodeImageHandler *) ReadDJVUImage;
 #endif
   entry->magick=(IsImageFormatHandler *) IsDJVU;
-  entry->flags|=RawSupport;
-  entry->flags^=Adjoin;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=AcquireString("Déjà vu");
   entry->module=AcquireString("DJVU");
   if (*version != '\0')

diff --git a/coders/dng.c b/coders/dng.c
index a68bd3bdc12001dc84d88a649d74c77b6465c53d..2ef1e55b65916afe512a46113ea6f83d0ed05945 100644 (file)
--- a/coders/dng.c
+++ b/coders/dng.c
@@ -242,184 +242,184 @@ ModuleExport size_t RegisterDNGImage(void)
 
   entry=SetMagickInfo("3FR");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Hasselblad CFV/H3D39II");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("ARW");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Sony Alpha Raw Image Format");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("DNG");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Digital Negative");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("CR2");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Canon Digital Camera Raw Image Format");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("CRW");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Canon Digital Camera Raw Image Format");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("DCR");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Kodak Digital Camera Raw Image File");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("ERF");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Epson RAW Format");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("IIQ");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Phase One Raw Image Format");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("KDC");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Kodak Digital Camera Raw Image Format");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("K25");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Kodak Digital Camera Raw Image Format");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("MEF");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Mamiya Raw Image File");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("MRW");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Sony (Minolta) Raw Image File");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("NEF");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Nikon Digital SLR Camera Raw Image File");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("NRW");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Nikon Digital SLR Camera Raw Image File");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("ORF");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Olympus Digital Camera Raw Image File");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("PEF");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Pentax Electronic File");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("RAF");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Fuji CCD-RAW Graphic File");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("RAW");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Raw");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("RMF");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Raw Media Format");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("RW2");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Panasonic Lumix Raw Image");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("SRF");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Sony Raw Format");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("SR2");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Sony Raw Format 2");
   entry->module=ConstantString("DNG");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("X3F");
   entry->decoder=(DecodeImageHandler *) ReadDNGImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->format_type=ExplicitFormatType;
   entry->description=ConstantString("Sigma Camera RAW Picture File");
   entry->module=ConstantString("DNG");

diff --git a/coders/dot.c b/coders/dot.c
index 4a853f31a1a23e2a7994e1116d04882d637fe2ac..27bae00751790fa62279a79cc2202da8c8a593d8 100644 (file)
--- a/coders/dot.c
+++ b/coders/dot.c
@@ -197,7 +197,7 @@ ModuleExport size_t RegisterDOTImage(void)
 #if defined(MAGICKCORE_GVC_DELEGATE)
   entry->decoder=(DecodeImageHandler *) ReadDOTImage;
 #endif
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString("Graphviz");
   entry->module=ConstantString("DOT");
   (void) RegisterMagickInfo(entry);
@@ -205,7 +205,7 @@ ModuleExport size_t RegisterDOTImage(void)
 #if defined(MAGICKCORE_GVC_DELEGATE)
   entry->decoder=(DecodeImageHandler *) ReadDOTImage;
 #endif
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString("Graphviz");
   entry->module=ConstantString("DOT");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/dps.c b/coders/dps.c
index 8577c7d2ade50c9c9842e29d856290b94ae364b0..115de620dacfbbb6d63d53fdf4f68e961bf806cb 100644 (file)
--- a/coders/dps.c
+++ b/coders/dps.c
@@ -547,7 +547,7 @@ ModuleExport size_t RegisterDPSImage(void)
 #if defined(MAGICKCORE_DPS_DELEGATE)
   entry->decoder=(DecodeImageHandler *) ReadDPSImage;
 #endif
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString("Display Postscript Interpreter");
   entry->module=ConstantString("DPS");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/dpx.c b/coders/dpx.c
index f7750904614036b473e733429a13d9e29f612932..dbf8acccb5eb0860c908d1522ee597b84126aec1 100644 (file)
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -1332,8 +1332,8 @@ ModuleExport size_t RegisterDPXImage(void)
   entry->decoder=(DecodeImageHandler *) ReadDPXImage;
   entry->encoder=(EncodeImageHandler *) WriteDPXImage;
   entry->magick=(IsImageFormatHandler *) IsDPX;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("SMPTE 268M-2003 (DPX 2.0)");
   entry->note=ConstantString(DPXNote);
   entry->module=ConstantString("DPX");

diff --git a/coders/emf.c b/coders/emf.c
index ad34cfb48d984555a113ccf334d067e51e655e74..98088904c9caa9688e8ae539b59f3af7aae50a6e 100644 (file)
--- a/coders/emf.c
+++ b/coders/emf.c
@@ -817,7 +817,7 @@ ModuleExport size_t RegisterEMFImage(void)
   entry->description=ConstantString(
     "Windows Enhanced Meta File");
   entry->magick=(IsImageFormatHandler *) IsEMF;
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderBlobSupportFlag;
   entry->module=ConstantString("WMF");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("WMF");
@@ -826,7 +826,7 @@ ModuleExport size_t RegisterEMFImage(void)
 #endif
   entry->description=ConstantString("Windows Meta File");
   entry->magick=(IsImageFormatHandler *) IsWMF;
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderBlobSupportFlag;
   entry->module=ConstantString("WMF");
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);

diff --git a/coders/ept.c b/coders/ept.c
index 5dc2801ff17608df8065469918dcae11ff3cc858..0995ed648437e104e54f4f9474137d3aca7d81d9 100644 (file)
--- a/coders/ept.c
+++ b/coders/ept.c
@@ -283,9 +283,9 @@ ModuleExport size_t RegisterEPTImage(void)
   entry->decoder=(DecodeImageHandler *) ReadEPTImage;
   entry->encoder=(EncodeImageHandler *) WriteEPTImage;
   entry->magick=(IsImageFormatHandler *) IsEPT;
-  entry->flags|=SeekableStream;
-  entry->flags^=Adjoin;
-  entry->flags^=BlobSupport;
+  entry->flags|=CoderSeekableStreamFlag;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString(
     "Encapsulated PostScript with TIFF preview");
   entry->module=ConstantString("EPT");
@@ -294,9 +294,9 @@ ModuleExport size_t RegisterEPTImage(void)
   entry->decoder=(DecodeImageHandler *) ReadEPTImage;
   entry->encoder=(EncodeImageHandler *) WriteEPTImage;
   entry->magick=(IsImageFormatHandler *) IsEPT;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString(
     "Encapsulated PostScript Level II with TIFF preview");
   entry->module=ConstantString("EPT");
@@ -305,8 +305,8 @@ ModuleExport size_t RegisterEPTImage(void)
   entry->decoder=(DecodeImageHandler *) ReadEPTImage;
   entry->encoder=(EncodeImageHandler *) WriteEPTImage;
   entry->magick=(IsImageFormatHandler *) IsEPT;
-  entry->flags|=SeekableStream;
-  entry->flags^=BlobSupport;
+  entry->flags|=CoderSeekableStreamFlag;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString(
     "Encapsulated PostScript Level III with TIFF preview");
   entry->module=ConstantString("EPT");

diff --git a/coders/exr.c b/coders/exr.c
index 8e239a3d7c8b1462876fc9cb89ff52b58b7dc4bd..d4af8e1dd2de2b5a8268c1596cc8fc90235a4d7a 100644 (file)
--- a/coders/exr.c
+++ b/coders/exr.c
@@ -293,9 +293,9 @@ ModuleExport size_t RegisterEXRImage(void)
   entry->encoder=(EncodeImageHandler *) WriteEXRImage;
 #endif
   entry->magick=(IsImageFormatHandler *) IsEXR;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("High Dynamic-range (HDR)");
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderBlobSupportFlag;
   entry->module=ConstantString("EXR");
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);

diff --git a/coders/fax.c b/coders/fax.c
index 01ad8bcbbbbbe7f959abd360604b60761519c8b1..142b72e49909021e2b6d6315d1341b0bda537439 100644 (file)
--- a/coders/fax.c
+++ b/coders/fax.c
@@ -240,7 +240,7 @@ ModuleExport size_t RegisterFAXImage(void)
   entry->decoder=(DecodeImageHandler *) ReadFAXImage;
   entry->encoder=(EncodeImageHandler *) WriteFAXImage;
   entry->magick=(IsImageFormatHandler *) IsFAX;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Group 3 FAX");
   entry->module=ConstantString("FAX");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/fd.c b/coders/fd.c
index c1f545b1bd394e5f9474d75a0e9ac0a5f6336905..c73c9b5f8999d6b858a3b56c895f9c7eb5f4fed2 100644 (file)
--- a/coders/fd.c
+++ b/coders/fd.c
@@ -156,7 +156,7 @@ ModuleExport size_t RegisterFDImage(void)
   entry->decoder=(DecodeImageHandler *) ReadFDImage;
   entry->description=ConstantString("Read image from a file descriptor");
   entry->module=ConstantString("FD");
-  entry->flags|=Stealth;
+  entry->flags|=CoderStealthFlag;
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);
 }

diff --git a/coders/fits.c b/coders/fits.c
index 7110f1f7ef8b238184de06771de88e37e07e773c..c6157a2b048250147aa67f6f2e1ae5a25888c8ad 100644 (file)
--- a/coders/fits.c
+++ b/coders/fits.c
@@ -541,8 +541,8 @@ ModuleExport size_t RegisterFITSImage(void)
   entry->decoder=(DecodeImageHandler *) ReadFITSImage;
   entry->encoder=(EncodeImageHandler *) WriteFITSImage;
   entry->magick=(IsImageFormatHandler *) IsFITS;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Flexible Image Transport System");
   entry->module=ConstantString("FITS");
   (void) RegisterMagickInfo(entry);
@@ -550,8 +550,8 @@ ModuleExport size_t RegisterFITSImage(void)
   entry->decoder=(DecodeImageHandler *) ReadFITSImage;
   entry->encoder=(EncodeImageHandler *) WriteFITSImage;
   entry->magick=(IsImageFormatHandler *) IsFITS;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Flexible Image Transport System");
   entry->module=ConstantString("FTS");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/fpx.c b/coders/fpx.c
index 7e93cf94b4c930f897a66351c5fc466af350a362..571b1ad3243625b07734abe1f0b8d9a506620bfc 100644 (file)
--- a/coders/fpx.c
+++ b/coders/fpx.c
@@ -497,9 +497,9 @@ ModuleExport size_t RegisterFPXImage(void)
   entry->decoder=(DecodeImageHandler *) ReadFPXImage;
   entry->encoder=(EncodeImageHandler *) WriteFPXImage;
 #endif
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString("FlashPix Format");
   entry->module=ConstantString("FPX");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/gif.c b/coders/gif.c
index 2af5d5dd0281beb62e3b2bdcf5c5934eb58eb18e..0a6307bf5b9f38d932e5eee9d9bc9ec755c071bc 100644 (file)
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -1411,7 +1411,7 @@ ModuleExport size_t RegisterGIFImage(void)
   entry->decoder=(DecodeImageHandler *) ReadGIFImage;
   entry->encoder=(EncodeImageHandler *) WriteGIFImage;
   entry->magick=(IsImageFormatHandler *) IsGIF;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("CompuServe graphics interchange format");
   entry->version=ConstantString("version 87a");
   entry->mime_type=ConstantString("image/gif");

diff --git a/coders/gradient.c b/coders/gradient.c
index 7fba57fe63d8d7347d42a31bc55b3fac68678ccc..7a3f0f31757e9702ea50b20ef03d137de70d0aa0 100644 (file)
--- a/coders/gradient.c
+++ b/coders/gradient.c
@@ -205,8 +205,8 @@ ModuleExport size_t RegisterGRADIENTImage(void)
 
   entry=SetMagickInfo("GRADIENT");
   entry->decoder=(DecodeImageHandler *) ReadGRADIENTImage;
-  entry->flags^=Adjoin;
-  entry->flags|=RawSupport;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderRawSupportFlag;
   entry->format_type=ImplicitFormatType;
   entry->description=ConstantString("Gradual linear passing from one shade to "
     "another");
@@ -214,8 +214,8 @@ ModuleExport size_t RegisterGRADIENTImage(void)
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("RADIAL-GRADIENT");
   entry->decoder=(DecodeImageHandler *) ReadGRADIENTImage;
-  entry->flags^=Adjoin;
-  entry->flags|=RawSupport;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderRawSupportFlag;
   entry->format_type=ImplicitFormatType;
   entry->description=ConstantString("Gradual radial passing from one shade to "
     "another");

diff --git a/coders/gray.c b/coders/gray.c
index 2a7516d94ffad5035f28a947dbc295da0aab3172..0af76d01ae0f7e2349c8234a793eb055ebbfc618 100644 (file)
--- a/coders/gray.c
+++ b/coders/gray.c
@@ -314,8 +314,8 @@ ModuleExport size_t RegisterGRAYImage(void)
   entry=SetMagickInfo("GRAY");
   entry->decoder=(DecodeImageHandler *) ReadGRAYImage;
   entry->encoder=(EncodeImageHandler *) WriteGRAYImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Raw gray samples");
   entry->module=ConstantString("GRAY");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/hald.c b/coders/hald.c
index 0ce4766b83262d579194c1243d62f35efc6842ed..4398f08dafceb63db3a21480807389d5ee62392d 100644 (file)
--- a/coders/hald.c
+++ b/coders/hald.c
@@ -196,10 +196,10 @@ ModuleExport size_t RegisterHALDImage(void)
 
   entry=SetMagickInfo("HALD");
   entry->decoder=(DecodeImageHandler *) ReadHALDImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->format_type=ImplicitFormatType;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Identity Hald color lookup table image");
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);

diff --git a/coders/histogram.c b/coders/histogram.c
index f30de50c32bc4aad17fa8cf78833f2604acb3cf9..6610ad5f635647961e015bc1b7fe52fe931d67ba 100644 (file)
--- a/coders/histogram.c
+++ b/coders/histogram.c
@@ -104,7 +104,7 @@ ModuleExport size_t RegisterHISTOGRAMImage(void)
 
   entry=SetMagickInfo("HISTOGRAM");
   entry->encoder=(EncodeImageHandler *) WriteHISTOGRAMImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->format_type=ImplicitFormatType;
   entry->description=ConstantString("Histogram of the image");
   entry->module=ConstantString("HISTOGRAM");

diff --git a/coders/hrz.c b/coders/hrz.c
index cc2908769fdc223620a19eff318dff4e2fd60b3e..41d1a76e8dcb4b865e0afb3cc4706a90c846a9d5 100644 (file)
--- a/coders/hrz.c
+++ b/coders/hrz.c
@@ -210,7 +210,7 @@ ModuleExport size_t RegisterHRZImage(void)
   entry=SetMagickInfo("HRZ");
   entry->decoder=(DecodeImageHandler *) ReadHRZImage;
   entry->encoder=(EncodeImageHandler *) WriteHRZImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Slow Scan TeleVision");
   entry->module=ConstantString("HRZ");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/html.c b/coders/html.c
index e5fd1a88d10ec5e6890d90b78dd5054faf7cc263..1488927fa7d22f33517abfd1ea7a5e34e59cc940 100644 (file)
--- a/coders/html.c
+++ b/coders/html.c
@@ -132,7 +132,7 @@ ModuleExport size_t RegisterHTMLImage(void)
   entry=SetMagickInfo("HTM");
   entry->encoder=(EncodeImageHandler *) WriteHTMLImage;
   entry->magick=(IsImageFormatHandler *) IsHTML;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString(
     "Hypertext Markup Language and a client-side image map");
   entry->module=ConstantString("HTML");
@@ -140,7 +140,7 @@ ModuleExport size_t RegisterHTMLImage(void)
   entry=SetMagickInfo("HTML");
   entry->encoder=(EncodeImageHandler *) WriteHTMLImage;
   entry->magick=(IsImageFormatHandler *) IsHTML;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString(
     "Hypertext Markup Language and a client-side image map");
   entry->module=ConstantString("HTML");
@@ -148,7 +148,7 @@ ModuleExport size_t RegisterHTMLImage(void)
   entry=SetMagickInfo("SHTML");
   entry->encoder=(EncodeImageHandler *) WriteHTMLImage;
   entry->magick=(IsImageFormatHandler *) IsHTML;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString(
     "Hypertext Markup Language and a client-side image map");
   entry->module=ConstantString("HTML");

diff --git a/coders/icon.c b/coders/icon.c
index f76786d9d7b1eff74739aa95f6e84899a97411e5..c8d6d6e6065ddcdb0ce939933a714bbd7e010405 100644 (file)
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -770,23 +770,23 @@ ModuleExport size_t RegisterICONImage(void)
   entry=SetMagickInfo("CUR");
   entry->decoder=(DecodeImageHandler *) ReadICONImage;
   entry->encoder=(EncodeImageHandler *) WriteICONImage;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Microsoft icon");
   entry->module=ConstantString("CUR");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("ICO");
   entry->decoder=(DecodeImageHandler *) ReadICONImage;
   entry->encoder=(EncodeImageHandler *) WriteICONImage;
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Microsoft icon");
   entry->module=ConstantString("ICON");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("ICON");
   entry->decoder=(DecodeImageHandler *) ReadICONImage;
   entry->encoder=(EncodeImageHandler *) WriteICONImage;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Microsoft icon");
   entry->module=ConstantString("ICON");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/info.c b/coders/info.c
index 1b5a18cc2377cdb0d1e9e411710a5528de259e5a..d12c26963102bd08568b7941d954492bddd23e11 100644 (file)
--- a/coders/info.c
+++ b/coders/info.c
@@ -98,7 +98,7 @@ ModuleExport size_t RegisterINFOImage(void)
 
   entry=SetMagickInfo("INFO");
   entry->encoder=(EncodeImageHandler *) WriteINFOImage;
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString("The image format and characteristics");
   entry->module=ConstantString("INFO");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/ipl.c b/coders/ipl.c
index 804371fe68f55410263a9c0e03c3d06accb87a33..6dda26680fbd30d0e40fee52de64c19dbe36d700 100644 (file)
--- a/coders/ipl.c
+++ b/coders/ipl.c
@@ -443,7 +443,7 @@ ModuleExport size_t RegisterIPLImage(void)
   entry->decoder=(DecodeImageHandler *) ReadIPLImage;
   entry->encoder=(EncodeImageHandler *) WriteIPLImage;
   entry->magick=(IsImageFormatHandler *) IsIPL;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("IPL Image Sequence");
   entry->module=ConstantString("IPL");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/jbig.c b/coders/jbig.c
index c4fb61dbec81ae490562634c0fe270391a5ad716..eb18d4d27338855ff7e88cef4ab5291b79c9ae8e 100644 (file)
--- a/coders/jbig.c
+++ b/coders/jbig.c
@@ -311,7 +311,7 @@ ModuleExport size_t RegisterJBIGImage(void)
   entry->decoder=(DecodeImageHandler *) ReadJBIGImage;
   entry->encoder=(EncodeImageHandler *) WriteJBIGImage;
 #endif
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString(JBIGDescription);
   if (*version != '\0')
     entry->version=ConstantString(version);

diff --git a/coders/jnx.c b/coders/jnx.c
index 41c337b59b258370e4249ab681ac42b46250665e..841861f8529ad5201ffe556004c6eb9fa09c813f 100644 (file)
--- a/coders/jnx.c
+++ b/coders/jnx.c
@@ -359,7 +359,7 @@ ModuleExport size_t RegisterJNXImage(void)
   entry=SetMagickInfo("JNX");
   entry->decoder=(DecodeImageHandler *) ReadJNXImage;
   entry->description=ConstantString("Garmin tile format");
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->module=ConstantString("JNX");
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);

diff --git a/coders/jp2.c b/coders/jp2.c
index ca3c0bb8c5c039b8357fbbb267deec35776cbc53..3bc98f690552c27714b0a3d53b0895aac1c1e750 100644 (file)
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -549,8 +549,8 @@ ModuleExport size_t RegisterJP2Image(void)
   entry->mime_type=ConstantString("image/jp2");
   entry->module=ConstantString("JP2");
   entry->magick=(IsImageFormatHandler *) IsJP2;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
 #if defined(MAGICKCORE_LIBOPENJP2_DELEGATE)
   entry->decoder=(DecodeImageHandler *) ReadJP2Image;
   entry->encoder=(EncodeImageHandler *) WriteJP2Image;
@@ -563,8 +563,8 @@ ModuleExport size_t RegisterJP2Image(void)
   entry->mime_type=ConstantString("image/jp2");
   entry->module=ConstantString("JP2");
   entry->magick=(IsImageFormatHandler *) IsJ2K;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
 #if defined(MAGICKCORE_LIBOPENJP2_DELEGATE)
   entry->decoder=(DecodeImageHandler *) ReadJP2Image;
   entry->encoder=(EncodeImageHandler *) WriteJP2Image;
@@ -577,8 +577,8 @@ ModuleExport size_t RegisterJP2Image(void)
   entry->mime_type=ConstantString("image/jp2");
   entry->module=ConstantString("JP2");
   entry->magick=(IsImageFormatHandler *) IsJ2K;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
 #if defined(MAGICKCORE_LIBOPENJP2_DELEGATE)
   entry->decoder=(DecodeImageHandler *) ReadJP2Image;
   entry->encoder=(EncodeImageHandler *) WriteJP2Image;
@@ -591,8 +591,8 @@ ModuleExport size_t RegisterJP2Image(void)
   entry->mime_type=ConstantString("image/jp2");
   entry->module=ConstantString("JP2");
   entry->magick=(IsImageFormatHandler *) IsJP2;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
 #if defined(MAGICKCORE_LIBOPENJP2_DELEGATE)
   entry->decoder=(DecodeImageHandler *) ReadJP2Image;
   entry->encoder=(EncodeImageHandler *) WriteJP2Image;
@@ -605,8 +605,8 @@ ModuleExport size_t RegisterJP2Image(void)
   entry->mime_type=ConstantString("image/jp2");
   entry->module=ConstantString("JP2");
   entry->magick=(IsImageFormatHandler *) IsJP2;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
 #if defined(MAGICKCORE_LIBOPENJP2_DELEGATE)
   entry->decoder=(DecodeImageHandler *) ReadJP2Image;
   entry->encoder=(EncodeImageHandler *) WriteJP2Image;
@@ -619,8 +619,8 @@ ModuleExport size_t RegisterJP2Image(void)
   entry->mime_type=ConstantString("image/jp2");
   entry->module=ConstantString("JP2");
   entry->magick=(IsImageFormatHandler *) IsJP2;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
 #if defined(MAGICKCORE_LIBOPENJP2_DELEGATE)
   entry->decoder=(DecodeImageHandler *) ReadJP2Image;
   entry->encoder=(EncodeImageHandler *) WriteJP2Image;

diff --git a/coders/jpeg.c b/coders/jpeg.c
index 3d856130d954643d29c84e542b79bf93614b8839..0165bda475e8bae3ea00175ef60a3fd9e4a7308a 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1535,8 +1535,8 @@ ModuleExport size_t RegisterJPEGImage(void)
   entry->encoder=(EncodeImageHandler *) WriteJPEGImage;
 #endif
   entry->magick=(IsImageFormatHandler *) IsJPEG;
-  entry->flags^=Adjoin;
-  entry->flags^=UseExtension;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags^=CoderUseExtensionFlag;
   entry->description=ConstantString(description);
   if (*version != '\0')
     entry->version=ConstantString(version);
@@ -1552,7 +1552,7 @@ ModuleExport size_t RegisterJPEGImage(void)
   entry->encoder=(EncodeImageHandler *) WriteJPEGImage;
 #endif
   entry->magick=(IsImageFormatHandler *) IsJPEG;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString(description);
   if (*version != '\0')
     entry->version=ConstantString(version);
@@ -1567,8 +1567,8 @@ ModuleExport size_t RegisterJPEGImage(void)
   entry->decoder=(DecodeImageHandler *) ReadJPEGImage;
   entry->encoder=(EncodeImageHandler *) WriteJPEGImage;
 #endif
-  entry->flags^=Adjoin;
-  entry->flags^=UseExtension;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags^=CoderUseExtensionFlag;
   entry->description=ConstantString(description);
   if (*version != '\0')
     entry->version=ConstantString(version);
@@ -1583,8 +1583,8 @@ ModuleExport size_t RegisterJPEGImage(void)
   entry->decoder=(DecodeImageHandler *) ReadJPEGImage;
   entry->encoder=(EncodeImageHandler *) WriteJPEGImage;
 #endif
-  entry->flags^=Adjoin;
-  entry->flags^=UseExtension;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags^=CoderUseExtensionFlag;
   entry->description=ConstantString(description);
   if (*version != '\0')
     entry->version=ConstantString(version);
@@ -1599,8 +1599,8 @@ ModuleExport size_t RegisterJPEGImage(void)
   entry->decoder=(DecodeImageHandler *) ReadJPEGImage;
   entry->encoder=(EncodeImageHandler *) WriteJPEGImage;
 #endif
-  entry->flags^=Adjoin;
-  entry->flags^=UseExtension;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags^=CoderUseExtensionFlag;
   entry->description=ConstantString(description);
   if (*version != '\0')
     entry->version=ConstantString(version);

diff --git a/coders/json.c b/coders/json.c
index 257c11526b705afc84729310c4c6e4b0b362a8f5..d81a7d170a51be7a04fb75c58f1d465f217a907f 100644 (file)
--- a/coders/json.c
+++ b/coders/json.c
@@ -111,7 +111,7 @@ ModuleExport size_t RegisterJSONImage(void)
 
   entry=SetMagickInfo("JSON");
   entry->encoder=(EncodeImageHandler *) WriteJSONImage;
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString("The image format and characteristics");
   entry->module=ConstantString("JSON");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/label.c b/coders/label.c
index 49187e7693880ddb314d18e4ffa88a1b4e23ac5b..9d4fb6923faca894e69c23ee0a9a86f2a6f804b4 100644 (file)
--- a/coders/label.c
+++ b/coders/label.c
@@ -281,7 +281,7 @@ ModuleExport size_t RegisterLABELImage(void)
 
   entry=SetMagickInfo("LABEL");
   entry->decoder=(DecodeImageHandler *) ReadLABELImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->format_type=ImplicitFormatType;
   entry->description=ConstantString("Image label");
   entry->module=ConstantString("LABEL");

diff --git a/coders/magick.c b/coders/magick.c
index e8b9a410a58ac423a11354e1a5cef5bc7ed605bf..e3e8fe6fec0c975b702c7b0fffdd32d5c4c1e7df 100644 (file)
--- a/coders/magick.c
+++ b/coders/magick.c
@@ -13102,56 +13102,56 @@ ModuleExport size_t RegisterMAGICKImage(void)
   entry=SetMagickInfo("GRANITE");
   entry->decoder=(DecodeImageHandler *) ReadMAGICKImage;
   entry->encoder=(EncodeImageHandler *) WriteMAGICKImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
   entry->description=ConstantString("Granite texture");
   entry->module=ConstantString("MAGICK");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("H");
   entry->decoder=(DecodeImageHandler *) ReadMAGICKImage;
   entry->encoder=(EncodeImageHandler *) WriteMAGICKImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
   entry->description=ConstantString("Internal format");
   entry->module=ConstantString("MAGICK");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("LOGO");
   entry->decoder=(DecodeImageHandler *) ReadMAGICKImage;
   entry->encoder=(EncodeImageHandler *) WriteMAGICKImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
   entry->description=ConstantString("ImageMagick Logo");
   entry->module=ConstantString("MAGICK");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("MAGICK");
   entry->decoder=(DecodeImageHandler *) ReadMAGICKImage;
   entry->encoder=(EncodeImageHandler *) WriteMAGICKImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
   entry->description=ConstantString("Predefined Magick Image");
   entry->module=ConstantString("MAGICK");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("NETSCAPE");
   entry->decoder=(DecodeImageHandler *) ReadMAGICKImage;
   entry->encoder=(EncodeImageHandler *) WriteMAGICKImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
   entry->description=ConstantString("Netscape 216 color cube");
   entry->module=ConstantString("MAGICK");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("ROSE");
   entry->decoder=(DecodeImageHandler *) ReadMAGICKImage;
   entry->encoder=(EncodeImageHandler *) WriteMAGICKImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
   entry->description=ConstantString("70x46 Truecolor rose");
   entry->module=ConstantString("MAGICK");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("WIZARD");
   entry->decoder=(DecodeImageHandler *) ReadMAGICKImage;
   entry->encoder=(EncodeImageHandler *) WriteMAGICKImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
   entry->description=ConstantString("ImageMagick Wizard");
   entry->module=ConstantString("MAGICK");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/map.c b/coders/map.c
index adab648c9b59945984056c9066c5bf4e552e19d3..cac5692b0826250e1be1fb80ed082e908367b182 100644 (file)
--- a/coders/map.c
+++ b/coders/map.c
@@ -275,10 +275,10 @@ ModuleExport size_t RegisterMAPImage(void)
   entry=SetMagickInfo("MAP");
   entry->decoder=(DecodeImageHandler *) ReadMAPImage;
   entry->encoder=(EncodeImageHandler *) WriteMAPImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->format_type=ExplicitFormatType;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Colormap intensities and indices");
   entry->module=ConstantString("MAP");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/mat.c b/coders/mat.c
index be3dd4175c086bacb9077c71b98a602563e783e3..cd58d730ab03575d2ca8e7a217aecbf06b4291dd 100644 (file)
--- a/coders/mat.c
+++ b/coders/mat.c
@@ -1113,8 +1113,8 @@ ModuleExport size_t RegisterMATImage(void)
   entry=SetMagickInfo("MAT");
   entry->decoder=(DecodeImageHandler *) ReadMATImage;
   entry->encoder=(EncodeImageHandler *) WriteMATImage;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=AcquireString("MATLAB level 5 image format");
   entry->module=AcquireString("MAT");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/meta.c b/coders/meta.c
index 3115fe98fad489f146468f35ecd9d1524b074fc1..11caa56a4dcb2778366026978d5249e719e0e0aa 100644 (file)
--- a/coders/meta.c
+++ b/coders/meta.c
@@ -1355,108 +1355,108 @@ ModuleExport size_t RegisterMETAImage(void)
   entry=SetMagickInfo("8BIM");
   entry->decoder=(DecodeImageHandler *) ReadMETAImage;
   entry->encoder=(EncodeImageHandler *) WriteMETAImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Photoshop resource format");
   entry->module=ConstantString("META");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("8BIMTEXT");
   entry->decoder=(DecodeImageHandler *) ReadMETAImage;
   entry->encoder=(EncodeImageHandler *) WriteMETAImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Photoshop resource text format");
   entry->module=ConstantString("META");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("8BIMWTEXT");
   entry->decoder=(DecodeImageHandler *) ReadMETAImage;
   entry->encoder=(EncodeImageHandler *) WriteMETAImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Photoshop resource wide text format");
   entry->module=ConstantString("META");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("APP1");
   entry->decoder=(DecodeImageHandler *) ReadMETAImage;
   entry->encoder=(EncodeImageHandler *) WriteMETAImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Raw application information");
   entry->module=ConstantString("META");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("APP1JPEG");
   entry->decoder=(DecodeImageHandler *) ReadMETAImage;
   entry->encoder=(EncodeImageHandler *) WriteMETAImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Raw JPEG binary data");
   entry->module=ConstantString("META");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("EXIF");
   entry->decoder=(DecodeImageHandler *) ReadMETAImage;
   entry->encoder=(EncodeImageHandler *) WriteMETAImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Exif digital camera binary data");
   entry->module=ConstantString("META");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("XMP");
   entry->decoder=(DecodeImageHandler *) ReadMETAImage;
   entry->encoder=(EncodeImageHandler *) WriteMETAImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Adobe XML metadata");
   entry->module=ConstantString("META");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("ICM");
   entry->decoder=(DecodeImageHandler *) ReadMETAImage;
   entry->encoder=(EncodeImageHandler *) WriteMETAImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("ICC Color Profile");
   entry->module=ConstantString("META");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("ICC");
   entry->decoder=(DecodeImageHandler *) ReadMETAImage;
   entry->encoder=(EncodeImageHandler *) WriteMETAImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("ICC Color Profile");
   entry->module=ConstantString("META");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("IPTC");
   entry->decoder=(DecodeImageHandler *) ReadMETAImage;
   entry->encoder=(EncodeImageHandler *) WriteMETAImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("IPTC Newsphoto");
   entry->module=ConstantString("META");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("IPTCTEXT");
   entry->decoder=(DecodeImageHandler *) ReadMETAImage;
   entry->encoder=(EncodeImageHandler *) WriteMETAImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("IPTC Newsphoto text format");
   entry->module=ConstantString("META");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("IPTCWTEXT");
   entry->decoder=(DecodeImageHandler *) ReadMETAImage;
   entry->encoder=(EncodeImageHandler *) WriteMETAImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("IPTC Newsphoto text format");
   entry->module=ConstantString("META");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/miff.c b/coders/miff.c
index 5b65c0c7c708f8ae86781abce6f7dbb03c0623ef..9dba61ad096237c678c1095101fbdce0b3d8abc2 100644 (file)
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -1668,7 +1668,7 @@ ModuleExport size_t RegisterMIFFImage(void)
   entry->decoder=(DecodeImageHandler *) ReadMIFFImage;
   entry->encoder=(EncodeImageHandler *) WriteMIFFImage;
   entry->magick=(IsImageFormatHandler *) IsMIFF;
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Magick Image File Format");
   if (*version != '\0')
     entry->version=ConstantString(version);

diff --git a/coders/mono.c b/coders/mono.c
index bca3c53505c36c316a44b9c6e456285d093914de..919ae4d52404c9723cad2a1ff6aa23adf632ab9f 100644 (file)
--- a/coders/mono.c
+++ b/coders/mono.c
@@ -224,9 +224,9 @@ ModuleExport size_t RegisterMONOImage(void)
   entry=SetMagickInfo("MONO");
   entry->decoder=(DecodeImageHandler *) ReadMONOImage;
   entry->encoder=(EncodeImageHandler *) WriteMONOImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
-  entry->flags^=Adjoin;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Raw bi-level bitmap");
   entry->module=ConstantString("MONO");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/mpc.c b/coders/mpc.c
index da9b3bad648119088a6837191ad6fd42b76b901c..733da24c9873f153ec58aee315c0cee164721b51 100644 (file)
--- a/coders/mpc.c
+++ b/coders/mpc.c
@@ -992,7 +992,7 @@ ModuleExport size_t RegisterMPCImage(void)
   entry=SetMagickInfo("CACHE");
   entry->description=ConstantString("Magick Persistent Cache image format");
   entry->module=ConstantString("CACHE");
-  entry->flags|=Stealth;
+  entry->flags|=CoderStealthFlag;
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("MPC");
   entry->decoder=(DecodeImageHandler *) ReadMPCImage;

diff --git a/coders/mpeg.c b/coders/mpeg.c
index cf7b559a614afc91c86776eae536e51f50a38c92..c0b481cf1e7948d029c523c9e75d8f9a80897640 100644 (file)
--- a/coders/mpeg.c
+++ b/coders/mpeg.c
@@ -243,7 +243,7 @@ ModuleExport size_t RegisterMPEGImage(void)
   entry=SetMagickInfo("AVI");
   entry->decoder=(DecodeImageHandler *) ReadMPEGImage;
   entry->magick=(IsImageFormatHandler *) IsAVI;
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString("Microsoft Audio/Visual Interleaved");
   entry->module=ConstantString("MPEG");
   (void) RegisterMagickInfo(entry);
@@ -251,7 +251,7 @@ ModuleExport size_t RegisterMPEGImage(void)
   entry->decoder=(DecodeImageHandler *) ReadMPEGImage;
   entry->encoder=(EncodeImageHandler *) WriteMPEGImage;
   entry->magick=(IsImageFormatHandler *) IsMPEG;
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString("MPEG Video Stream");
   entry->module=ConstantString("MPEG");
   (void) RegisterMagickInfo(entry);
@@ -259,7 +259,7 @@ ModuleExport size_t RegisterMPEGImage(void)
   entry->decoder=(DecodeImageHandler *) ReadMPEGImage;
   entry->encoder=(EncodeImageHandler *) WriteMPEGImage;
   entry->magick=(IsImageFormatHandler *) IsMPEG;
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString("MPEG Video Stream");
   entry->module=ConstantString("MPEG");
   (void) RegisterMagickInfo(entry);
@@ -267,7 +267,7 @@ ModuleExport size_t RegisterMPEGImage(void)
   entry->decoder=(DecodeImageHandler *) ReadMPEGImage;
   entry->encoder=(EncodeImageHandler *) WriteMPEGImage;
   entry->magick=(IsImageFormatHandler *) IsMPEG;
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString("MPEG Video Stream");
   entry->module=ConstantString("MPEG");
   (void) RegisterMagickInfo(entry);
@@ -275,7 +275,7 @@ ModuleExport size_t RegisterMPEGImage(void)
   entry->decoder=(DecodeImageHandler *) ReadMPEGImage;
   entry->encoder=(EncodeImageHandler *) WriteMPEGImage;
   entry->magick=(IsImageFormatHandler *) IsMPEG;
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString("MPEG-4 Video Stream");
   entry->module=ConstantString("MPEG");
   (void) RegisterMagickInfo(entry);
@@ -283,7 +283,7 @@ ModuleExport size_t RegisterMPEGImage(void)
   entry->decoder=(DecodeImageHandler *) ReadMPEGImage;
   entry->encoder=(EncodeImageHandler *) WriteMPEGImage;
   entry->magick=(IsImageFormatHandler *) IsMPEG;
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString("MPEG Video Stream");
   entry->module=ConstantString("MPEG");
   (void) RegisterMagickInfo(entry);
@@ -291,7 +291,7 @@ ModuleExport size_t RegisterMPEGImage(void)
   entry->decoder=(DecodeImageHandler *) ReadMPEGImage;
   entry->encoder=(EncodeImageHandler *) WriteMPEGImage;
   entry->magick=(IsImageFormatHandler *) IsMPEG;
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString("Raw MPEG-4 Video");
   entry->module=ConstantString("MPEG");
   (void) RegisterMagickInfo(entry);
@@ -299,7 +299,7 @@ ModuleExport size_t RegisterMPEGImage(void)
   entry->decoder=(DecodeImageHandler *) ReadMPEGImage;
   entry->encoder=(EncodeImageHandler *) WriteMPEGImage;
   entry->magick=(IsImageFormatHandler *) IsMPEG;
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString("Windows Media Video");
   entry->module=ConstantString("MPEG");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/mpr.c b/coders/mpr.c
index 5221e421e86a9b0f89a45228d519187d45dfb6bb..9281dca173feee24cd14dff2525fcea514c766cc 100644 (file)
--- a/coders/mpr.c
+++ b/coders/mpr.c
@@ -135,18 +135,18 @@ ModuleExport size_t RegisterMPRImage(void)
   entry=SetMagickInfo("MPR");
   entry->decoder=(DecodeImageHandler *) ReadMPRImage;
   entry->encoder=(EncodeImageHandler *) WriteMPRImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->format_type=ImplicitFormatType;
-  entry->flags|=Stealth;
+  entry->flags|=CoderStealthFlag;
   entry->description=ConstantString("Magick Persistent Registry");
   entry->module=ConstantString("MPR");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("MPRI");
   entry->decoder=(DecodeImageHandler *) ReadMPRImage;
   entry->encoder=(EncodeImageHandler *) WriteMPRImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->format_type=ImplicitFormatType;
-  entry->flags|=Stealth;
+  entry->flags|=CoderStealthFlag;
   entry->description=ConstantString("Magick Persistent Registry");
   entry->module=ConstantString("MPRI");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/mvg.c b/coders/mvg.c
index fbadd465e0d1c3ed389cdd37093858c384a48913..facf49de11ea29c3fb29871adf162107b63a67c3 100644 (file)
--- a/coders/mvg.c
+++ b/coders/mvg.c
@@ -250,8 +250,8 @@ ModuleExport size_t RegisterMVGImage(void)
   entry->decoder=(DecodeImageHandler *) ReadMVGImage;
   entry->encoder=(EncodeImageHandler *) WriteMVGImage;
   entry->magick=(IsImageFormatHandler *) IsMVG;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Magick Vector Graphics");
   entry->module=ConstantString("MVG");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/null.c b/coders/null.c
index 95c3ac2950517d2f1d31334fca52a235f8d826c9..69c218e2f8adafb6316993691f3a149b12c513e4 100644 (file)
--- a/coders/null.c
+++ b/coders/null.c
@@ -182,7 +182,7 @@ ModuleExport size_t RegisterNULLImage(void)
   entry=SetMagickInfo("NULL");
   entry->decoder=(DecodeImageHandler *) ReadNULLImage;
   entry->encoder=(EncodeImageHandler *) WriteNULLImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->format_type=ImplicitFormatType;
   entry->description=ConstantString("Constant image of uniform color");
   entry->module=ConstantString("NULL");

diff --git a/coders/otb.c b/coders/otb.c
index 6572614c2d27bbdfb3694250f5af8c133a0fe80e..408bfe524e099e54cf0ef5db92e2f304b2afb722 100644 (file)
--- a/coders/otb.c
+++ b/coders/otb.c
@@ -241,7 +241,7 @@ ModuleExport size_t RegisterOTBImage(void)
   entry=SetMagickInfo("OTB");
   entry->decoder=(DecodeImageHandler *) ReadOTBImage;
   entry->encoder=(EncodeImageHandler *) WriteOTBImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("On-the-air bitmap");
   entry->module=ConstantString("OTB");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/palm.c b/coders/palm.c
index 06b4e8e73914fe9da448a128de96e089885fb86f..9b951b2f2fa53ec8e6a88dacae7ee2b5edf1aa61 100644 (file)
--- a/coders/palm.c
+++ b/coders/palm.c
@@ -607,7 +607,7 @@ ModuleExport size_t RegisterPALMImage(void)
   entry=SetMagickInfo("PALM");
   entry->decoder=(DecodeImageHandler *) ReadPALMImage;
   entry->encoder=(EncodeImageHandler *) WritePALMImage;
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Palm pixmap");
   entry->module=ConstantString("PALM");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/pango.c b/coders/pango.c
index 17ecf9d946e97374fd528e3dfa8a13723fb18b48..3907acd0f970f4590c716beb506eb75047082ec8 100644 (file)
--- a/coders/pango.c
+++ b/coders/pango.c
@@ -507,7 +507,7 @@ ModuleExport size_t RegisterPANGOImage(void)
   entry->description=ConstantString("Pango Markup Language");
   if (*version != '\0')
     entry->version=ConstantString(version);
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->module=ConstantString("PANGO");
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);

diff --git a/coders/pattern.c b/coders/pattern.c
index f9d9c9db978f3eb075df27fa6f0e3e58b2ee9d39..d9426da190653dd6425cb37a500b07cbfdfc9144 100644 (file)
--- a/coders/pattern.c
+++ b/coders/pattern.c
@@ -1025,7 +1025,7 @@ ModuleExport size_t RegisterPATTERNImage(void)
 
   entry=SetMagickInfo("PATTERN");
   entry->decoder=(DecodeImageHandler *) ReadPATTERNImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Predefined pattern");
   entry->module=ConstantString("PATTERN");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/pcd.c b/coders/pcd.c
index a810cc5af9459cd3a8a72c7611b5e0ca96d09d45..fe34c7a6f1d1a528dbb8052ed042c441eacafbcb 100644 (file)
--- a/coders/pcd.c
+++ b/coders/pcd.c
@@ -873,16 +873,16 @@ ModuleExport size_t RegisterPCDImage(void)
   entry->decoder=(DecodeImageHandler *) ReadPCDImage;
   entry->encoder=(EncodeImageHandler *) WritePCDImage;
   entry->magick=(IsImageFormatHandler *) IsPCD;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Photo CD");
   entry->module=ConstantString("PCD");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("PCDS");
   entry->decoder=(DecodeImageHandler *) ReadPCDImage;
   entry->encoder=(EncodeImageHandler *) WritePCDImage;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Photo CD");
   entry->module=ConstantString("PCD");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/pcl.c b/coders/pcl.c
index 530d66ed41a07f4fd751f5b67951e61253c1081f..3a92922d76968456fdcb72e61b84851abbcb0875 100644 (file)
--- a/coders/pcl.c
+++ b/coders/pcl.c
@@ -425,9 +425,9 @@ ModuleExport size_t RegisterPCLImage(void)
   entry->decoder=(DecodeImageHandler *) ReadPCLImage;
   entry->encoder=(EncodeImageHandler *) WritePCLImage;
   entry->magick=(IsImageFormatHandler *) IsPCL;
-  entry->flags^=BlobSupport;
-  entry->flags^=DecoderThreadSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags^=CoderDecoderThreadSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Printer Control Language");
   entry->module=ConstantString("PCL");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/pcx.c b/coders/pcx.c
index 7affd9e6a3fd92f6439deda6ae1308aeb566fbba..617694a57f1cec1ef2d685c6ba7fa44f15ffb3ae 100644 (file)
--- a/coders/pcx.c
+++ b/coders/pcx.c
@@ -710,7 +710,7 @@ ModuleExport size_t RegisterPCXImage(void)
   entry=SetMagickInfo("DCX");
   entry->decoder=(DecodeImageHandler *) ReadPCXImage;
   entry->encoder=(EncodeImageHandler *) WritePCXImage;
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->magick=(IsImageFormatHandler *) IsDCX;
   entry->description=ConstantString("ZSoft IBM PC multi-page Paintbrush");
   entry->module=ConstantString("PCX");
@@ -719,8 +719,8 @@ ModuleExport size_t RegisterPCXImage(void)
   entry->decoder=(DecodeImageHandler *) ReadPCXImage;
   entry->encoder=(EncodeImageHandler *) WritePCXImage;
   entry->magick=(IsImageFormatHandler *) IsPCX;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("ZSoft IBM PC Paintbrush");
   entry->module=ConstantString("PCX");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/pdf.c b/coders/pdf.c
index d73f47cd28c57dcc2b74f7b7f627351c62725dac..cdd14231126fd635f432665eef24cd0bba788f82 100644 (file)
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -865,9 +865,9 @@ ModuleExport size_t RegisterPDFImage(void)
   entry=SetMagickInfo("AI");
   entry->decoder=(DecodeImageHandler *) ReadPDFImage;
   entry->encoder=(EncodeImageHandler *) WritePDFImage;
-  entry->flags^=Adjoin;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Adobe Illustrator CS2");
   entry->mime_type=ConstantString("application/pdf");
   entry->module=ConstantString("PDF");
@@ -875,9 +875,9 @@ ModuleExport size_t RegisterPDFImage(void)
   entry=SetMagickInfo("EPDF");
   entry->decoder=(DecodeImageHandler *) ReadPDFImage;
   entry->encoder=(EncodeImageHandler *) WritePDFImage;
-  entry->flags^=Adjoin;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Encapsulated Portable Document Format");
   entry->mime_type=ConstantString("application/pdf");
   entry->module=ConstantString("PDF");
@@ -886,8 +886,8 @@ ModuleExport size_t RegisterPDFImage(void)
   entry->decoder=(DecodeImageHandler *) ReadPDFImage;
   entry->encoder=(EncodeImageHandler *) WritePDFImage;
   entry->magick=(IsImageFormatHandler *) IsPDF;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Portable Document Format");
   entry->mime_type=ConstantString("application/pdf");
   entry->module=ConstantString("PDF");
@@ -896,8 +896,8 @@ ModuleExport size_t RegisterPDFImage(void)
   entry->decoder=(DecodeImageHandler *) ReadPDFImage;
   entry->encoder=(EncodeImageHandler *) WritePDFImage;
   entry->magick=(IsImageFormatHandler *) IsPDF;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Portable Document Archive Format");
   entry->mime_type=ConstantString("application/pdf");
   entry->module=ConstantString("PDF");

diff --git a/coders/pict.c b/coders/pict.c
index 349015e0c14b4221858b72617dfcf025ffd6fc49..cc14ef06b9163d345e8b5647eaca7dd4877ecf33 100644 (file)
--- a/coders/pict.c
+++ b/coders/pict.c
@@ -1502,8 +1502,8 @@ ModuleExport size_t RegisterPICTImage(void)
   entry=SetMagickInfo("PCT");
   entry->decoder=(DecodeImageHandler *) ReadPICTImage;
   entry->encoder=(EncodeImageHandler *) WritePICTImage;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Apple Macintosh QuickDraw/PICT");
   entry->magick=(IsImageFormatHandler *) IsPICT;
   entry->module=ConstantString("PICT");
@@ -1511,8 +1511,8 @@ ModuleExport size_t RegisterPICTImage(void)
   entry=SetMagickInfo("PICT");
   entry->decoder=(DecodeImageHandler *) ReadPICTImage;
   entry->encoder=(EncodeImageHandler *) WritePICTImage;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Apple Macintosh QuickDraw/PICT");
   entry->magick=(IsImageFormatHandler *) IsPICT;
   entry->module=ConstantString("PICT");

diff --git a/coders/plasma.c b/coders/plasma.c
index eeaf9236a4d70855204860a98684116c4283bb47..cd8b906d932e4b1ebed299ffad12e316c086ca60 100644 (file)
--- a/coders/plasma.c
+++ b/coders/plasma.c
@@ -241,14 +241,14 @@ ModuleExport size_t RegisterPLASMAImage(void)
 
   entry=SetMagickInfo("PLASMA");
   entry->decoder=(DecodeImageHandler *) ReadPlasmaImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->format_type=ImplicitFormatType;
   entry->description=ConstantString("Plasma fractal image");
   entry->module=ConstantString("PLASMA");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("FRACTAL");
   entry->decoder=(DecodeImageHandler *) ReadPlasmaImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->format_type=ImplicitFormatType;
   entry->description=ConstantString("Plasma fractal image");
   entry->module=ConstantString("PLASMA");

diff --git a/coders/png.c b/coders/png.c
index eed4b448c7bb50b3fca1a85b180ed30c1b4715c4..2cce33f30f0b85d6ff5036f9441945c341a16c69 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -7378,7 +7378,7 @@ ModuleExport size_t RegisterPNGImage(void)
 #endif
 
   entry=SetMagickInfo("MNG");
-  entry->flags|=SeekableStream;  /* To do: eliminate this. */
+  entry->flags|=CoderSeekableStreamFlag;  /* To do: eliminate this. */
 
 #if defined(MAGICKCORE_PNG_DELEGATE)
   entry->decoder=(DecodeImageHandler *) ReadMNGImage;
@@ -7404,7 +7404,7 @@ ModuleExport size_t RegisterPNGImage(void)
 #endif
 
   entry->magick=(IsImageFormatHandler *) IsPNG;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Portable Network Graphics");
   entry->mime_type=ConstantString("image/png");
   entry->module=ConstantString("PNG");
@@ -7423,7 +7423,7 @@ ModuleExport size_t RegisterPNGImage(void)
 #endif
 
   entry->magick=(IsImageFormatHandler *) IsPNG;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString(
             "8-bit indexed with optional binary transparency");
   entry->mime_type=ConstantString("image/png");
@@ -7453,7 +7453,7 @@ ModuleExport size_t RegisterPNGImage(void)
 #endif
 
   entry->magick=(IsImageFormatHandler *) IsPNG;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("opaque or binary transparent 24-bit RGB");
   entry->mime_type=ConstantString("image/png");
   entry->module=ConstantString("PNG");
@@ -7467,7 +7467,7 @@ ModuleExport size_t RegisterPNGImage(void)
 #endif
 
   entry->magick=(IsImageFormatHandler *) IsPNG;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("opaque or transparent 32-bit RGBA");
   entry->mime_type=ConstantString("image/png");
   entry->module=ConstantString("PNG");
@@ -7481,7 +7481,7 @@ ModuleExport size_t RegisterPNGImage(void)
 #endif
 
   entry->magick=(IsImageFormatHandler *) IsPNG;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("opaque or binary transparent 48-bit RGB");
   entry->mime_type=ConstantString("image/png");
   entry->module=ConstantString("PNG");
@@ -7495,7 +7495,7 @@ ModuleExport size_t RegisterPNGImage(void)
 #endif
 
   entry->magick=(IsImageFormatHandler *) IsPNG;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("opaque or transparent 64-bit RGBA");
   entry->mime_type=ConstantString("image/png");
   entry->module=ConstantString("PNG");
@@ -7509,7 +7509,7 @@ ModuleExport size_t RegisterPNGImage(void)
 #endif
 
   entry->magick=(IsImageFormatHandler *) IsPNG;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString(
     "PNG inheriting bit-depth and color-type from original");
   entry->mime_type=ConstantString("image/png");
@@ -7526,7 +7526,7 @@ ModuleExport size_t RegisterPNGImage(void)
 #endif
 
   entry->magick=(IsImageFormatHandler *) IsJNG;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("JPEG Network Graphics");
   entry->mime_type=ConstantString("image/x-jng");
   entry->module=ConstantString("PNG");

diff --git a/coders/pnm.c b/coders/pnm.c
index 1d0ea17b24e93972edf1ebf635f8442855574948..a0e1e6af1c87ed26b7fa831f02f5809eacd9780d 100644 (file)
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -1426,7 +1426,7 @@ ModuleExport size_t RegisterPNMImage(void)
   entry=SetMagickInfo("PFM");
   entry->decoder=(DecodeImageHandler *) ReadPNMImage;
   entry->encoder=(EncodeImageHandler *) WritePNMImage;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Portable float format");
   entry->module=ConstantString("PFM");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/preview.c b/coders/preview.c
index ae33b8209fb468a062d7a51a6129f105d7766b87..02ff75f9a58e4ff87822e9eaa843e6d3b0b7fb58 100644 (file)
--- a/coders/preview.c
+++ b/coders/preview.c
@@ -100,7 +100,7 @@ ModuleExport size_t RegisterPREVIEWImage(void)
 
   entry=SetMagickInfo("PREVIEW");
   entry->encoder=(EncodeImageHandler *) WritePreviewImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->format_type=ImplicitFormatType;
   entry->description=ConstantString(
     "Show a preview an image enhancement, effect, or f/x");

diff --git a/coders/ps.c b/coders/ps.c
index 1b57313be1ed091fb808dc0ab32609022aed80e5..adddfbdc56837a0194484d660487b034e52c5752 100644 (file)
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -1038,9 +1038,9 @@ ModuleExport size_t RegisterPSImage(void)
   entry->decoder=(DecodeImageHandler *) ReadPSImage;
   entry->encoder=(EncodeImageHandler *) WritePSImage;
   entry->magick=(IsImageFormatHandler *) IsPS;
-  entry->flags^=Adjoin;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString(
     "Encapsulated PostScript Interchange format");
   entry->mime_type=ConstantString("application/postscript");
@@ -1050,9 +1050,9 @@ ModuleExport size_t RegisterPSImage(void)
   entry->decoder=(DecodeImageHandler *) ReadPSImage;
   entry->encoder=(EncodeImageHandler *) WritePSImage;
   entry->magick=(IsImageFormatHandler *) IsPS;
-  entry->flags^=Adjoin;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Encapsulated PostScript");
   entry->mime_type=ConstantString("application/postscript");
   entry->module=ConstantString("PS");
@@ -1061,9 +1061,9 @@ ModuleExport size_t RegisterPSImage(void)
   entry->decoder=(DecodeImageHandler *) ReadPSImage;
   entry->encoder=(EncodeImageHandler *) WritePSImage;
   entry->magick=(IsImageFormatHandler *) IsPS;
-  entry->flags^=Adjoin;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Encapsulated PostScript");
   entry->mime_type=ConstantString("application/postscript");
   entry->module=ConstantString("PS");
@@ -1072,9 +1072,9 @@ ModuleExport size_t RegisterPSImage(void)
   entry->decoder=(DecodeImageHandler *) ReadPSImage;
   entry->encoder=(EncodeImageHandler *) WritePSImage;
   entry->magick=(IsImageFormatHandler *) IsPS;
-  entry->flags^=Adjoin;
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString(
     "Encapsulated PostScript Interchange format");
   entry->mime_type=ConstantString("application/postscript");
@@ -1086,8 +1086,8 @@ ModuleExport size_t RegisterPSImage(void)
   entry->magick=(IsImageFormatHandler *) IsPS;
   entry->mime_type=ConstantString("application/postscript");
   entry->module=ConstantString("PS");
-  entry->flags^=BlobSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("PostScript");
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);

diff --git a/coders/ps2.c b/coders/ps2.c
index 44b9b8b5c8e19f0b84b35e4301766d68b8b060f4..7052f14aad40726e8d0fcd8a568156b9ab6ab1b6 100644 (file)
--- a/coders/ps2.c
+++ b/coders/ps2.c
@@ -115,15 +115,15 @@ ModuleExport size_t RegisterPS2Image(void)
 
   entry=SetMagickInfo("EPS2");
   entry->encoder=(EncodeImageHandler *) WritePS2Image;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Level II Encapsulated PostScript");
   entry->mime_type=ConstantString("application/postscript");
   entry->module=ConstantString("PS2");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("PS2");
   entry->encoder=(EncodeImageHandler *) WritePS2Image;
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Level II PostScript");
   entry->mime_type=ConstantString("application/postscript");
   entry->module=ConstantString("PS2");

diff --git a/coders/ps3.c b/coders/ps3.c
index 5ca909c55dd983c9e3d05dab058074e55d130b71..6481ba0c6059394e80b182cc6472c5c5b874ee94 100644 (file)
--- a/coders/ps3.c
+++ b/coders/ps3.c
@@ -134,14 +134,14 @@ ModuleExport size_t RegisterPS3Image(void)
   entry->description=ConstantString("Level III Encapsulated PostScript");
   entry->mime_type=ConstantString("application/postscript");
   entry->module=ConstantString("PS3");
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderSeekableStreamFlag;
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("PS3");
   entry->encoder=(EncodeImageHandler *) WritePS3Image;
   entry->description=ConstantString("Level III PostScript");
   entry->mime_type=ConstantString("application/postscript");
   entry->module=ConstantString("PS3");
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderSeekableStreamFlag;
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);
 }

diff --git a/coders/psd.c b/coders/psd.c
index 71276aa292c96d14d9bd9e932301cde2a26eb1b3..603fe0986a49db67cb9bdc2e5adef3553a7261b1 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -1884,7 +1884,7 @@ ModuleExport size_t RegisterPSDImage(void)
   entry->decoder=(DecodeImageHandler *) ReadPSDImage;
   entry->encoder=(EncodeImageHandler *) WritePSDImage;
   entry->magick=(IsImageFormatHandler *) IsPSD;
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Adobe Large Document Format");
   entry->module=ConstantString("PSD");
   (void) RegisterMagickInfo(entry);
@@ -1892,7 +1892,7 @@ ModuleExport size_t RegisterPSDImage(void)
   entry->decoder=(DecodeImageHandler *) ReadPSDImage;
   entry->encoder=(EncodeImageHandler *) WritePSDImage;
   entry->magick=(IsImageFormatHandler *) IsPSD;
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Adobe Photoshop bitmap");
   entry->module=ConstantString("PSD");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/raw.c b/coders/raw.c
index 6e7d1f51d6585eff75225ae0d2e7505a98c82ab2..52f0562f1299a961959f9e3c02e4bb2def18a024 100644 (file)
--- a/coders/raw.c
+++ b/coders/raw.c
@@ -308,72 +308,72 @@ ModuleExport size_t RegisterRAWImage(void)
   entry=SetMagickInfo("R");
   entry->decoder=(DecodeImageHandler *) ReadRAWImage;
   entry->encoder=(EncodeImageHandler *) WriteRAWImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Raw red samples");
   entry->module=ConstantString("RAW");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("C");
   entry->decoder=(DecodeImageHandler *) ReadRAWImage;
   entry->encoder=(EncodeImageHandler *) WriteRAWImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Raw cyan samples");
   entry->module=ConstantString("RAW");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("G");
   entry->decoder=(DecodeImageHandler *) ReadRAWImage;
   entry->encoder=(EncodeImageHandler *) WriteRAWImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Raw green samples");
   entry->module=ConstantString("RAW");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("M");
   entry->decoder=(DecodeImageHandler *) ReadRAWImage;
   entry->encoder=(EncodeImageHandler *) WriteRAWImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Raw magenta samples");
   entry->module=ConstantString("RAW");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("B");
   entry->decoder=(DecodeImageHandler *) ReadRAWImage;
   entry->encoder=(EncodeImageHandler *) WriteRAWImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Raw blue samples");
   entry->module=ConstantString("RAW");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("Y");
   entry->decoder=(DecodeImageHandler *) ReadRAWImage;
   entry->encoder=(EncodeImageHandler *) WriteRAWImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Raw yellow samples");
   entry->module=ConstantString("RAW");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("A");
   entry->decoder=(DecodeImageHandler *) ReadRAWImage;
   entry->encoder=(EncodeImageHandler *) WriteRAWImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Raw alpha samples");
   entry->module=ConstantString("RAW");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("O");
   entry->decoder=(DecodeImageHandler *) ReadRAWImage;
   entry->encoder=(EncodeImageHandler *) WriteRAWImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Raw opacity samples");
   entry->module=ConstantString("RAW");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("K");
   entry->decoder=(DecodeImageHandler *) ReadRAWImage;
   entry->encoder=(EncodeImageHandler *) WriteRAWImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Raw black samples");
   entry->module=ConstantString("RAW");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/rgb.c b/coders/rgb.c
index fea03ac6263f25f1486206299b2a01680b272ced..f93861b03ee0c771ccf3e6953d1ca3a963576cdb 100644 (file)
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -1014,24 +1014,24 @@ ModuleExport size_t RegisterRGBImage(void)
   entry=SetMagickInfo("RGB");
   entry->decoder=(DecodeImageHandler *) ReadRGBImage;
   entry->encoder=(EncodeImageHandler *) WriteRGBImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Raw red, green, and blue samples");
   entry->module=ConstantString("RGB");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("RGBA");
   entry->decoder=(DecodeImageHandler *) ReadRGBImage;
   entry->encoder=(EncodeImageHandler *) WriteRGBImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Raw red, green, blue, and alpha samples");
   entry->module=ConstantString("RGB");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("RGBO");
   entry->decoder=(DecodeImageHandler *) ReadRGBImage;
   entry->encoder=(EncodeImageHandler *) WriteRGBImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Raw red, green, blue, and opacity samples");
   entry->module=ConstantString("RGB");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/rgf.c b/coders/rgf.c
index 561b763a1bd730e8a9ea51b438d29f49b3205f7f..e3d7a9f0fc4d0e58ab41bd253a7128bc7ba9d435 100644 (file)
--- a/coders/rgf.c
+++ b/coders/rgf.c
@@ -250,7 +250,7 @@ ModuleExport size_t RegisterRGFImage(void)
   entry=SetMagickInfo("RGF");
   entry->decoder=(DecodeImageHandler *) ReadRGFImage;
   entry->encoder=(EncodeImageHandler *) WriteRGFImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString(
     "LEGO Mindstorms EV3 Robot Graphic Format (black and white)");
   entry->module=ConstantString("RGF");

diff --git a/coders/rla.c b/coders/rla.c
index cc06c0c915c14667b301c9f294142ce90bd0e676..a1abc194fec329bd93eac897dbea617e41f0fedf 100644 (file)
--- a/coders/rla.c
+++ b/coders/rla.c
@@ -425,8 +425,8 @@ ModuleExport size_t RegisterRLAImage(void)
 
   entry=SetMagickInfo("RLA");
   entry->decoder=(DecodeImageHandler *) ReadRLAImage;
-  entry->flags^=Adjoin;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Alias/Wavefront image");
   entry->module=ConstantString("RLA");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/rle.c b/coders/rle.c
index 36047554878e5e640709d5a67fea1c6cc84968a8..f4ed8a6b62a2794a76b78b9acb914f6cf8042e56 100644 (file)
--- a/coders/rle.c
+++ b/coders/rle.c
@@ -686,7 +686,7 @@ ModuleExport size_t RegisterRLEImage(void)
   entry=SetMagickInfo("RLE");
   entry->decoder=(DecodeImageHandler *) ReadRLEImage;
   entry->magick=(IsImageFormatHandler *) IsRLE;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Utah Run length encoded image");
   entry->module=ConstantString("RLE");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/scr.c b/coders/scr.c
index 1c4911d855aef381d589281fa44f5d78b3dc0b01..32743da88c5bdd919e7398ba05051a144716a187 100644 (file)
--- a/coders/scr.c
+++ b/coders/scr.c
@@ -276,7 +276,7 @@ ModuleExport size_t RegisterSCRImage(void)
 
   entry=SetMagickInfo("SCR");
   entry->decoder=(DecodeImageHandler *) ReadSCRImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("ZX-Spectrum SCREEN$");
   entry->module=ConstantString("SCR");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/sct.c b/coders/sct.c
index a40329c89db9cd4953cc931e9d7258f03fbfda5c..11a16df78f3eb87898520d27b4c44729bd976b25 100644 (file)
--- a/coders/sct.c
+++ b/coders/sct.c
@@ -315,7 +315,7 @@ ModuleExport size_t RegisterSCTImage(void)
   entry=SetMagickInfo("SCT");
   entry->decoder=(DecodeImageHandler *) ReadSCTImage;
   entry->magick=(IsImageFormatHandler *) IsSCT;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Scitex HandShake");
   entry->module=ConstantString("SCT");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/sfw.c b/coders/sfw.c
index d6a73858531673236fdb5fdd0ef5b74f835b381c..dbc8bffb0d8e1c777ba1f6585bc7fa4757813cab 100644 (file)
--- a/coders/sfw.c
+++ b/coders/sfw.c
@@ -401,7 +401,7 @@ ModuleExport size_t RegisterSFWImage(void)
   entry=SetMagickInfo("SFW");
   entry->decoder=(DecodeImageHandler *) ReadSFWImage;
   entry->magick=(IsImageFormatHandler *) IsSFW;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Seattle Film Works");
   entry->module=ConstantString("SFW");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/sgi.c b/coders/sgi.c
index fcc9f4a5fc818bc9ad7757182568cc8ac35dd20e..0991b19834c6f93c1e1b03cd5d38890123de0730 100644 (file)
--- a/coders/sgi.c
+++ b/coders/sgi.c
@@ -749,7 +749,7 @@ ModuleExport size_t RegisterSGIImage(void)
   entry->magick=(IsImageFormatHandler *) IsSGI;
   entry->description=ConstantString("Irix RGB image");
   entry->module=ConstantString("SGI");
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderSeekableStreamFlag;
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);
 }

diff --git a/coders/sixel.c b/coders/sixel.c
index b888db4ac5c80daa9b7d3fecf9d21bc9da85ae80..bfab580f19d845978f170669da351bb1836b8850 100644 (file)
--- a/coders/sixel.c
+++ b/coders/sixel.c
@@ -1109,7 +1109,7 @@ ModuleExport size_t RegisterSIXELImage(void)
   entry->decoder=(DecodeImageHandler *) ReadSIXELImage;
   entry->encoder=(EncodeImageHandler *) WriteSIXELImage;
   entry->magick=(IsImageFormatHandler *) IsSIXEL;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("DEC SIXEL Graphics Format");
   entry->module=ConstantString("SIXEL");
   (void) RegisterMagickInfo(entry);
@@ -1117,7 +1117,7 @@ ModuleExport size_t RegisterSIXELImage(void)
   entry->decoder=(DecodeImageHandler *) ReadSIXELImage;
   entry->encoder=(EncodeImageHandler *) WriteSIXELImage;
   entry->magick=(IsImageFormatHandler *) IsSIXEL;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("DEC SIXEL Graphics Format");
   entry->module=ConstantString("SIX");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/svg.c b/coders/svg.c
index 3299a82f33f5371026a89cfbaa5d2234c3bc4e31..560d0cdc1c8e14766b60f254b07b50c707de5082 100644 (file)
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -3249,7 +3249,7 @@ ModuleExport size_t RegisterSVGImage(void)
   entry->decoder=(DecodeImageHandler *) ReadSVGImage;
 #endif
   entry->encoder=(EncodeImageHandler *) WriteSVGImage;
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString("Scalable Vector Graphics");
   entry->mime_type=ConstantString("image/svg+xml");
   if (*version != '\0')
@@ -3262,7 +3262,7 @@ ModuleExport size_t RegisterSVGImage(void)
   entry->decoder=(DecodeImageHandler *) ReadSVGImage;
 #endif
   entry->encoder=(EncodeImageHandler *) WriteSVGImage;
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString("Compressed Scalable Vector Graphics");
   entry->mime_type=ConstantString("image/svg+xml");
   if (*version != '\0')
@@ -3275,7 +3275,7 @@ ModuleExport size_t RegisterSVGImage(void)
   entry->decoder=(DecodeImageHandler *) ReadSVGImage;
 #endif
   entry->encoder=(EncodeImageHandler *) WriteSVGImage;
-  entry->flags^=BlobSupport;
+  entry->flags^=CoderBlobSupportFlag;
   entry->description=ConstantString("ImageMagick's own SVG internal renderer");
   entry->magick=(IsImageFormatHandler *) IsSVG;
   entry->module=ConstantString("SVG");

diff --git a/coders/tga.c b/coders/tga.c
index 00579562ddf58d04153f973517a6c857d59d329d..dc27bc581afe844dd6ad52588f250edca0e1da1a 100644 (file)
--- a/coders/tga.c
+++ b/coders/tga.c
@@ -573,28 +573,28 @@ ModuleExport size_t RegisterTGAImage(void)
   entry=SetMagickInfo("ICB");
   entry->decoder=(DecodeImageHandler *) ReadTGAImage;
   entry->encoder=(EncodeImageHandler *) WriteTGAImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Truevision Targa image");
   entry->module=ConstantString("TGA");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("TGA");
   entry->decoder=(DecodeImageHandler *) ReadTGAImage;
   entry->encoder=(EncodeImageHandler *) WriteTGAImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Truevision Targa image");
   entry->module=ConstantString("TGA");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("VDA");
   entry->decoder=(DecodeImageHandler *) ReadTGAImage;
   entry->encoder=(EncodeImageHandler *) WriteTGAImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Truevision Targa image");
   entry->module=ConstantString("TGA");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("VST");
   entry->decoder=(DecodeImageHandler *) ReadTGAImage;
   entry->encoder=(EncodeImageHandler *) WriteTGAImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Truevision Targa image");
   entry->module=ConstantString("TGA");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/tiff.c b/coders/tiff.c
index 3ba790b52631955f1090b17f92e07c258919f7de..e548e9dcd13789f0d05fbaad963b0a33d0587712 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -2151,11 +2151,11 @@ ModuleExport size_t RegisterTIFFImage(void)
   entry->decoder=(DecodeImageHandler *) ReadGROUP4Image;
   entry->encoder=(EncodeImageHandler *) WriteGROUP4Image;
 #endif
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
-  entry->flags^=Adjoin;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
+  entry->flags^=CoderAdjoinFlag;
   entry->format_type=ImplicitFormatType;
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Raw CCITT Group4");
   entry->mime_type=ConstantString("image/tiff");
   entry->module=ConstantString("TIFF");
@@ -2165,8 +2165,8 @@ ModuleExport size_t RegisterTIFFImage(void)
   entry->decoder=(DecodeImageHandler *) ReadTIFFImage;
   entry->encoder=(EncodeImageHandler *) WritePTIFImage;
 #endif
-  entry->flags|=EndianSupport;
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderEndianSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Pyramid encoded TIFF");
   entry->mime_type=ConstantString("image/tiff");
   entry->module=ConstantString("TIFF");
@@ -2176,9 +2176,9 @@ ModuleExport size_t RegisterTIFFImage(void)
   entry->decoder=(DecodeImageHandler *) ReadTIFFImage;
   entry->encoder=(EncodeImageHandler *) WriteTIFFImage;
 #endif
-  entry->flags|=EndianSupport;
-  entry->flags|=SeekableStream;
-  entry->flags|=Stealth;
+  entry->flags|=CoderEndianSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
+  entry->flags|=CoderStealthFlag;
   entry->description=ConstantString(TIFFDescription);
   if (*version != '\0')
     entry->version=ConstantString(version);
@@ -2191,8 +2191,8 @@ ModuleExport size_t RegisterTIFFImage(void)
   entry->encoder=(EncodeImageHandler *) WriteTIFFImage;
 #endif
   entry->magick=(IsImageFormatHandler *) IsTIFF;
-  entry->flags|=EndianSupport;
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderEndianSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString(TIFFDescription);
   if (*version != '\0')
     entry->version=ConstantString(version);
@@ -2204,9 +2204,9 @@ ModuleExport size_t RegisterTIFFImage(void)
   entry->decoder=(DecodeImageHandler *) ReadTIFFImage;
   entry->encoder=(EncodeImageHandler *) WriteTIFFImage;
 #endif
-  entry->flags^=Adjoin;
-  entry->flags|=EndianSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderEndianSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Tagged Image File Format (64-bit)");
   if (*version != '\0')
     entry->version=ConstantString(version);

diff --git a/coders/tile.c b/coders/tile.c
index a274e6b233e96925976fdb85acccae0d9482e7be..ad0d65b05879aae6e3d907525515654187125b15 100644 (file)
--- a/coders/tile.c
+++ b/coders/tile.c
@@ -169,8 +169,8 @@ ModuleExport size_t RegisterTILEImage(void)
 
   entry=SetMagickInfo("TILE");
   entry->decoder=(DecodeImageHandler *) ReadTILEImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->format_type=ImplicitFormatType;
   entry->description=ConstantString("Tile image with a texture");
   entry->module=ConstantString("TILE");

diff --git a/coders/ttf.c b/coders/ttf.c
index 1b2bb8719428b5094acdc126eec005e65fd742af..4a1f6eae8a73ead83b0a92e86deb6bf10fd7960c 100644 (file)
--- a/coders/ttf.c
+++ b/coders/ttf.c
@@ -333,7 +333,7 @@ ModuleExport size_t RegisterTTFImage(void)
   entry->decoder=(DecodeImageHandler *) ReadTTFImage;
 #endif
   entry->magick=(IsImageFormatHandler *) IsTTF;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Multi-face font package");
   if (*version != '\0')
     entry->version=ConstantString(version);
@@ -344,7 +344,7 @@ ModuleExport size_t RegisterTTFImage(void)
   entry->decoder=(DecodeImageHandler *) ReadTTFImage;
 #endif
   entry->magick=(IsImageFormatHandler *) IsPFA;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Postscript Type 1 font (ASCII)");
   if (*version != '\0')
     entry->version=ConstantString(version);
@@ -355,7 +355,7 @@ ModuleExport size_t RegisterTTFImage(void)
   entry->decoder=(DecodeImageHandler *) ReadTTFImage;
 #endif
   entry->magick=(IsImageFormatHandler *) IsPFA;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Postscript Type 1 font (binary)");
   if (*version != '\0')
     entry->version=ConstantString(version);
@@ -366,7 +366,7 @@ ModuleExport size_t RegisterTTFImage(void)
   entry->decoder=(DecodeImageHandler *) ReadTTFImage;
 #endif
   entry->magick=(IsImageFormatHandler *) IsTTF;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Open Type font");
   if (*version != '\0')
     entry->version=ConstantString(version);
@@ -377,7 +377,7 @@ ModuleExport size_t RegisterTTFImage(void)
   entry->decoder=(DecodeImageHandler *) ReadTTFImage;
 #endif
   entry->magick=(IsImageFormatHandler *) IsTTF;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("TrueType font collection");
   if (*version != '\0')
     entry->version=ConstantString(version);
@@ -388,7 +388,7 @@ ModuleExport size_t RegisterTTFImage(void)
   entry->decoder=(DecodeImageHandler *) ReadTTFImage;
 #endif
   entry->magick=(IsImageFormatHandler *) IsTTF;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("TrueType font");
   if (*version != '\0')
     entry->version=ConstantString(version);

diff --git a/coders/txt.c b/coders/txt.c
index 2c8f1259b71e758c3bb44737f74391ec7c5e5605..6a6c6c8be00d8174659c9f403639458ae5e7ac7d 100644 (file)
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -598,16 +598,16 @@ ModuleExport size_t RegisterTXTImage(void)
 
   entry=SetMagickInfo("SPARSE-COLOR");
   entry->encoder=(EncodeImageHandler *) WriteTXTImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Sparse Color");
   entry->module=ConstantString("TXT");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("TEXT");
   entry->decoder=(DecodeImageHandler *) ReadTXTImage;
   entry->encoder=(EncodeImageHandler *) WriteTXTImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Text");
   entry->module=ConstantString("TXT");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/uil.c b/coders/uil.c
index 72af4ea481b6d16219a4feda215686f38ea32e4d..b0fd8601d767709a6d963e01b5c6cfd0652e77b2 100644 (file)
--- a/coders/uil.c
+++ b/coders/uil.c
@@ -98,7 +98,7 @@ ModuleExport size_t RegisterUILImage(void)
 
   entry=SetMagickInfo("UIL");
   entry->encoder=(EncodeImageHandler *) WriteUILImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("X-Motif UIL table");
   entry->module=ConstantString("UIL");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/url.c b/coders/url.c
index 40443c4c62ffa910c8138f9158d6bf9b14014346..10b554d0bc27f63d8d8e76779d7e2d665efa8213 100644 (file)
--- a/coders/url.c
+++ b/coders/url.c
@@ -301,7 +301,7 @@ ModuleExport size_t RegisterURLImage(void)
 #endif
   entry->description=ConstantString("Uniform Resource Locator (http://)");
   entry->module=ConstantString("URL");
-  entry->flags|=Stealth;
+  entry->flags|=CoderStealthFlag;
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("HTTPS");
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) && \
@@ -310,7 +310,7 @@ ModuleExport size_t RegisterURLImage(void)
 #endif
   entry->description=ConstantString("Uniform Resource Locator (https://)");
   entry->module=ConstantString("URL");
-  entry->flags|=Stealth;
+  entry->flags|=CoderStealthFlag;
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("FTP");
 #if (defined(MAGICKCORE_WINDOWS_SUPPORT) && \
@@ -320,13 +320,13 @@ ModuleExport size_t RegisterURLImage(void)
 #endif
   entry->description=ConstantString("Uniform Resource Locator (ftp://)");
   entry->module=ConstantString("URL");
-  entry->flags|=Stealth;
+  entry->flags|=CoderStealthFlag;
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("FILE");
   entry->decoder=(DecodeImageHandler *) ReadURLImage;
   entry->description=ConstantString("Uniform Resource Locator (file://)");
   entry->module=ConstantString("URL");
-  entry->flags|=Stealth;
+  entry->flags|=CoderStealthFlag;
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);
 }

diff --git a/coders/uyvy.c b/coders/uyvy.c
index 0afa4f18311eedec217098d26ecec3ffa59efbc0..08b36605664837cebc4125db04f3867cbc6ed282 100644 (file)
--- a/coders/uyvy.c
+++ b/coders/uyvy.c
@@ -217,18 +217,18 @@ ModuleExport size_t RegisterUYVYImage(void)
   entry=SetMagickInfo("PAL");
   entry->decoder=(DecodeImageHandler *) ReadUYVYImage;
   entry->encoder=(EncodeImageHandler *) WriteUYVYImage;
-  entry->flags^=Adjoin;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("16bit/pixel interleaved YUV");
   entry->module=ConstantString("UYVY");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("UYVY");
   entry->decoder=(DecodeImageHandler *) ReadUYVYImage;
   entry->encoder=(EncodeImageHandler *) WriteUYVYImage;
-  entry->flags^=Adjoin;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("16bit/pixel interleaved YUV");
   entry->module=ConstantString("UYVY");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/vicar.c b/coders/vicar.c
index 954185940a2fc3a901845b06d46a99197ad08d36..a70b0c6016c9aff8358a741b8db665333c4e647e 100644 (file)
--- a/coders/vicar.c
+++ b/coders/vicar.c
@@ -359,7 +359,7 @@ ModuleExport size_t RegisterVICARImage(void)
   entry->decoder=(DecodeImageHandler *) ReadVICARImage;
   entry->encoder=(EncodeImageHandler *) WriteVICARImage;
   entry->magick=(IsImageFormatHandler *) IsVICAR;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("VICAR rasterfile format");
   entry->module=ConstantString("VICAR");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/vips.c b/coders/vips.c
index fd462277da547ffc3ddab82c113d307883582e62..ab18bf5669ead4ed1597a8bdd4b64a99477fb48f 100644 (file)
--- a/coders/vips.c
+++ b/coders/vips.c
@@ -550,7 +550,7 @@ ModuleExport size_t RegisterVIPSImage(void)
   entry->encoder=(EncodeImageHandler *) WriteVIPSImage;
   entry->magick=(IsImageFormatHandler *) IsVIPS;
   entry->description=ConstantString("VIPS image");
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderEndianSupportFlag;
   entry->module=ConstantString("VIPS");
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);

diff --git a/coders/wbmp.c b/coders/wbmp.c
index caaf6c22b96818c2ad4aa7aecb81240f06264d3a..c9b7fc907c3ce568c40fe4c98989be8fa0e1b140 100644 (file)
--- a/coders/wbmp.c
+++ b/coders/wbmp.c
@@ -255,7 +255,7 @@ ModuleExport size_t RegisterWBMPImage(void)
   entry=SetMagickInfo("WBMP");
   entry->decoder=(DecodeImageHandler *) ReadWBMPImage;
   entry->encoder=(EncodeImageHandler *) WriteWBMPImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Wireless Bitmap (level 0) image");
   entry->module=ConstantString("WBMP");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/webp.c b/coders/webp.c
index a6dc6d8ba36841d07dc770de0c92acfdc85fe956..d9b65222139abadac6196dc43e9624fec4408969 100644 (file)
--- a/coders/webp.c
+++ b/coders/webp.c
@@ -412,7 +412,7 @@ ModuleExport size_t RegisterWEBPImage(void)
 #endif
   entry->description=ConstantString("WebP Image Format");
   entry->mime_type=ConstantString("image/x-webp");
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->module=ConstantString("WEBP");
   entry->magick=(IsImageFormatHandler *) IsWEBP;
   if (*version != '\0')

diff --git a/coders/wmf.c b/coders/wmf.c
index e02956f82009c6273ad2184e448114a374942992..9d5441ae222d9aa8aa6663d72c8fe6687d746ec9 100644 (file)
--- a/coders/wmf.c
+++ b/coders/wmf.c
@@ -2954,7 +2954,7 @@ ModuleExport size_t RegisterWMFImage(void)
 #endif
   entry->description=ConstantString("Compressed Windows Meta File");
   entry->module=ConstantString("WMZ");
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderSeekableStreamFlag;
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("WMF");
 #if defined(MAGICKCORE_WMF_DELEGATE) || defined(MAGICKCORE_WMFLITE_DELEGATE)

diff --git a/coders/wpg.c b/coders/wpg.c
index fbf088f61b092ef83772091215c5240cb26ae8e0..bad891ec8eb220912a6d03fd040127ddf8e90264 100644 (file)
--- a/coders/wpg.c
+++ b/coders/wpg.c
@@ -1483,7 +1483,7 @@ ModuleExport size_t RegisterWPGImage(void)
   entry->magick=(IsImageFormatHandler *) IsWPG;
   entry->description=AcquireString("Word Perfect Graphics");
   entry->module=ConstantString("WPG");
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderSeekableStreamFlag;
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);
 }

diff --git a/coders/xbm.c b/coders/xbm.c
index 239fba229470404a0c2475a4005f383df6dccb57..3b3b314ddb430a2a0eeec0f88227908fb2436d16 100644 (file)
--- a/coders/xbm.c
+++ b/coders/xbm.c
@@ -422,7 +422,7 @@ ModuleExport size_t RegisterXBMImage(void)
   entry->decoder=(DecodeImageHandler *) ReadXBMImage;
   entry->encoder=(EncodeImageHandler *) WriteXBMImage;
   entry->magick=(IsImageFormatHandler *) IsXBM;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString(
     "X Windows system bitmap (black and white)");
   entry->module=ConstantString("XBM");

diff --git a/coders/xc.c b/coders/xc.c
index 310da87fe62dd0eb8a16bf2f7f3acdc5f6a45643..f5d84d795f8834738cde2adf5a7dac7348796893 100644 (file)
--- a/coders/xc.c
+++ b/coders/xc.c
@@ -188,19 +188,19 @@ ModuleExport size_t RegisterXCImage(void)
 
   entry=SetMagickInfo("XC");
   entry->decoder=(DecodeImageHandler *) ReadXCImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->format_type=ImplicitFormatType;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Constant image uniform color");
   entry->module=ConstantString("XC");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("CANVAS");
   entry->decoder=(DecodeImageHandler *) ReadXCImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->format_type=ImplicitFormatType;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Constant image uniform color");
   entry->module=ConstantString("XC");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/xcf.c b/coders/xcf.c
index 763e13ca95fdb885ce19a724699ec0a02b6d33be..5ec3d721139e622969e08646332670b41d041fdb 100644 (file)
--- a/coders/xcf.c
+++ b/coders/xcf.c
@@ -1452,7 +1452,7 @@ ModuleExport size_t RegisterXCFImage(void)
   entry->magick=(IsImageFormatHandler *) IsXCF;
   entry->description=ConstantString("GIMP image");
   entry->module=ConstantString("XCF");
-  entry->flags|=SeekableStream;
+  entry->flags|=CoderSeekableStreamFlag;
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);
 }

diff --git a/coders/xpm.c b/coders/xpm.c
index f788b9c8c65bf13e418b3b59d9239962d8fdce5a..bc4caa9d15e13cbd6e2615d98cf605caec56e0a4 100644 (file)
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -488,15 +488,15 @@ ModuleExport size_t RegisterXPMImage(void)
   entry=SetMagickInfo("PICON");
   entry->decoder=(DecodeImageHandler *) ReadXPMImage;
   entry->encoder=(EncodeImageHandler *) WritePICONImage;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("Personal Icon");
   entry->module=ConstantString("XPM");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("PM");
   entry->decoder=(DecodeImageHandler *) ReadXPMImage;
   entry->encoder=(EncodeImageHandler *) WriteXPMImage;
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
   entry->description=ConstantString("X Windows system pixmap (color)");
   entry->module=ConstantString("XPM");
   (void) RegisterMagickInfo(entry);
@@ -504,7 +504,7 @@ ModuleExport size_t RegisterXPMImage(void)
   entry->decoder=(DecodeImageHandler *) ReadXPMImage;
   entry->encoder=(EncodeImageHandler *) WriteXPMImage;
   entry->magick=(IsImageFormatHandler *) IsXPM;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("X Windows system pixmap (color)");
   entry->module=ConstantString("XPM");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/xps.c b/coders/xps.c
index 029e06a0604fda5d82f752bceb9bf3cd43bede7e..9a9752b9d8647c6a8c04418dc7e6d6b2cce66193 100644 (file)
--- a/coders/xps.c
+++ b/coders/xps.c
@@ -376,10 +376,10 @@ ModuleExport size_t RegisterXPSImage(void)
 
   entry=SetMagickInfo("XPS");
   entry->decoder=(DecodeImageHandler *) ReadXPSImage;
-  entry->flags^=Adjoin;
-  entry->flags^=BlobSupport;
-  entry->flags^=DecoderThreadSupport;
-  entry->flags|=SeekableStream;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags^=CoderBlobSupportFlag;
+  entry->flags^=CoderDecoderThreadSupportFlag;
+  entry->flags|=CoderSeekableStreamFlag;
   entry->description=ConstantString("Microsoft XML Paper Specification");
   entry->module=ConstantString("XPS");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/xtrn.c b/coders/xtrn.c
index 0efaa7fdf91500c5841581cd618090587a668ade..cae16be56e5f06d79a21a719e66ee9f9f6c221bd 100644 (file)
--- a/coders/xtrn.c
+++ b/coders/xtrn.c
@@ -261,8 +261,8 @@ ModuleExport size_t RegisterXTRNImage(void)
   entry->decoder=ReadXTRNImage;
   entry->encoder=WriteXTRNImage;
 #endif
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
   entry->description=ConstantString("External transfer of a file");
   entry->module=ConstantString("XTRN");
   RegisterMagickInfo(entry);
@@ -271,8 +271,8 @@ ModuleExport size_t RegisterXTRNImage(void)
   entry->decoder=ReadXTRNImage;
   entry->encoder=WriteXTRNImage;
 #endif
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
   entry->description=ConstantString("External transfer of a image in memory");
   entry->module=ConstantString("XTRN");
   RegisterMagickInfo(entry);
@@ -281,8 +281,8 @@ ModuleExport size_t RegisterXTRNImage(void)
   entry->decoder=ReadXTRNImage;
   entry->encoder=WriteXTRNImage;
 #endif
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
   entry->description=ConstantString("IExternal transfer of a blob in memory");
   entry->module=ConstantString("XTRN");
   RegisterMagickInfo(entry);
@@ -291,8 +291,8 @@ ModuleExport size_t RegisterXTRNImage(void)
   entry->decoder=ReadXTRNImage;
   entry->encoder=WriteXTRNImage;
 #endif
-  entry->flags^=Adjoin;
-  entry->flags|=Stealth;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderStealthFlag;
   entry->description=ConstantString(
     "External transfer via a smart array interface");
   entry->module=ConstantString("XTRN");

diff --git a/coders/xwd.c b/coders/xwd.c
index 201d7bdfc5a81e0c9743a4bc39786ffef40f298a..dba43a1dd721a85d13cbc24c49edec37e9bf53f8 100644 (file)
--- a/coders/xwd.c
+++ b/coders/xwd.c
@@ -604,7 +604,7 @@ ModuleExport size_t RegisterXWDImage(void)
   entry->encoder=(EncodeImageHandler *) WriteXWDImage;
 #endif
   entry->magick=(IsImageFormatHandler *) IsXWD;
-  entry->flags^=Adjoin;
+  entry->flags^=CoderAdjoinFlag;
   entry->description=ConstantString("X Windows system window dump (color)");
   entry->module=ConstantString("XWD");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/ycbcr.c b/coders/ycbcr.c
index f0f7140c0a99250ff70c22b41cdbef1a11b7fa50..152f21ffcf405f308f6946bca719131f7cae0751 100644 (file)
--- a/coders/ycbcr.c
+++ b/coders/ycbcr.c
@@ -926,16 +926,16 @@ ModuleExport size_t RegisterYCBCRImage(void)
   entry=SetMagickInfo("YCbCr");
   entry->decoder=(DecodeImageHandler *) ReadYCBCRImage;
   entry->encoder=(EncodeImageHandler *) WriteYCBCRImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Raw Y, Cb, and Cr samples");
   entry->module=ConstantString("YCbCr");
   (void) RegisterMagickInfo(entry);
   entry=SetMagickInfo("YCbCrA");
   entry->decoder=(DecodeImageHandler *) ReadYCBCRImage;
   entry->encoder=(EncodeImageHandler *) WriteYCBCRImage;
-  entry->flags|=RawSupport;
-  entry->flags|=EndianSupport;
+  entry->flags|=CoderRawSupportFlag;
+  entry->flags|=CoderEndianSupportFlag;
   entry->description=ConstantString("Raw Y, Cb, Cr, and alpha samples");
   entry->module=ConstantString("YCbCr");
   (void) RegisterMagickInfo(entry);

diff --git a/coders/yuv.c b/coders/yuv.c
index c21be17bdfd934f6c9a1dc06a1b1d97899e084cd..317e5a75bc069c54f475cf4ca4ecc23d9ce85964 100644 (file)
--- a/coders/yuv.c
+++ b/coders/yuv.c
@@ -495,8 +495,8 @@ ModuleExport size_t RegisterYUVImage(void)
   entry=SetMagickInfo("YUV");
   entry->decoder=(DecodeImageHandler *) ReadYUVImage;
   entry->encoder=(EncodeImageHandler *) WriteYUVImage;
-  entry->flags^=Adjoin;
-  entry->flags|=RawSupport;
+  entry->flags^=CoderAdjoinFlag;
+  entry->flags|=CoderRawSupportFlag;
   entry->description=ConstantString("CCIR 601 4:1:1 or 4:2:2");
   entry->module=ConstantString("YUV");
   (void) RegisterMagickInfo(entry);