From 44b1a1bb72b204215958afa0fce05f353a0efa86 Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Sun, 30 Sep 2018 22:09:25 +0200 Subject: [PATCH] Moved coder headers to the header files. --- MagickCore/magic.c | 118 ++-------------------------------------- coders/aai.h | 2 + coders/art.h | 2 + coders/avs.h | 2 + coders/bgr.h | 2 + coders/bmp.h | 8 +++ coders/braille.h | 2 + coders/cals.h | 6 ++ coders/caption.h | 2 + coders/cin.h | 3 + coders/cip.h | 2 + coders/clip.h | 2 + coders/clipboard.h | 2 + coders/cmyk.h | 2 + coders/coders-private.h | 3 + coders/cut.h | 2 + coders/dcm.h | 3 + coders/dds.h | 3 + coders/debug.h | 2 + coders/dib.h | 3 + coders/djvu.h | 3 + coders/dng.h | 6 ++ coders/dot.h | 3 + coders/dps.h | 2 + coders/dpx.h | 4 ++ coders/emf.h | 5 ++ coders/ept.h | 3 + coders/exr.h | 3 + coders/fax.h | 3 + coders/fits.h | 4 ++ coders/flif.h | 3 + coders/fpx.h | 2 + coders/gif.h | 3 + coders/gradient.h | 2 + coders/gray.h | 2 + coders/hald.h | 2 + coders/hdr.h | 4 ++ coders/heic.h | 5 ++ coders/histogram.h | 2 + coders/hrz.h | 2 + coders/html.h | 2 + coders/icon.h | 2 + coders/info.h | 2 + coders/inline.h | 2 + coders/ipl.h | 3 + coders/jbig.h | 2 + coders/jnx.h | 2 + coders/jp2.h | 5 ++ coders/jpeg.h | 3 + coders/json.h | 2 + coders/label.h | 2 + coders/mac.h | 2 + coders/magick.h | 2 + coders/map.h | 2 + coders/mask.h | 2 + coders/mat.h | 3 + coders/matte.h | 2 + coders/meta.h | 8 +++ coders/miff.h | 4 ++ coders/mono.h | 2 + coders/mpc.h | 3 + coders/mpeg.h | 4 ++ coders/mpr.h | 2 + coders/msl.h | 2 + coders/mtv.h | 2 + coders/mvg.h | 2 + coders/null.h | 2 + coders/otb.h | 2 + coders/palm.h | 2 + coders/pango.h | 2 + coders/pattern.h | 2 + coders/pcd.h | 3 + coders/pcl.h | 4 ++ coders/pcx.h | 5 ++ coders/pdb.h | 3 + coders/pdf.h | 3 + coders/pes.h | 3 + coders/pgx.h | 5 ++ coders/pict.h | 2 + coders/pix.h | 2 + coders/plasma.h | 2 + coders/png.c | 3 +- coders/png.h | 5 ++ coders/pnm.h | 11 ++++ coders/ps.h | 5 ++ coders/ps2.h | 2 + coders/ps3.h | 2 + coders/psd.h | 4 ++ coders/pwp.h | 3 + coders/raw.h | 2 + coders/rgb.h | 2 + coders/rgf.h | 2 + coders/rla.h | 2 + coders/rle.h | 3 + coders/scr.h | 2 + coders/screenshot.h | 2 + coders/sct.h | 3 + coders/sfw.h | 3 + coders/sgi.h | 3 + coders/sixel.h | 2 + coders/stegano.h | 2 + coders/sun.h | 3 + coders/svg.h | 6 ++ coders/tga.h | 2 + coders/thumbnail.h | 2 + coders/tiff.h | 6 ++ coders/tile.h | 2 + coders/tim.h | 2 + coders/ttf.h | 5 ++ coders/txt.c | 12 ++-- coders/txt.h | 4 ++ coders/uil.h | 2 + coders/url.h | 2 + coders/uyvy.h | 2 + coders/vicar.h | 5 ++ coders/vid.h | 2 + coders/viff.h | 3 + coders/vips.h | 4 ++ coders/wbmp.h | 2 + coders/webp.h | 3 + coders/wmf.h | 2 + coders/wpg.h | 3 + coders/x.h | 2 + coders/xbm.h | 3 + coders/xc.h | 2 + coders/xcf.h | 4 ++ coders/xpm.h | 3 + coders/xps.h | 2 + coders/xtrn.c | 4 +- coders/xtrn.h | 2 + coders/xwd.h | 2 + coders/ycbcr.h | 2 + coders/yuv.h | 2 + 133 files changed, 389 insertions(+), 121 deletions(-) diff --git a/MagickCore/magic.c b/MagickCore/magic.c index 8b65d5efa..a9ac8db3f 100644 --- 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" /* Define declarations. */ #define MagicPattern(magic) (const unsigned char *) (magic), sizeof(magic)-1 +#define AddMagickCoder(coder) Magick ## coder ## Headers /* 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 adb26a0be..3df7122aa 100644 --- 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 86a513214..64a01d44a 100644 --- 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 5f4184917..6ba6ccacd 100644 --- 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 e8c3d0e51..744eedfee 100644 --- 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 fffbd9b6d..f6e8f1533 100644 --- 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 325393580..456b8420f 100644 --- 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 cee1c9a86..8d12b3ab7 100644 --- 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 cfdc60a50..bcbcb5298 100644 --- 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 cbc7046b4..c972de8cb 100644 --- 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 3c7bceec2..dfc8737b1 100644 --- 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 7305f9a4e..5536ccacb 100644 --- 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 38f05990e..bff211dca 100644 --- 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 281bca574..3558adee8 100644 --- 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 d71a2eda8..e13c2cd54 100644 --- 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 23abb5e22..28504da34 100644 --- 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 b80902f8c..037b6d50c 100644 --- 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 db54aa3a7..add2f47b0 100644 --- 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 4cce0c1f6..73d795365 100644 --- 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 0e47eb8eb..3f132c1ad 100644 --- 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 a602e7f88..02620c5c7 100644 --- 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 b0bf3cedd..e42dc68de 100644 --- 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 fbce80e7c..8ffdf7a62 100644 --- 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 bce65aecb..2b5f5f7cf 100644 --- 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 43f31bbfe..4eac24aa6 100644 --- 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 f5d8243d9..643b7cdb1 100644 --- 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 b19449cdd..d32390ae6 100644 --- 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 7762166e2..f083ce938 100644 --- 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 0a87e1ecc..de7e27142 100644 --- 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 6775af222..d8c9027f4 100644 --- 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 eba7dfa65..d5d09128d 100644 --- 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 7a81a71d4..0b3623e47 100644 --- 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 bcd1d2a30..733d3fbd2 100644 --- 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 a551afadd..14673f2a2 100644 --- 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 51455a814..c94b7fc28 100644 --- 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 ac48166f4..2bd5228c6 100644 --- 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 285cea2da..a72059dbd 100644 --- 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 e89f40f9c..bd6869e2f 100644 --- 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 4342aa313..ac29c2700 100644 --- 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 2de1053ee..44e6dc21c 100644 --- 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 77c885f26..753576cbd 100644 --- 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 7429820d8..96f48c685 100644 --- 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 615c2eba9..cc8f362a1 100644 --- 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 86148fbd4..45c5efa83 100644 --- 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 c63595da4..57c3821df 100644 --- 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 b682f7c5c..b82dcb2cd 100644 --- 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 d55b35048..eabf12b96 100644 --- 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 3371ff8c9..fa15b2cab 100644 --- 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 277aae294..ac1f2ab00 100644 --- 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 5ad55ec0e..dbd7c0f4f 100644 --- 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 a46ce8a05..85d36b2e0 100644 --- 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 032074387..21a783756 100644 --- 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 ecd405a8b..871443d6b 100644 --- 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 c2b17bae1..2cae3f673 100644 --- 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 39ed719d5..eb246a4c5 100644 --- 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 8a0dcdecd..64297f152 100644 --- 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 3a3e451df..e7685b415 100644 --- 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 3f8882fb8..3ebc538e5 100644 --- 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 c3708d2bb..0bb37159b 100644 --- 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 62c043fed..e5d5a7aa9 100644 --- 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 54f0a4b1e..29bb2a8dc 100644 --- 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 2d3e832ac..9f676c12f 100644 --- 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 a346f0c9b..ed10ecc59 100644 --- 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 61db79854..82a8e8a31 100644 --- 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 03b0e632e..f1ded1e7a 100644 --- 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 6836d463c..a7acbabcf 100644 --- 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 2e5adea13..06063b495 100644 --- 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 6a4f2ae9e..94f6643e5 100644 --- 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 2c8899f35..979f77c9a 100644 --- 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 43ce98b7d..85a0fcb7b 100644 --- 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 d44725f93..d9f1ace12 100644 --- 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 c9252c16a..3b6741c07 100644 --- 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 cca19a937..5211030c7 100644 --- 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 1ff14d886..d76712bba 100644 --- 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 ba018d84f..21f8b316a 100644 --- 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 3877ab8d9..a88e6fc00 100644 --- 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 8faa8a3c6..2a8649bd9 100644 --- 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 91192eac8..7d726108b 100644 --- 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 c940a64b3..a2fa0388f 100644 --- 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 7e73b3db8..2faa0ce10 100644 --- 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 4ac515580..4f1153b7e 100644 --- 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 1cce9fc52..ec61508b3 100644 --- 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 e298f3cd3..a89cac8c4 100644 --- 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 61b2ec02e..6f48d8810 100644 --- 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 ab3ef7d15..f01e4a7d8 100644 --- 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 9a3ec5ef5..6728a6690 100644 --- 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 38f280c7e..13c2260a1 100644 --- 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 aa49093ec..052279a27 100644 --- 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 ac1295dc3..3fa2618bd 100644 --- 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 476185412..b6bbe9782 100644 --- 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 7bcc20b41..79584251e 100644 --- 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 b45eb66a5..65c61b0e1 100644 --- 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 aa118ff7f..9c9f69ff5 100644 --- 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 0eb6b1b4f..715f7cc02 100644 --- 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 c81f3f3c9..95a80096b 100644 --- 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 198489841..8315a4250 100644 --- 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 3127d1a67..10d96debf 100644 --- 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 f37f7803b..6534a5305 100644 --- 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 10e0fd7d6..f44fcb8b5 100644 --- 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 0f09fca17..0a4971c2b 100644 --- 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 be01df13c..1e6c8dafc 100644 --- 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 902d05c15..a6c90e152 100644 --- 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 415c41f65..3f8caac12 100644 --- 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 301111b70..531664b37 100644 --- 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 6f24b4a03..ea5383405 100644 --- 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 4af6fd036..8ed01a160 100644 --- 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 ade4e27c0..23326fdf5 100644 --- 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 47d56e405..b2bedd08f 100644 --- 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 28abd1257..b4af4ef9f 100644 --- 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 d464813bb..a2c82d93b 100644 --- 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" /* 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 47db33aa8..6ad6e4647 100644 --- 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 2b39e3c96..eb6adbedb 100644 --- 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 b66eadc5b..46146dba5 100644 --- 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 c12be30ce..63219c197 100644 --- 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 6778d483e..542a71516 100644 --- 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 177675b50..58e6f40a3 100644 --- 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 65101c769..c0525e697 100644 --- 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 1bf38dde9..60c5961c9 100644 --- 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 62bec65f8..b521dd75f 100644 --- 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 05c6d4828..b0e4e7f5a 100644 --- 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 dea15cc70..c13916807 100644 --- 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 add1abd7f..010a9cbeb 100644 --- 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 06e9e77fe..dedd68598 100644 --- 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 c935ff403..72e55fa2e 100644 --- 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 b8e690f5d..1cbe8dfb5 100644 --- 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 21555ec4c..08d52d1ee 100644 --- 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 5f30da1ef..43f5a5546 100644 --- 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 4ab498289..6e83e2bed 100644 --- 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 1a834211a..ea75eb49d 100644 --- 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 9221ec714..9c7e857a2 100644 --- 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 92dcff39e..aefde91fd 100644 --- 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 996e9e5ac..24e3aea64 100644 --- 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 118dcff41..c79541a90 100644 --- 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 -- 2.40.0