Moved coder headers to the header files.

diff --git a/MagickCore/magic.c b/MagickCore/magic.c
index 8b65d5efa68cd731e62783be53a7484af7d92e80..a9ac8db3f06c5ffe2f759b204a9d2b0eeb2575b1 100644 (file)
--- a/MagickCore/magic.c
+++ b/MagickCore/magic.c
@@ -59,11 +59,13 @@
 #include "MagickCore/utility-private.h"
 #include "MagickCore/xml-tree.h"
 #include "MagickCore/xml-tree-private.h"
+#include "coders/coders.h"
 \f
 /*
   Define declarations.
 */
 #define MagicPattern(magic)  (const unsigned char *) (magic), sizeof(magic)-1
+#define AddMagickCoder(coder) Magick ## coder ## Headers
 \f
 /*
   Typedef declarations.
@@ -113,122 +115,12 @@ struct _MagicInfo
 static const MagicMapInfo
   MagicMap[] =
   {
-    { "8BIMWTEXT", 0, MagicPattern("8\000B\000I\000M\000#") },
-    { "8BIMTEXT", 0, MagicPattern("8BIM#") },
-    { "8BIM", 0, MagicPattern("8BIM") },
-    { "BMP", 0, MagicPattern("BA") },
-    { "BMP", 0, MagicPattern("BM") },
-    { "BMP", 0, MagicPattern("CI") },
-    { "BMP", 0, MagicPattern("CP") },
-    { "BMP", 0, MagicPattern("IC") },
-    { "PICT", 0, MagicPattern("PICT") },
-    { "BMP", 0, MagicPattern("PI") },
-    { "CALS", 21, MagicPattern("version: MIL-STD-1840") },
-    { "CALS", 0, MagicPattern("srcdocid:") },
-    { "CALS", 9, MagicPattern("srcdocid:") },
-    { "CALS", 8, MagicPattern("rorient:") },
+    #include "coders/coders-list.h"
     { "CGM", 0, MagicPattern("BEGMF") },
-    { "CIN", 0, MagicPattern("\200\052\137\327") },
-    { "CRW", 0, MagicPattern("II\x1a\x00\x00\x00HEAPCCDR") },
-    { "DCM", 128, MagicPattern("DICM") },
-    { "DCX", 0, MagicPattern("\261\150\336\72") },
-    { "DIB", 0, MagicPattern("\050\000") },
-    { "DDS", 0, MagicPattern("DDS ") },
-    { "DJVU", 0, MagicPattern("AT&TFORM") },
-    { "DOT", 0, MagicPattern("digraph") },
-    { "DPX", 0, MagicPattern("SDPX") },
-    { "DPX", 0, MagicPattern("XPDS") },
-    { "EMF", 40, MagicPattern("\040\105\115\106\000\000\001\000") },
-    { "EPT", 0, MagicPattern("\305\320\323\306") },
-    { "EXR", 0, MagicPattern("\166\057\061\001") },
-    { "FAX", 0, MagicPattern("DFAX") },
     { "FIG", 0, MagicPattern("#FIG") },
-    { "FITS", 0, MagicPattern("IT0") },
-    { "FITS", 0, MagicPattern("SIMPLE") },
-    { "FLIF", 0, MagicPattern("FLIF") },
-    { "GIF", 0, MagicPattern("GIF8") },
-    { "GPLT", 0, MagicPattern("#!/usr/local/bin/gnuplot") },
-    { "HDF", 1, MagicPattern("HDF") },
-    { "HDR", 0, MagicPattern("#?RADIANCE") },
-    { "HDR", 0, MagicPattern("#?RGBE") },
-    { "HEIC", 8, MagicPattern("heic") },
     { "HPGL", 0, MagicPattern("IN;") },
-    { "HTML", 1, MagicPattern("HTML") },
-    { "HTML", 1, MagicPattern("html") },
-    { "ILBM", 8, MagicPattern("ILBM") },
-    { "IPTCWTEXT", 0, MagicPattern("\062\000#\000\060\000=\000\042\000&\000#\000\060\000;\000&\000#\000\062\000;\000\042\000") },
-    { "IPTCTEXT", 0, MagicPattern("2#0=\042�\042") },
-    { "IPTC", 0, MagicPattern("\034\002") },
-    { "JNG", 0, MagicPattern("\213JNG\r\n\032\n") },
-    { "JPEG", 0, MagicPattern("\377\330\377") },
-    { "J2K", 0, MagicPattern("\xff\x4f\xff\x51") },
-    { "JPC", 0, MagicPattern("\x0d\x0a\x87\x0a") },
-    { "JP2", 0, MagicPattern("\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a") },
-    { "MAT", 0, MagicPattern("MATLAB 5.0 MAT-file,") },
-    { "MIFF", 0, MagicPattern("Id=ImageMagick") },
-    { "MIFF", 0, MagicPattern("id=ImageMagick") },
-    { "MNG", 0, MagicPattern("\212MNG\r\n\032\n") },
-    { "MPC", 0, MagicPattern("id=MagickCache") },
-    { "MPEG", 0, MagicPattern("\000\000\001\263") },
-    { "MRW", 0, MagicPattern("\x00MRM") },
-    { "ORF", 0, MagicPattern("IIRO\x08\x00\x00\x00") },
-    { "PCD", 2048, MagicPattern("PCD_") },
-    { "PCL", 0, MagicPattern("\033E\033") },
-    { "PCX", 0, MagicPattern("\012\002") },
-    { "PCX", 0, MagicPattern("\012\005") },
-    { "PDB", 60, MagicPattern("vIMGView") },
-    { "PDF", 0, MagicPattern("%PDF-") },
-    { "PES", 0, MagicPattern("#PES") },
-    { "PFA", 0, MagicPattern("%!PS-AdobeFont-1.0") },
-    { "PFB", 6, MagicPattern("%!PS-AdobeFont-1.0") },
-    { "PGX", 0, MagicPattern("\050\107\020\115\046") },
-    { "PICT", 522, MagicPattern("\000\021\002\377\014\000") },
-    { "PNG", 0, MagicPattern("\211PNG\r\n\032\n") },
-    { "PBM", 0, MagicPattern("P1") },
-    { "PGM", 0, MagicPattern("P2") },
-    { "PPM", 0, MagicPattern("P3") },
-    { "PBM", 0, MagicPattern("P4") },
-    { "PGM", 0, MagicPattern("P5") },
-    { "PPM", 0, MagicPattern("P6") },
-    { "PAM", 0, MagicPattern("P7") },
-    { "PFM", 0, MagicPattern("PF") },
-    { "PFM", 0, MagicPattern("Pf") },
-    { "PGX", 0, MagicPattern("PG ML") },
-    { "PGX", 0, MagicPattern("PG LM") },
-    { "PS", 0, MagicPattern("%!") },
-    { "PS", 0, MagicPattern("\004%!") },
-    { "PS", 0, MagicPattern("\305\320\323\306") },
-    { "PSB", 0, MagicPattern("8BPB") },
-    { "PSD", 0, MagicPattern("8BPS") },
-    { "PWP", 0, MagicPattern("SFW95") },
-    { "RAF", 0, MagicPattern("FUJIFILMCCD-RAW ") },
-    { "RLE", 0, MagicPattern("\122\314") },
-    { "SCT", 0, MagicPattern("CT") },
-    { "SFW", 0, MagicPattern("SFW94") },
-    { "SGI", 0, MagicPattern("\001\332") },
-    { "SUN", 0, MagicPattern("\131\246\152\225") },
-    { "SVG", 1, MagicPattern("?XML") },
-    { "SVG", 1, MagicPattern("?xml") },
-    { "SVG", 1, MagicPattern("SVG") },
-    { "SVG", 1, MagicPattern("svg") },
-    { "TIFF", 0, MagicPattern("\115\115\000\052") },
-    { "TIFF", 0, MagicPattern("\111\111\052\000") },
-    { "TIFF64", 0, MagicPattern("\115\115\000\053\000\010\000\000") },
-    { "TIFF64", 0, MagicPattern("\111\111\053\000\010\000\000\000") },
-    { "TTF", 0, MagicPattern("\000\001\000\000\000") },
-    { "TXT", 0, MagicPattern("# ImageMagick pixel enumeration:") },
-    { "VICAR", 0, MagicPattern("LBLSIZE") },
-    { "VICAR", 0, MagicPattern("NJPL1I") },
-    { "VIFF", 0, MagicPattern("\253\001") },
-    { "WEBP", 8, MagicPattern("WEBP") },
-    { "WMF", 0, MagicPattern("\327\315\306\232") },
-    { "WMF", 0, MagicPattern("\001\000\011\000") },
-    { "WPG", 0, MagicPattern("\377WPC") },
-    { "XBM", 0, MagicPattern("#define") },
-    { "XCF", 0, MagicPattern("gimp xcf") },
-    { "XEF", 0, MagicPattern("FOVb") },
-    { "XPM", 1, MagicPattern("* XPM *") }
- };
+    { "ILBM", 8, MagicPattern("ILBM") }, 
+  };
 
 static LinkedListInfo
   *magic_cache = (LinkedListInfo *) NULL,

diff --git a/coders/aai.h b/coders/aai.h
index adb26a0becd0ee10e3a7003d3e4452048d71f50e..3df7122aa8f7698debeec208f0314f156ee2edc3 100644 (file)
--- a/coders/aai.h
+++ b/coders/aai.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickAAIHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/art.h b/coders/art.h
index 86a513214be4d8d89220ecb99c61dd913072a8c3..64a01d44a3120fdf914907669a2956f5f0c150bd 100644 (file)
--- a/coders/art.h
+++ b/coders/art.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickARTHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/avs.h b/coders/avs.h
index 5f41849171d93f977d3438e7a0d0361b9d44da52..6ba6ccacd29db16e4e2135e757f67524b845bcbe 100644 (file)
--- a/coders/avs.h
+++ b/coders/avs.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickAVSHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/bgr.h b/coders/bgr.h
index e8c3d0e517c6fdd9ca9c42c987a8ad8d4786f079..744eedfee999e546c0ef9b201ef132f897d216a7 100644 (file)
--- a/coders/bgr.h
+++ b/coders/bgr.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickBGRHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/bmp.h b/coders/bmp.h
index fffbd9b6dd5428d65006c87a8ab24fa2444b8ffb..f6e8f1533b14d38189a76bebd927051fc76a02e8 100644 (file)
--- a/coders/bmp.h
+++ b/coders/bmp.h
@@ -16,6 +16,14 @@
 
 #include "coders/coders-private.h"
 
+#define MagickBMPHeaders \
+  MagickCoderHeader("BMP", 0, "BA") \
+  MagickCoderHeader("BMP", 0, "BM") \
+  MagickCoderHeader("BMP", 0, "CI") \
+  MagickCoderHeader("BMP", 0, "CP") \
+  MagickCoderHeader("BMP", 0, "IC") \
+  MagickCoderHeader("BMP", 0, "IP")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/braille.h b/coders/braille.h
index 325393580eb5f5951f2867bd7a14818a5028a9f9..456b8420fd899c121b6c5b39bbdd66b8c9767499 100644 (file)
--- a/coders/braille.h
+++ b/coders/braille.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickBRAILLEHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/cals.h b/coders/cals.h
index cee1c9a86a898b930108de11e4a7b6009d8ee740..8d12b3ab79c7647d80594a06b6e17d3a4eba33f7 100644 (file)
--- a/coders/cals.h
+++ b/coders/cals.h
@@ -16,6 +16,12 @@
 
 #include "coders/coders-private.h"
 
+#define MagickCALSHeaders \
+  MagickCoderHeader("CALS", 0, "srcdocid:") \
+  MagickCoderHeader("CALS", 8, "rorient:") \
+  MagickCoderHeader("CALS", 9, "rorient:") \
+  MagickCoderHeader("CALS", 21, "version: MIL-STD-1840")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/caption.h b/coders/caption.h
index cfdc60a50412cc63dadace8f29018c4b0e369630..bcbcb5298d1ad59789d26ecd6c2797af2a4cecc3 100644 (file)
--- a/coders/caption.h
+++ b/coders/caption.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickCAPTIONHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/cin.h b/coders/cin.h
index cbc7046b4e7f7334ca048a6feffee4bd919e8860..c972de8cb0871ffe23a4014d3be40c2f870f5d9f 100644 (file)
--- a/coders/cin.h
+++ b/coders/cin.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickCINHeaders \
+  MagickCoderHeader("CIN", 0, "\200\052\137\327")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/cip.h b/coders/cip.h
index 3c7bceec2699a0285784cd46eae5697359d6f401..dfc8737b1b63d1f2be7e43a0c2117c87ea32e9d5 100644 (file)
--- a/coders/cip.h
+++ b/coders/cip.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickCIPHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/clip.h b/coders/clip.h
index 7305f9a4e11d895e33b54ebb1817dddf5e193648..5536ccacb8014e93d9c7784457c44ea5a34de87a 100644 (file)
--- a/coders/clip.h
+++ b/coders/clip.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickCLIPHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/clipboard.h b/coders/clipboard.h
index 38f05990e53eea5c0af1e8e25618770a870b90b7..bff211dcab7b84cd8a815dd7b4e034f981803b39 100644 (file)
--- a/coders/clipboard.h
+++ b/coders/clipboard.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickCLIPBOARDHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/cmyk.h b/coders/cmyk.h
index 281bca57423ac6c1c4cba465158c537337c5f3a2..3558adee803d814451159795e1e7a9f678ff3a02 100644 (file)
--- a/coders/cmyk.h
+++ b/coders/cmyk.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickCMYKHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/coders-private.h b/coders/coders-private.h
index d71a2eda8003c71d657f550cf3748dad5bab35e0..e13c2cd54bef2147d7cc03d41dfefce42aba3340 100644 (file)
--- a/coders/coders-private.h
+++ b/coders/coders-private.h
@@ -16,6 +16,9 @@
 #ifndef MAGICK_CODERS_PRIVATE_H
 #define MAGICK_CODERS_PRIVATE_H
 
+#define MagickCoderHeader(coder,offset,magic)  { coder, offset, \
+  (const unsigned char *) (magic), sizeof(magic)-1 },
+
 #define MagickCoderExports(coder) \
 extern ModuleExport size_t \
   Register ## coder ## Image(void); \

diff --git a/coders/cut.h b/coders/cut.h
index 23abb5e22800416292214e11024062d76dd75529..28504da3447688ba1010289de9f5ddafce5dcb8d 100644 (file)
--- a/coders/cut.h
+++ b/coders/cut.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickCUTHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/dcm.h b/coders/dcm.h
index b80902f8c384cbb90359839b21f6b00171d9a40b..037b6d50c184a79865f52280219ca993f5618867 100644 (file)
--- a/coders/dcm.h
+++ b/coders/dcm.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickDCMHeaders \
+  MagickCoderHeader("DCM", 128, "DICM")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/dds.h b/coders/dds.h
index db54aa3a7d0501af75b0e4c7ef9ebbd3ddc30054..add2f47b02217a0df245652fc3213d07f58be34a 100644 (file)
--- a/coders/dds.h
+++ b/coders/dds.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickDDSHeaders \
+  MagickCoderHeader("DDS", 0, "DDS ")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/debug.h b/coders/debug.h
index 4cce0c1f65a6a9062663efc64786c14fc767e8a1..73d7953651a388f8feb4275cdb5665b138eb9d68 100644 (file)
--- a/coders/debug.h
+++ b/coders/debug.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickDEBUGHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/dib.h b/coders/dib.h
index 0e47eb8eb04af0147a552b06e5f2bcd21a497917..3f132c1adfa17868fa659e5b559d421d3e9a202e 100644 (file)
--- a/coders/dib.h
+++ b/coders/dib.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickDIBHeaders \
+  MagickCoderHeader("DIB", 0, "\050\000")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/djvu.h b/coders/djvu.h
index a602e7f8856f4159e46b486cbf5347e52896e5fa..02620c5c7771f855142077736c135ee2c8eb9c6d 100644 (file)
--- a/coders/djvu.h
+++ b/coders/djvu.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickDJVUHeaders \
+  MagickCoderHeader("DJVU", 0, "AT&TFORM")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/dng.h b/coders/dng.h
index b0bf3cedda1eb0fc15724b7fd47f64eee14e53a7..e42dc68debd6201971b4fc8215a3fc07c9a1dac9 100644 (file)
--- a/coders/dng.h
+++ b/coders/dng.h
@@ -16,6 +16,12 @@
 
 #include "coders/coders-private.h"
 
+#define MagickDNGHeaders \
+  MagickCoderHeader("CRW", 0, "II\x1a\x00\x00\x00HEAPCCDR") \
+  MagickCoderHeader("ORF", 0, "IIRO\x08\x00\x00\x00") \
+  MagickCoderHeader("MRW", 0, "\x00MRM") \
+  MagickCoderHeader("RAF", 0, "FUJIFILMCCD-RAW ")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/dot.h b/coders/dot.h
index fbce80e7cda5912de2fd81b2c359bb5c8d1abbd9..8ffdf7a62814ef783a62fcfccd0bae114d198ba6 100644 (file)
--- a/coders/dot.h
+++ b/coders/dot.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickDOTHeaders \
+  MagickCoderHeader("DOT", 0, "digraph")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/dps.h b/coders/dps.h
index bce65aecb1e68a418ac2fc5a5e5cbfdeaefc51b0..2b5f5f7cf2a90bbe77a21199cb9a85d6458f640a 100644 (file)
--- a/coders/dps.h
+++ b/coders/dps.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickDPSHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/dpx.h b/coders/dpx.h
index 43f31bbfe4302daf42a3b3cd4368a91987b248ac..4eac24aa6217715467f59197509ae83ddfe920a9 100644 (file)
--- a/coders/dpx.h
+++ b/coders/dpx.h
@@ -16,6 +16,10 @@
 
 #include "coders/coders-private.h"
 
+#define MagickDPXHeaders \
+  MagickCoderHeader("DPX", 0, "SDPX") \
+  MagickCoderHeader("DPX", 0, "XPDS")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/emf.h b/coders/emf.h
index f5d8243d94b2622fd603130b683cf8edf83b1333..643b7cdb1f86ae963dd9bcbb9e45d357acb15f4c 100644 (file)
--- a/coders/emf.h
+++ b/coders/emf.h
@@ -16,6 +16,11 @@
 
 #include "coders/coders-private.h"
 
+#define MagickEMFHeaders \
+  MagickCoderHeader("EMF", 40, "\040\105\115\106\000\000\001\000") \
+  MagickCoderHeader("WMF", 0, "\327\315\306\232") \
+  MagickCoderHeader("WMF", 0, "\001\000\011\000")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/ept.h b/coders/ept.h
index b19449cdd40cb15c269a4997259eafca8cd77c42..d32390ae680f0bb26dcc5416745dcf3b28122d0d 100644 (file)
--- a/coders/ept.h
+++ b/coders/ept.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickEPTHeaders \
+  MagickCoderHeader("EPT", 0, "\305\320\323\306")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/exr.h b/coders/exr.h
index 7762166e2640b823b8b47215986713a0d6944962..f083ce93842afd208d1ae885b9a7698d12a89d09 100644 (file)
--- a/coders/exr.h
+++ b/coders/exr.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickEXRHeaders \
+  MagickCoderHeader("EXR", 0, "\166\057\061\001")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/fax.h b/coders/fax.h
index 0a87e1ecc7a36693ea30e82c7adccce373665412..de7e27142696b6e464869f3dee3ba713fd00cb6c 100644 (file)
--- a/coders/fax.h
+++ b/coders/fax.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickFAXHeaders \
+  MagickCoderHeader("FAX", 0, "DFAX")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/fits.h b/coders/fits.h
index 6775af2227b59ca2f71112bf572627f868005a58..d8c9027f49086838d2316bb0d9e5c8cb24ffbb3b 100644 (file)
--- a/coders/fits.h
+++ b/coders/fits.h
@@ -16,6 +16,10 @@
 
 #include "coders/coders-private.h"
 
+#define MagickFITSHeaders \
+  MagickCoderHeader("FITS", 0, "IT0") \
+  MagickCoderHeader("FITS", 0, "SIMPLE")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/flif.h b/coders/flif.h
index eba7dfa65d184fb5612a98d23ceddb58347758d2..d5d09128da860a485d9056bff0ff2ae831c4ffb8 100644 (file)
--- a/coders/flif.h
+++ b/coders/flif.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickFLIFHeaders \
+  MagickCoderHeader("FLIF", 0, "FLIF")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/fpx.h b/coders/fpx.h
index 7a81a71d40ca1464bea9eb14a74d4bde510db277..0b3623e47a0e45f450520b39d19ef74d81b79e95 100644 (file)
--- a/coders/fpx.h
+++ b/coders/fpx.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickFPXHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/gif.h b/coders/gif.h
index bcd1d2a30356b5151f6b34769eab37613d0882f0..733d3fbd2a90f8b384780df2fea24a0aff35f3df 100644 (file)
--- a/coders/gif.h
+++ b/coders/gif.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickGIFHeaders \
+  MagickCoderHeader("GIF", 0, "GIF8")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/gradient.h b/coders/gradient.h
index a551afaddfa645366ab1f9276adff28f09285272..14673f2a2c3bf29770e2d5bbafa93aec0bdb08e9 100644 (file)
--- a/coders/gradient.h
+++ b/coders/gradient.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickGRADIENTHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/gray.h b/coders/gray.h
index 51455a8142d57f8f5a79d5be426ef03a397b55a7..c94b7fc28cacf11717850d71710e3a58db6c6240 100644 (file)
--- a/coders/gray.h
+++ b/coders/gray.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickGRAYHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/hald.h b/coders/hald.h
index ac48166f486ff79f7d664c0b03e9c6a8a7fe177d..2bd5228c6c7a17d868da839104bb34e992c197ba 100644 (file)
--- a/coders/hald.h
+++ b/coders/hald.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickHALDHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/hdr.h b/coders/hdr.h
index 285cea2da21193da10614f117396c89e8ba8499c..a72059dbd76882380fab339cc844f42e90173d24 100644 (file)
--- a/coders/hdr.h
+++ b/coders/hdr.h
@@ -16,6 +16,10 @@
 
 #include "coders/coders-private.h"
 
+#define MagickHDRHeaders \
+  MagickCoderHeader("HDR", 0, "#?RADIANCE") \
+  MagickCoderHeader("HDR", 0, "#?RGBE")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/heic.h b/coders/heic.h
index e89f40f9cd5f4c74b2a831db3c01c133e907e1f1..bd6869e2f9c643ab9966a8711f5d2ff9d9f52546 100644 (file)
--- a/coders/heic.h
+++ b/coders/heic.h
@@ -16,6 +16,11 @@
 
 #include "coders/coders-private.h"
 
+#define MagickHEICHeaders \
+  MagickCoderHeader("HEIC", 4, "ftypheic") \
+  MagickCoderHeader("HEIC", 4, "ftypheix") \
+  MagickCoderHeader("HEIC", 4, "ftypmif1")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/histogram.h b/coders/histogram.h
index 4342aa313f0621ba864f4dce0467b21bcf20ce5c..ac29c2700b44767b9283467d66620d47ba9b005f 100644 (file)
--- a/coders/histogram.h
+++ b/coders/histogram.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickHISTOGRAMHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/hrz.h b/coders/hrz.h
index 2de1053ee0ce4ca7d8e662c41314bd5d486383dd..44e6dc21c49ba4a13c5661ebec40ad9cbef275ac 100644 (file)
--- a/coders/hrz.h
+++ b/coders/hrz.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickHRZHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/html.h b/coders/html.h
index 77c885f26bc83e117061a5963f7bf5e73f49678a..753576cbda9d3611adbcb22ec1f0a8a9dd1e0d5d 100644 (file)
--- a/coders/html.h
+++ b/coders/html.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickHTMLHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/icon.h b/coders/icon.h
index 7429820d8a0e4c61996f4183f6ba8d7ed8f0a70d..96f48c6859eae0f9c1b70c80dd1d82c3e1b712af 100644 (file)
--- a/coders/icon.h
+++ b/coders/icon.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickICONHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/info.h b/coders/info.h
index 615c2eba988ff1655b69171c360e9590c3a99e85..cc8f362a1bb5d4b9dae7cb458a903e73ab977547 100644 (file)
--- a/coders/info.h
+++ b/coders/info.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickINFOHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/inline.h b/coders/inline.h
index 86148fbd4c02147dd1e0ac1303a4883c9892fa61..45c5efa83a65b6d357cdb0a3ae68b916f916c202 100644 (file)
--- a/coders/inline.h
+++ b/coders/inline.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickINLINEHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/ipl.h b/coders/ipl.h
index c63595da4f52a2b679024b025cedbf1690236f12..57c3821dff442f12a138ef0c528155fcd05f7cd4 100644 (file)
--- a/coders/ipl.h
+++ b/coders/ipl.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickIPLHeaders \
+  MagickCoderHeader("IPL", 0, "data")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/jbig.h b/coders/jbig.h
index b682f7c5c52b6dbd95a48f0bd9ecf64eeac715f6..b82dcb2cd29a991f56b83ec76d9eb007908e8830 100644 (file)
--- a/coders/jbig.h
+++ b/coders/jbig.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickJBIGHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/jnx.h b/coders/jnx.h
index d55b3504872fae029da413bf4e93def8c3d734d9..eabf12b9620ff8f0b395dd18ee1deadf58dd5735 100644 (file)
--- a/coders/jnx.h
+++ b/coders/jnx.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickJNXHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/jp2.h b/coders/jp2.h
index 3371ff8c952acc7f45fe00ac5b6af6e363316b13..fa15b2cab44880d91a08b3e5761260c3eb0f5e7e 100644 (file)
--- a/coders/jp2.h
+++ b/coders/jp2.h
@@ -16,6 +16,11 @@
 
 #include "coders/coders-private.h"
 
+#define MagickJP2Headers \
+  MagickCoderHeader("JP2", 0, "\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a") \
+  MagickCoderHeader("JPC", 0, "\x0d\x0a\x87\x0a") \
+  MagickCoderHeader("J2K", 0, "\xff\x4f\xff\x51")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/jpeg.h b/coders/jpeg.h
index 277aae2945aa434765ae3f4ca136c237fe31a885..ac1f2ab0017fcde06d5dcdc97fe9acc6a1b257df 100644 (file)
--- a/coders/jpeg.h
+++ b/coders/jpeg.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickJPEGHeaders \
+  MagickCoderHeader("JPEG", 0, "\377\330\377")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/json.h b/coders/json.h
index 5ad55ec0e143a7fadc3fa20b63a835a96fc8ed8f..dbd7c0f4fc953fe9b214980454403642e6de1845 100644 (file)
--- a/coders/json.h
+++ b/coders/json.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickJSONHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/label.h b/coders/label.h
index a46ce8a053e56c93c19913581cc886cbb1892d6b..85d36b2e00818ae2488f274f15e705b02f71b7cf 100644 (file)
--- a/coders/label.h
+++ b/coders/label.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickLABELHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/mac.h b/coders/mac.h
index 032074387f777bf685adfda3b1f4e0aa1347cf29..21a783756af6a34fa7f122e3f4769ae5e2b30be0 100644 (file)
--- a/coders/mac.h
+++ b/coders/mac.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickMACHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/magick.h b/coders/magick.h
index ecd405a8b1eb9d4ebcdea79366701ce13d298d61..871443d6b0042c0157a733185aa4cb5aa794ac84 100644 (file)
--- a/coders/magick.h
+++ b/coders/magick.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickMAGICKHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/map.h b/coders/map.h
index c2b17bae1795fd44f58df283542759d23311b928..2cae3f673d5305ff3e19f9afd7ff9353553d8496 100644 (file)
--- a/coders/map.h
+++ b/coders/map.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickMAPHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/mask.h b/coders/mask.h
index 39ed719d54091106d5b5a462756be153dcf050ed..eb246a4c526affeed26319b3834f0b764453fa24 100644 (file)
--- a/coders/mask.h
+++ b/coders/mask.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickMASKHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/mat.h b/coders/mat.h
index 8a0dcdecd5dbb174a17ddf1738859612faffb799..64297f152e3f18c427ce32a548db8f20222ac334 100644 (file)
--- a/coders/mat.h
+++ b/coders/mat.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickMATHeaders \
+  MagickCoderHeader("MAT", 0, "MATLAB 5.0 MAT-file,")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/matte.h b/coders/matte.h
index 3a3e451df7b4b486e6e1d9086719d056ab766475..e7685b415302e0239db684e398c134500c0cee03 100644 (file)
--- a/coders/matte.h
+++ b/coders/matte.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickMATTEHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/meta.h b/coders/meta.h
index 3f8882fb8a707d71fe09b84a194efc7744f2bfc4..3ebc538e5439d89b666bd817f5d80b2a2357ef5a 100644 (file)
--- a/coders/meta.h
+++ b/coders/meta.h
@@ -16,6 +16,14 @@
 
 #include "coders/coders-private.h"
 
+#define MagickMETAHeaders \
+  MagickCoderHeader("8BIMWTEXT", 0, "8\000B\000I\000M\000#") \
+  MagickCoderHeader("8BIMTEXT", 0, "8BIM#") \
+  MagickCoderHeader("8BIM", 0, "8BIM") \
+  MagickCoderHeader("IPTCWTEXT", 0, "\062\000#\000\060\000=\000\042\000&\000#\000\060\000;\000&\000#\000\062\000;\000\042\000") \
+  MagickCoderHeader("IPTCTEXT", 0, "2#0=\042�\042") \
+  MagickCoderHeader("IPTC", 0, "\034\002")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/miff.h b/coders/miff.h
index c3708d2bbfddfe2ac73bd374fa139e80ec2ca023..0bb37159beb2fff29a9683943a1480717658cbaf 100644 (file)
--- a/coders/miff.h
+++ b/coders/miff.h
@@ -16,6 +16,10 @@
 
 #include "coders/coders-private.h"
 
+#define MagickMIFFHeaders \
+  MagickCoderHeader("MIFF", 0, "Id=ImageMagick") \
+  MagickCoderHeader("MIFF", 0, "id=ImageMagick")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/mono.h b/coders/mono.h
index 62c043fed650ca4d670e4bdbba5d5bc24d261d45..e5d5a7aa915589a3b02c8f8027f220620e31d45e 100644 (file)
--- a/coders/mono.h
+++ b/coders/mono.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickMONOHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/mpc.h b/coders/mpc.h
index 54f0a4b1e1f2d01570c4120907e5f4a1ecb335c7..29bb2a8dc4208d05de2dc32f662194b867c06b24 100644 (file)
--- a/coders/mpc.h
+++ b/coders/mpc.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickMPCHeaders \
+  MagickCoderHeader("MPC", 0, "id=MagickCache")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/mpeg.h b/coders/mpeg.h
index 2d3e832ac64e6334491ca4846a7570a170ccad85..9f676c12f3906f04a7b7f8dbb57d3efb48869e86 100644 (file)
--- a/coders/mpeg.h
+++ b/coders/mpeg.h
@@ -16,6 +16,10 @@
 
 #include "coders/coders-private.h"
 
+#define MagickMPEGHeaders \
+  MagickCoderHeader("MPEG", 0, "\000\000\001\263") \
+  MagickCoderHeader("MPEG", 0, "RIFF")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/mpr.h b/coders/mpr.h
index a346f0c9b19120250fe5d27da23354fe56bcd57c..ed10ecc592e43358eb3f9253a15a045d39764b9c 100644 (file)
--- a/coders/mpr.h
+++ b/coders/mpr.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickMPRHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/msl.h b/coders/msl.h
index 61db79854576222319729610294226d4ad960524..82a8e8a3157733b277b77a227c858d665edcda4d 100644 (file)
--- a/coders/msl.h
+++ b/coders/msl.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickMSLHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/mtv.h b/coders/mtv.h
index 03b0e632e537a0694e78d5d71c1f48f4e3dbb385..f1ded1e7a9cab0989454295365e1e8bde7b77e7b 100644 (file)
--- a/coders/mtv.h
+++ b/coders/mtv.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickMTVHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/mvg.h b/coders/mvg.h
index 6836d463c09595b995a6da05592e146563588da6..a7acbabcf4e9c82790306d5f565099f8935aa32f 100644 (file)
--- a/coders/mvg.h
+++ b/coders/mvg.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickMVGHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/null.h b/coders/null.h
index 2e5adea130b9f1a0a7a265e3c2c8fcc5ade198ba..06063b495c974ef667213606ea30f83499e9c0a8 100644 (file)
--- a/coders/null.h
+++ b/coders/null.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickNULLHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/otb.h b/coders/otb.h
index 6a4f2ae9e974afb2d1fad91927016ac0d424729e..94f6643e585c8e6f6d9d095a634cc5466ff321c9 100644 (file)
--- a/coders/otb.h
+++ b/coders/otb.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickOTBHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/palm.h b/coders/palm.h
index 2c8899f35175337b031935a266555995bf75ac2f..979f77c9ad6540247b33c61bea3e7a68b43d72f1 100644 (file)
--- a/coders/palm.h
+++ b/coders/palm.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPALMHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/pango.h b/coders/pango.h
index 43ce98b7d08349455b1cf926198cb7a85b6edf85..85a0fcb7b8c67848cfb55bf8a7b3b56684c58853 100644 (file)
--- a/coders/pango.h
+++ b/coders/pango.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPANGOHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/pattern.h b/coders/pattern.h
index d44725f93e050562dcc09e3b81483194a7c83012..d9f1ace12bbbcbef0ae3bcc7a62515cc681a1079 100644 (file)
--- a/coders/pattern.h
+++ b/coders/pattern.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPATTERNHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/pcd.h b/coders/pcd.h
index c9252c16ad99031b741ac563b4d9bc45396c6aa4..3b6741c07c58c220b62439fbc9804f4d47f3da11 100644 (file)
--- a/coders/pcd.h
+++ b/coders/pcd.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPCDHeaders \
+  MagickCoderHeader("PCD", 2048, "PCD_")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/pcl.h b/coders/pcl.h
index cca19a937a0be50f0d305d9fbf6d934c22bfdae2..5211030c738e3cd1a218321d4c15b30196fb84f0 100644 (file)
--- a/coders/pcl.h
+++ b/coders/pcl.h
@@ -16,6 +16,10 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPCLHeaders \
+  MagickCoderHeader("PCL", 0, "\033E\033")
+
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/pcx.h b/coders/pcx.h
index 1ff14d8860dc91e1bb40e5aedb7467b9c326fe75..d76712bba6f70e3af15ea943c74f651bfd8d42a7 100644 (file)
--- a/coders/pcx.h
+++ b/coders/pcx.h
@@ -16,6 +16,11 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPCXHeaders \
+  MagickCoderHeader("PCX", 0, "\012\002") \
+  MagickCoderHeader("PCX", 0, "\012\005") \
+  MagickCoderHeader("DCX", 0, "\261\150\336\72")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/pdb.h b/coders/pdb.h
index ba018d84f3182d2f4fa88e9ae8232100f612fba0..21f8b316a8207fd7f9a852f6d800b4da151eabb6 100644 (file)
--- a/coders/pdb.h
+++ b/coders/pdb.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPDBHeaders \
+  MagickCoderHeader("PDB", 60, "vIMGView")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/pdf.h b/coders/pdf.h
index 3877ab8d94b893638c980ab38a6307f0fcb21328..a88e6fc0008ad3453e584e09cbb9568d29a67e12 100644 (file)
--- a/coders/pdf.h
+++ b/coders/pdf.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPDFHeaders \
+  MagickCoderHeader("PDF", 0, "%PDF-")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/pes.h b/coders/pes.h
index 8faa8a3c6edc2a3dfdb237bdeea8ad6d3c981c61..2a8649bd921d461ef11299a72530aa252b50fbd4 100644 (file)
--- a/coders/pes.h
+++ b/coders/pes.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPESHeaders \
+  MagickCoderHeader("PES", 0, "#PES")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/pgx.h b/coders/pgx.h
index 91192eac8b2f4e67cfa108693e6c6a1608ca9af0..7d726108b1cd797fce67c367b521f687fe74a0e8 100644 (file)
--- a/coders/pgx.h
+++ b/coders/pgx.h
@@ -16,6 +16,11 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPGXHeaders \
+  MagickCoderHeader("PGX", 0, "\050\107\020\115\046") \
+  MagickCoderHeader("PGX", 0, "PG ML") \
+  MagickCoderHeader("PGX", 0, "PG LM")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/pict.h b/coders/pict.h
index c940a64b358d8ac9f735321325dd7cab6cb71cf2..a2fa0388f28ebe0edcf86ef7fd2b1eb8ebe83faa 100644 (file)
--- a/coders/pict.h
+++ b/coders/pict.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPICTHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/pix.h b/coders/pix.h
index 7e73b3db863768da7e3f713e0f65af45dfcefd2b..2faa0ce106804bec345991f999bfc76412ea220d 100644 (file)
--- a/coders/pix.h
+++ b/coders/pix.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPIXHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/plasma.h b/coders/plasma.h
index 4ac515580c28894bbc40f64a63e0b3d2d59bec30..4f1153b7ec940cbd98b059f7a6cbbba3ad6d95b2 100644 (file)
--- a/coders/plasma.h
+++ b/coders/plasma.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPLASMAHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/png.c b/coders/png.c
index 1cce9fc52c81f8548f9b7bce96134495b3b89edb..ec61508b38c373cd1ab70925fdfade132d73d880 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -67,7 +67,8 @@
 #include "MagickCore/layer.h"
 #include "MagickCore/list.h"
 #include "MagickCore/log.h"
-#include "MagickCore/MagickCore.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/magick-private.h"
 #include "MagickCore/memory_.h"
 #include "MagickCore/memory-private.h"
 #include "MagickCore/module.h"

diff --git a/coders/png.h b/coders/png.h
index e298f3cd3d5051a428280f821fe59439740ebabe..a89cac8c42d606744c2a49a7b0e3db42b069d211 100644 (file)
--- a/coders/png.h
+++ b/coders/png.h
@@ -16,6 +16,11 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPNGHeaders \
+  MagickCoderHeader("PNG", 0, "\211PNG\r\n\032\n") \
+  MagickCoderHeader("JNG", 0, "\213JNG\r\n\032\n") \
+  MagickCoderHeader("MNG", 0, "\212MNG\r\n\032\n")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/pnm.h b/coders/pnm.h
index 61b2ec02e7dc762824f85d601c608cf54e5eaa85..6f48d881040cec4c9c2e1287d509f07de933f42c 100644 (file)
--- a/coders/pnm.h
+++ b/coders/pnm.h
@@ -16,6 +16,17 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPNMHeaders \
+  MagickCoderHeader("PBM", 0, "P1") \
+  MagickCoderHeader("PGM", 0, "P2") \
+  MagickCoderHeader("PPM", 0, "P3") \
+  MagickCoderHeader("PBM", 0, "P4") \
+  MagickCoderHeader("PGM", 0, "P5") \
+  MagickCoderHeader("PPM", 0, "P6") \
+  MagickCoderHeader("PAM", 0, "P7") \
+  MagickCoderHeader("PFM", 0, "PF") \
+  MagickCoderHeader("PFM", 0, "Pf")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/ps.h b/coders/ps.h
index ab3ef7d15139913b30a742f109a53bc539216041..f01e4a7d8dc03c25b005af1000960225adb29bfb 100644 (file)
--- a/coders/ps.h
+++ b/coders/ps.h
@@ -16,6 +16,11 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPSHeaders \
+  MagickCoderHeader("PS", 0, "%!") \
+  MagickCoderHeader("PS", 0, "\004%!") \
+  MagickCoderHeader("PS", 0, "\305\320\323\306")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/ps2.h b/coders/ps2.h
index 9a3ec5ef552db5cfd6edcc57880cccbe342ce921..6728a6690f2c13134487b7d3cdbdea6dacce6dcc 100644 (file)
--- a/coders/ps2.h
+++ b/coders/ps2.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPS2Headers
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/ps3.h b/coders/ps3.h
index 38f280c7e318b9741b784736239fc922ac069ef2..13c2260a12197f343f2563702379ca12c4c9cc46 100644 (file)
--- a/coders/ps3.h
+++ b/coders/ps3.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPS3Headers
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/psd.h b/coders/psd.h
index aa49093ec9fbd6bf0c7a2f5eea7482c710ca4a29..052279a276511059eda334b9534961cfbf7c7bec 100644 (file)
--- a/coders/psd.h
+++ b/coders/psd.h
@@ -16,6 +16,10 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPSDHeaders \
+  MagickCoderHeader("PSB", 0, "8BPB") \
+  MagickCoderHeader("PSD", 0, "8BPS")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/pwp.h b/coders/pwp.h
index ac1295dc36f827974b60188ae37a09d0dae65a0f..3fa2618bdc01cd6270eb08a7ed2983189ca23f6d 100644 (file)
--- a/coders/pwp.h
+++ b/coders/pwp.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickPWPHeaders \
+  MagickCoderHeader("PWP", 0, "SFW95")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/raw.h b/coders/raw.h
index 476185412fbed6f978bd03e579ae1e279f2269f0..b6bbe978293d4c98dfdfb29f8e827014d2a9a82b 100644 (file)
--- a/coders/raw.h
+++ b/coders/raw.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickRAWHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/rgb.h b/coders/rgb.h
index 7bcc20b410817f22a48d0563c802f34eb5b6dea5..79584251ecbc54badbd7b8f429a93451a93644e8 100644 (file)
--- a/coders/rgb.h
+++ b/coders/rgb.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickRGBHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/rgf.h b/coders/rgf.h
index b45eb66a5500b35bd101862ea07b34db63e1e5f6..65c61b0e12143be7abe6b724b4867e88ad161666 100644 (file)
--- a/coders/rgf.h
+++ b/coders/rgf.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickRGFHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/rla.h b/coders/rla.h
index aa118ff7f8eb11aca2033a8bb858468821c68f63..9c9f69ff57a1b077deda83f1dd6e60db9ddfcdfe 100644 (file)
--- a/coders/rla.h
+++ b/coders/rla.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickRLAHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/rle.h b/coders/rle.h
index 0eb6b1b4f9e8d576673c9089e25f887779ebb72c..715f7cc02fc05550fb43d836fbf65d889001240d 100644 (file)
--- a/coders/rle.h
+++ b/coders/rle.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickRLEHeaders \
+  MagickCoderHeader("RLE", 0, "\122\314")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/scr.h b/coders/scr.h
index c81f3f3c9c6fac9fb8c890918dfb69c290c343bf..95a80096b5c1c9a67ed956f4eddaaebf66d50d22 100644 (file)
--- a/coders/scr.h
+++ b/coders/scr.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickSCRHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/screenshot.h b/coders/screenshot.h
index 198489841a9606af41ce90bc4a00f620872f4a07..8315a42506f4d95cd5850fed9fef81518548ab5e 100644 (file)
--- a/coders/screenshot.h
+++ b/coders/screenshot.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickSCREENSHOTHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/sct.h b/coders/sct.h
index 3127d1a670bbfd85fcf44e87ad5f48e3a94e6ecd..10d96debfbedd86369bac4e09d24a08e81fa1e26 100644 (file)
--- a/coders/sct.h
+++ b/coders/sct.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickSCTHeaders \
+  MagickCoderHeader("SCT", 0, "CT")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/sfw.h b/coders/sfw.h
index f37f7803bdb1f94ef3b2b4731c3ba767f2bffbf6..6534a53055a16b1ba517c3fb029329440ff94c21 100644 (file)
--- a/coders/sfw.h
+++ b/coders/sfw.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickSFWHeaders \
+  MagickCoderHeader("SFW", 0, "SFW94")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/sgi.h b/coders/sgi.h
index 10e0fd7d61eec7e6036895497871ea07470db22f..f44fcb8b5d824dda7441e1df6dfb72f3b07a8a4e 100644 (file)
--- a/coders/sgi.h
+++ b/coders/sgi.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickSGIHeaders \
+  MagickCoderHeader("SGI", 0, "\001\332")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/sixel.h b/coders/sixel.h
index 0f09fca1782e0f88d968d9ccd83322de24a02d6f..0a4971c2bfdc3fa99f2b74154e4b25530f3c9140 100644 (file)
--- a/coders/sixel.h
+++ b/coders/sixel.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickSIXELHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/stegano.h b/coders/stegano.h
index be01df13c8f5eca8940ff4fb5cc73d8667ec21e0..1e6c8dafcb4cab5089bc601923af33b516476a9a 100644 (file)
--- a/coders/stegano.h
+++ b/coders/stegano.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickSTEGANOHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/sun.h b/coders/sun.h
index 902d05c1568c811fcbf1f133a29b13fd2f2cb33b..a6c90e152bce5f1113fb5450499f0618f88b9735 100644 (file)
--- a/coders/sun.h
+++ b/coders/sun.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickSUNHeaders \
+  MagickCoderHeader("SUN", 0, "\131\246\152\225")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/svg.h b/coders/svg.h
index 415c41f65a7b778badebb8c1ad6ebb83c39212e2..3f8caac12f841d4add3fbeae2e36f979411c45b8 100644 (file)
--- a/coders/svg.h
+++ b/coders/svg.h
@@ -16,6 +16,12 @@
 
 #include "coders/coders-private.h"
 
+#define MagickSVGHeaders \
+  MagickCoderHeader("SVG", 1, "?XML") \
+  MagickCoderHeader("SVG", 1, "?xml") \
+  MagickCoderHeader("SVG", 1, "SVG") \
+  MagickCoderHeader("SVG", 1, "svg")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/tga.h b/coders/tga.h
index 301111b7005bbbb877349ce2abf165ff52e944e1..531664b37be4e865171525c53ab0924229c1e29e 100644 (file)
--- a/coders/tga.h
+++ b/coders/tga.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickTGAHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/thumbnail.h b/coders/thumbnail.h
index 6f24b4a036953ae439ed81c9eab81fed259d0bd3..ea5383405670cb8bc2d049224fed41ae55ee5c28 100644 (file)
--- a/coders/thumbnail.h
+++ b/coders/thumbnail.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickTHUMBNAILHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/tiff.h b/coders/tiff.h
index 4af6fd036b308fa6df9af9473e6708430cb144a0..8ed01a1606a4aca1a596d77099c1566689b54ca6 100644 (file)
--- a/coders/tiff.h
+++ b/coders/tiff.h
@@ -16,6 +16,12 @@
 
 #include "coders/coders-private.h"
 
+#define MagickTIFFHeaders \
+  MagickCoderHeader("TIFF", 0, "\115\115\000\052") \
+  MagickCoderHeader("TIFF", 0, "\111\111\052\000") \
+  MagickCoderHeader("TIFF64", 0, "\115\115\000\053\000\010\000\000") \
+  MagickCoderHeader("TIFF64", 0, "\111\111\053\000\010\000\000\000")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/tile.h b/coders/tile.h
index ade4e27c095cf9f93c9f62b75a5fd665b7ef0249..23326fdf5307498c7d60f8973e8cc54ff17163b0 100644 (file)
--- a/coders/tile.h
+++ b/coders/tile.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickTILEHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/tim.h b/coders/tim.h
index 47d56e405f1ff2d495e8dcb65c6e68715ecee00b..b2bedd08f39358fcc02154df619d0aa4305cd0aa 100644 (file)
--- a/coders/tim.h
+++ b/coders/tim.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickTIMHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/ttf.h b/coders/ttf.h
index 28abd1257535a26e3a41e511303ab3f5a193afd8..b4af4ef9fafc23bf45c2d9106923cdf06f54a154 100644 (file)
--- a/coders/ttf.h
+++ b/coders/ttf.h
@@ -16,6 +16,11 @@
 
 #include "coders/coders-private.h"
 
+#define MagickTTFHeaders \
+  MagickCoderHeader("TTF", 0, "\000\001\000\000\000") \
+  MagickCoderHeader("PFA", 0, "%!PS-AdobeFont-1.0") \
+  MagickCoderHeader("PFB", 6, "%!PS-AdobeFont-1.0")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/txt.c b/coders/txt.c
index d464813bb6fc78499fcc10702506246319324810..a2c82d93b6ab7deffe359ad64bb1b0d9d8a67992 100644 (file)
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -67,6 +67,7 @@
 #include "MagickCore/statistic.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/module.h"
+#include "coders/txt.h"
 \f
 /*
   Forward declarations.
@@ -101,8 +102,6 @@ static MagickBooleanType
 */
 static MagickBooleanType IsTXT(const unsigned char *magick,const size_t length)
 {
-#define MagickID  "# ImageMagick pixel enumeration:"
-
   char
     colorspace[MagickPathExtent];
 
@@ -116,7 +115,8 @@ static MagickBooleanType IsTXT(const unsigned char *magick,const size_t length)
 
   if (length < 40)
     return(MagickFalse);
-  if (LocaleNCompare((const char *) magick,MagickID,strlen(MagickID)) != 0)
+  if (LocaleNCompare((const char *) magick,MagickTXTID,
+        strlen(MagickTXTID)) != 0)
     return(MagickFalse);
   count=(ssize_t) sscanf((const char *) magick+32,"%lu,%lu,%lu,%32s",&columns,
     &rows,&depth,colorspace);
@@ -439,7 +439,7 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
     }
   (void) memset(text,0,sizeof(text));
   (void) ReadBlobString(image,text);
-  if (LocaleNCompare((char *) text,MagickID,strlen(MagickID)) != 0)
+  if (LocaleNCompare((char *) text,MagickTXTID,strlen(MagickTXTID)) != 0)
     ThrowReaderException(CorruptImageError,"ImproperImageHeader");
   x_offset=(-1.0);
   y_offset=(-1.0);
@@ -589,7 +589,7 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
       break;
     *text='\0';
     (void) ReadBlobString(image,text);
-    if (LocaleNCompare((char *) text,MagickID,strlen(MagickID)) == 0)
+    if (LocaleNCompare((char *) text,MagickTXTID,strlen(MagickTXTID)) == 0)
       {
         /*
           Allocate next image structure.
@@ -606,7 +606,7 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
         if (status == MagickFalse)
           break;
       }
-  } while (LocaleNCompare((char *) text,MagickID,strlen(MagickID)) == 0);
+  } while (LocaleNCompare((char *) text,MagickTXTID,strlen(MagickTXTID)) == 0);
   (void) CloseBlob(image);
   if (status == MagickFalse)
     return(DestroyImageList(image));

diff --git a/coders/txt.h b/coders/txt.h
index 47db33aa8b221d15d181211b9fb3b497343a29e7..6ad6e4647d127c7475aea3786c9290991afddbda 100644 (file)
--- a/coders/txt.h
+++ b/coders/txt.h
@@ -16,6 +16,10 @@
 
 #include "coders/coders-private.h"
 
+#define MagickTXTID  "# ImageMagick pixel enumeration:"
+#define MagickTXTHeaders \
+  MagickCoderHeader("TXT", 0, MagickTXTID)
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/uil.h b/coders/uil.h
index 2b39e3c96b208c6da6fe40d5b03f8cf73455a408..eb6adbedbd1cc606857b76e737fac357f77d2b1d 100644 (file)
--- a/coders/uil.h
+++ b/coders/uil.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickUILHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/url.h b/coders/url.h
index b66eadc5beea2aafad4b1c544bdd9b7fd998bbac..46146dba5ad448709beb06906dc7a233384525a8 100644 (file)
--- a/coders/url.h
+++ b/coders/url.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickURLHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/uyvy.h b/coders/uyvy.h
index c12be30ceb40cb7aa90d120075affb4dccf0483e..63219c197c0f4927eb2bc3abf64fbe28b3966952 100644 (file)
--- a/coders/uyvy.h
+++ b/coders/uyvy.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickUYVYHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/vicar.h b/coders/vicar.h
index 6778d483e509507b76fbc5151fe96b0c8074c9fb..542a715169f41d35161f7922e315bdb6c2817b82 100644 (file)
--- a/coders/vicar.h
+++ b/coders/vicar.h
@@ -16,6 +16,11 @@
 
 #include "coders/coders-private.h"
 
+#define MagickVICARHeaders \
+  MagickCoderHeader("VICAR", 0, "LBLSIZE") \
+  MagickCoderHeader("VICAR", 0, "NJPL1I") \
+  MagickCoderHeader("VICAR", 0, "PDS_VERSION_ID")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/vid.h b/coders/vid.h
index 177675b5056914c05d83551945b1cd4db0c218a8..58e6f40a3b31026835bcf1aebf6182572d11c609 100644 (file)
--- a/coders/vid.h
+++ b/coders/vid.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickVIDHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/viff.h b/coders/viff.h
index 65101c769e53e3c87e9a28695c3518d2162a9c10..c0525e6977f0cfc94e1c1976cc495795efd50043 100644 (file)
--- a/coders/viff.h
+++ b/coders/viff.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickVIFFHeaders \
+  MagickCoderHeader("VIFF", 0, "\253\001")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/vips.h b/coders/vips.h
index 1bf38dde91eb3076ff13212728217e8b386a5635..60c5961c93a1ecf790a44063c69cbbc73f3172fc 100644 (file)
--- a/coders/vips.h
+++ b/coders/vips.h
@@ -16,6 +16,10 @@
 
 #include "coders/coders-private.h"
 
+#define MagickVIPSHeaders \
+  MagickCoderHeader("VIPS", 0, "\010\362\246\266") \
+  MagickCoderHeader("VIPS", 0, "\266\246\362\010")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/wbmp.h b/coders/wbmp.h
index 62bec65f8c509f208ca570a5c7090f6b55bc6097..b521dd75f4c71d064761b3467296ffa3d5f6edc7 100644 (file)
--- a/coders/wbmp.h
+++ b/coders/wbmp.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickWBMPHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/webp.h b/coders/webp.h
index 05c6d4828cd687bb717d6f296426dd462982a7e5..b0e4e7f5a2534684c0117120a9cd39b6da684e43 100644 (file)
--- a/coders/webp.h
+++ b/coders/webp.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickWEBPHeaders \
+  MagickCoderHeader("WEBP", 8, "WEBP")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/wmf.h b/coders/wmf.h
index dea15cc702ff53a9dcf70d9317caaf45888e19da..c1391680711b3bda17cc358f12780db2c2afd7b7 100644 (file)
--- a/coders/wmf.h
+++ b/coders/wmf.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickWMFHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/wpg.h b/coders/wpg.h
index add1abd7f3c95bfb5da31547e568d4fa338abd34..010a9cbeb8db8a09f0cea128d65111e20a608a07 100644 (file)
--- a/coders/wpg.h
+++ b/coders/wpg.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickWPGHeaders \
+  MagickCoderHeader("WPG", 0, "\377WPC")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/x.h b/coders/x.h
index 06e9e77fecebd4de73e4433ec15d8d3e48b51afb..dedd68598a6e130628cbc28c55c77bc87b5b9430 100644 (file)
--- a/coders/x.h
+++ b/coders/x.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickXHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/xbm.h b/coders/xbm.h
index c935ff403cd5a97dbefdc98d295b57269e0bd14a..72e55fa2e3adfce59c1bb2849c8a780a724b5d40 100644 (file)
--- a/coders/xbm.h
+++ b/coders/xbm.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickXBMHeaders \
+  MagickCoderHeader("XBM", 0, "#define")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/xc.h b/coders/xc.h
index b8e690f5d880d537907ae7de3292efffd8756ba9..1cbe8dfb55814d93d6b34371589314d7c4621813 100644 (file)
--- a/coders/xc.h
+++ b/coders/xc.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickXCHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/xcf.h b/coders/xcf.h
index 21555ec4ca2a07fd1affb3c057a1b538f2275b2a..08d52d1ee600dbb19437fc0a8ec66ffa93a95865 100644 (file)
--- a/coders/xcf.h
+++ b/coders/xcf.h
@@ -16,6 +16,10 @@
 
 #include "coders/coders-private.h"
 
+#define MagickXCFHeaders \
+  MagickCoderHeader("XCF", 0, "gimp xcf")
+
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/xpm.h b/coders/xpm.h
index 5f30da1ef63f96d9ed5eff235e0bf3d8df96ff52..43f5a55469bf0a05865367f9d74cd3a9f6c6bdbd 100644 (file)
--- a/coders/xpm.h
+++ b/coders/xpm.h
@@ -16,6 +16,9 @@
 
 #include "coders/coders-private.h"
 
+#define MagickXPMHeaders \
+  MagickCoderHeader("XPM", 1, "* XPM *")
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/xps.h b/coders/xps.h
index 4ab4982897118d7acad6a82f26243a31238724a8..6e83e2bedaae75bdef8437ca031046b9c60de112 100644 (file)
--- a/coders/xps.h
+++ b/coders/xps.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickXPSHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/xtrn.c b/coders/xtrn.c
index 1a834211aa9b18926491f5e38187cb6b51469bae..ea75eb49d3a599a6ad77d76e9e593a8fb2e5beaa 100644 (file)
--- a/coders/xtrn.c
+++ b/coders/xtrn.c
@@ -55,8 +55,10 @@
 #include "MagickCore/image.h"
 #include "MagickCore/image-private.h"
 #include "MagickCore/list.h"
-#include "MagickCore/MagickCore.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/magick-private.h"
 #include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
 #include "MagickCore/string_.h"
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__MINGW32__)
 #define WIN32_LEAN_AND_MEAN

diff --git a/coders/xtrn.h b/coders/xtrn.h
index 9221ec714dc8d547df83bf9c794f0185996f2edc..9c7e857a209faae63c86cb5bb34ce1bb50bd3430 100644 (file)
--- a/coders/xtrn.h
+++ b/coders/xtrn.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickXTRNHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/xwd.h b/coders/xwd.h
index 92dcff39ec4985fd16ebc05b2cf56b33c363fd1e..aefde91fdc62f7120999fcba22cd890dbee8d0c5 100644 (file)
--- a/coders/xwd.h
+++ b/coders/xwd.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickXWDHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/ycbcr.h b/coders/ycbcr.h
index 996e9e5ac4d396c502427d2a75095d607676609a..24e3aea64b01bc739dd7f7acbd38d9ab23a6ce2c 100644 (file)
--- a/coders/ycbcr.h
+++ b/coders/ycbcr.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickYCBCRHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

diff --git a/coders/yuv.h b/coders/yuv.h
index 118dcff41b9e6d7b34c4d6e13b5078947bc69e09..c79541a903377f5193af401abfb71c774379ad31 100644 (file)
--- a/coders/yuv.h
+++ b/coders/yuv.h
@@ -16,6 +16,8 @@
 
 #include "coders/coders-private.h"
 
+#define MagickYUVHeaders
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif