From 826cbebfe562ac9160a3cb4316b4e4bed61203cb Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Fri, 5 Oct 2018 00:12:46 +0200 Subject: [PATCH] Moved aliases to coder header file. --- MagickCore/coder.c | 182 ++-------------------------------------- coders/aai.h | 2 + coders/art.h | 2 + coders/avs.h | 2 + coders/bgr.h | 4 + coders/bmp.h | 4 + coders/braille.h | 7 ++ coders/cals.h | 3 + coders/caption.h | 2 + coders/cin.h | 2 + coders/cip.h | 2 + coders/clip.h | 2 + coders/clipboard.h | 2 + coders/cmyk.h | 3 + coders/coders-private.h | 2 + coders/cut.h | 2 + coders/dcm.h | 2 + coders/dds.h | 2 + coders/debug.h | 2 + coders/dib.h | 3 + coders/djvu.h | 2 + coders/dng.h | 25 ++++++ coders/dot.h | 3 + coders/dps.h | 2 + coders/dpx.h | 2 + coders/emf.h | 3 + coders/ept.h | 4 + coders/exr.h | 2 + coders/fax.h | 4 + coders/fits.h | 3 + coders/flif.h | 2 + coders/fpx.h | 2 + coders/gif.h | 3 + coders/gradient.h | 3 + coders/gray.h | 3 + coders/hald.h | 2 + coders/hdr.h | 2 + coders/heic.h | 2 + coders/histogram.h | 2 + coders/hrz.h | 2 + coders/html.h | 4 + coders/icon.h | 4 + coders/info.h | 2 + coders/inline.h | 3 + coders/ipl.h | 2 + coders/jbig.h | 4 + coders/jnx.h | 2 + coders/jp2.h | 7 ++ coders/jpeg.h | 6 ++ coders/json.h | 2 + coders/label.h | 2 + coders/mac.h | 2 + coders/magick.h | 8 ++ coders/map.h | 2 + coders/mask.h | 2 + coders/mat.h | 2 + coders/matte.h | 2 + coders/meta.h | 14 ++++ coders/miff.h | 2 + coders/mono.h | 2 + coders/mpc.h | 3 + coders/mpeg.h | 12 +++ coders/mpr.h | 3 + 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 | 2 + coders/pcx.h | 3 + coders/pdb.h | 2 + coders/pdf.h | 5 ++ coders/pes.h | 2 + coders/pgx.h | 2 + coders/pict.h | 3 + coders/pix.h | 2 + coders/plasma.h | 3 + coders/png.h | 10 +++ coders/pnm.h | 7 ++ coders/ps.h | 6 ++ coders/ps2.h | 3 + coders/ps3.h | 3 + coders/psd.h | 3 + coders/pwp.h | 2 + coders/raw.h | 11 +++ coders/rgb.h | 4 + coders/rgf.h | 2 + coders/rla.h | 2 + coders/rle.h | 2 + coders/scr.h | 2 + coders/screenshot.h | 2 + coders/sct.h | 2 + coders/sfw.h | 2 + coders/sgi.h | 2 + coders/sixel.h | 3 + coders/stegano.h | 2 + coders/sun.h | 3 + coders/svg.h | 4 + coders/tga.h | 5 ++ coders/thumbnail.h | 2 + coders/tiff.h | 6 ++ coders/tile.h | 2 + coders/tim.h | 2 + coders/ttf.h | 7 ++ coders/txt.h | 4 + coders/uil.h | 2 + coders/url.h | 6 ++ coders/uyvy.h | 3 + coders/vicar.h | 2 + coders/vid.h | 2 + coders/viff.h | 3 + coders/vips.h | 2 + coders/wbmp.h | 2 + coders/webp.h | 2 + coders/wmf.h | 2 + coders/wpg.h | 2 + coders/x.h | 2 + coders/xbm.h | 2 + coders/xc.h | 3 + coders/xcf.h | 2 + coders/xpm.h | 4 + coders/xps.h | 2 + coders/xtrn.h | 3 + coders/xwd.h | 2 + coders/ycbcr.h | 3 + coders/yuv.h | 2 + 130 files changed, 423 insertions(+), 175 deletions(-) diff --git a/MagickCore/coder.c b/MagickCore/coder.c index e190b422e..fb3d62a94 100644 --- a/MagickCore/coder.c +++ b/MagickCore/coder.c @@ -61,6 +61,12 @@ #include "MagickCore/utility-private.h" #include "MagickCore/xml-tree.h" #include "MagickCore/xml-tree-private.h" +#include "coders/coders.h" + +/* + Define declarations. +*/ +#define AddMagickCoder(coder) Magick ## coder ## Aliases /* Typedef declarations. @@ -78,181 +84,7 @@ typedef struct _CoderMapInfo static const CoderMapInfo CoderMap[] = { - { "3FR", "DNG" }, - { "3GP", "MPEG" }, - { "3G2", "MPEG" }, - { "8BIMTEXT", "META" }, - { "8BIMWTEXT", "META" }, - { "AFM", "TTF" }, - { "A", "RAW" }, - { "AI", "PDF" }, - { "APP1JPEG", "META" }, - { "APP1", "META" }, - { "ARW", "DNG" }, - { "AVI", "MPEG" }, - { "BIE", "JBIG" }, - { "BMP2", "BMP" }, - { "BMP3", "BMP" }, - { "B", "RAW" }, - { "BRF", "BRAILLE" }, - { "BGRA", "BGR" }, - { "BGRO", "BGR" }, - { "CMYKA", "CMYK" }, - { "C", "RAW" }, - { "CAL", "CALS" }, - { "CANVAS", "XC" }, - { "CMYKA", "CMYK" }, - { "CR2", "DNG" }, - { "CRW", "DNG" }, - { "CUR", "ICON" }, - { "DATA", "INLINE" }, - { "DCR", "DNG" }, - { "DCX", "PCX" }, - { "DFONT", "TTF" }, - { "DXT1", "DDS" }, - { "DXT5", "DDS" }, - { "EPDF", "PDF" }, - { "EPI", "PS" }, - { "EPS2", "PS2" }, - { "EPS3", "PS3" }, - { "EPSF", "PS" }, - { "EPSI", "PS" }, - { "EPS", "PS" }, - { "EPT2", "EPT" }, - { "EPT3", "EPT" }, - { "ERF", "DNG" }, - { "EXIF", "META" }, - { "FILE", "URL" }, - { "FRACTAL", "PLASMA" }, - { "FTP", "URL" }, - { "FTS", "FITS" }, - { "G3", "FAX" }, - { "G4", "FAX" }, - { "GIF87", "GIF" }, - { "G", "RAW" }, - { "GRANITE", "MAGICK" }, - { "GRAYA", "GRAY" }, - { "GROUP4", "TIFF" }, - { "GV", "DOT" }, - { "HTM", "HTML" }, - { "ICB", "TGA" }, - { "ICO", "ICON" }, - { "ICODIB", "DIB" }, - { "IIQ", "DNG" }, - { "K25", "DNG" }, - { "KDC", "DNG" }, - { "H", "MAGICK" }, - { "HTM", "HTML" }, - { "HTTP", "URL" }, - { "HTTPS", "URL" }, - { "ICB", "TGA" }, - { "ICC", "META" }, - { "ICM", "META" }, - { "ICO", "ICON" }, - { "IMPLICIT", "***" }, - { "IPTC", "META" }, - { "IPTCTEXT", "META" }, - { "IPTCWTEXT", "META" }, - { "ISOBRL", "BRAILLE" }, - { "ISOBRL6", "BRAILLE" }, - { "JBG", "JBIG" }, - { "JNG", "PNG" }, - { "JPC", "JP2" }, - { "JPT", "JP2" }, - { "JPM", "JP2" }, - { "J2C", "JP2" }, - { "J2K", "JP2" }, - { "JNG", "PNG" }, - { "JPE", "JPEG" }, - { "JPG", "JPEG" }, - { "JPM", "JP2" }, - { "JPS", "JPEG" }, - { "JPT", "JP2" }, - { "JPX", "JP2" }, - { "K", "RAW" }, - { "K25", "DNG" }, - { "KDC", "DNG" }, - { "LOGO", "MAGICK" }, - { "M", "RAW" }, - { "M2V", "MPEG" }, - { "M4V", "MPEG" }, - { "MEF", "DNG" }, - { "MKV", "MPEG" }, - { "MNG", "PNG" }, - { "MOV", "MPEG" }, - { "MP4", "MPEG" }, - { "MPG", "MPEG" }, - { "MPRI", "MPR" }, - { "MEF", "DNG" }, - { "MRW", "DNG" }, - { "MSVG", "SVG" }, - { "NEF", "DNG" }, - { "NETSCAPE", "MAGICK" }, - { "NRW", "DNG" }, - { "O", "RAW" }, - { "ORF", "DNG" }, - { "OTF", "TTF" }, - { "P7", "PNM" }, - { "PAL", "UYVY" }, - { "PAM", "PNM" }, - { "PBM", "PNM" }, - { "PCDS", "PCD" }, - { "PCT", "PICT" }, - { "PDFA", "PDF" }, - { "PEF", "DNG" }, - { "PEF", "DNG" }, - { "PFA", "TTF" }, - { "PFB", "TTF" }, - { "PFM", "PNM" }, - { "PGM", "PNM" }, - { "PICON", "XPM" }, - { "PJPEG", "JPEG" }, - { "PM", "XPM" }, - { "PNG00", "PNG" }, - { "PNG24", "PNG" }, - { "PNG32", "PNG" }, - { "PNG48", "PNG" }, - { "PNG64", "PNG" }, - { "PNG8", "PNG" }, - { "PPM", "PNM" }, - { "PSB", "PSD" }, - { "PTIF", "TIFF" }, - { "R", "RAW" }, - { "RADIAL-GRADIENT", "GRADIENT" }, - { "RAF", "DNG" }, - { "RAS", "SUN" }, - { "RAW", "DNG" }, - { "RGBA", "RGB" }, - { "RGBO", "RGB" }, - { "RMF", "DNG" }, - { "ROSE", "MAGICK" }, - { "RW2", "DNG" }, - { "SHTML", "HTML" }, - { "SIX", "SIXEL" }, - { "SPARSE-COLOR", "TXT" }, - { "SR2", "DNG" }, - { "SRF", "DNG" }, - { "SVGZ", "SVG" }, - { "TEXT", "TXT" }, - { "TIFF64", "TIFF" }, - { "TIF", "TIFF" }, - { "TTC", "TTF" }, - { "UBRL", "BRAILLE" }, - { "UBRL6", "BRAILLE" }, - { "VDA", "TGA" }, - { "VST", "TGA" }, - { "WIZARD", "MAGICK" }, -#if defined(MAGICKCORE_WINGDI32_DELEGATE) - { "WMF", "EMF" }, -#endif - { "WMV", "MPEG" }, - { "WMZ", "WMF" }, - { "X3f", "DNG" }, - { "XMP", "META" }, - { "XTRNARRAY", "XTRN" }, - { "XV", "VIFF" }, - { "Y", "RAW" }, - { "YCbCrA", "YCbCr" } + #include "coders/coders-list.h" }; static SemaphoreInfo diff --git a/coders/aai.h b/coders/aai.h index 3df7122aa..ea33970fb 100644 --- a/coders/aai.h +++ b/coders/aai.h @@ -18,6 +18,8 @@ #define MagickAAIHeaders +#define MagickAAIAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/art.h b/coders/art.h index 64a01d44a..b02f7745d 100644 --- a/coders/art.h +++ b/coders/art.h @@ -18,6 +18,8 @@ #define MagickARTHeaders +#define MagickARTAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/avs.h b/coders/avs.h index 6ba6ccacd..89ca81e2a 100644 --- a/coders/avs.h +++ b/coders/avs.h @@ -18,6 +18,8 @@ #define MagickAVSHeaders +#define MagickAVSAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/bgr.h b/coders/bgr.h index 744eedfee..5f8ff2270 100644 --- a/coders/bgr.h +++ b/coders/bgr.h @@ -18,6 +18,10 @@ #define MagickBGRHeaders +#define MagickBGRAliases \ + MagickCoderAlias("BGR", "BGRA") \ + MagickCoderAlias("BGR", "BGRO") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/bmp.h b/coders/bmp.h index f6e8f1533..0a8fed3d9 100644 --- a/coders/bmp.h +++ b/coders/bmp.h @@ -24,6 +24,10 @@ MagickCoderHeader("BMP", 0, "IC") \ MagickCoderHeader("BMP", 0, "IP") +#define MagickBMPAliases \ + MagickCoderAlias("BMP", "BMP2") \ + MagickCoderAlias("BMP", "BMP3") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/braille.h b/coders/braille.h index 456b8420f..65ca7c57f 100644 --- a/coders/braille.h +++ b/coders/braille.h @@ -18,6 +18,13 @@ #define MagickBRAILLEHeaders +#define MagickBRAILLEAliases \ + MagickCoderAlias("BRAILLE", "BRF") \ + MagickCoderAlias("BRAILLE", "UBRL") \ + MagickCoderAlias("BRAILLE", "UBRL6") \ + MagickCoderAlias("BRAILLE", "ISOBRL") \ + MagickCoderAlias("BRAILLE", "ISOBRL6") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/cals.h b/coders/cals.h index 8d12b3ab7..d18216d81 100644 --- a/coders/cals.h +++ b/coders/cals.h @@ -22,6 +22,9 @@ MagickCoderHeader("CALS", 9, "rorient:") \ MagickCoderHeader("CALS", 21, "version: MIL-STD-1840") +#define MagickCALSAliases \ + MagickCoderAlias("CALS", "CAL") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/caption.h b/coders/caption.h index bcbcb5298..24c7dd443 100644 --- a/coders/caption.h +++ b/coders/caption.h @@ -18,6 +18,8 @@ #define MagickCAPTIONHeaders +#define MagickCAPTIONAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/cin.h b/coders/cin.h index c972de8cb..0886d5a6a 100644 --- a/coders/cin.h +++ b/coders/cin.h @@ -19,6 +19,8 @@ #define MagickCINHeaders \ MagickCoderHeader("CIN", 0, "\200\052\137\327") +#define MagickCINAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/cip.h b/coders/cip.h index dfc8737b1..a86c80e8e 100644 --- a/coders/cip.h +++ b/coders/cip.h @@ -18,6 +18,8 @@ #define MagickCIPHeaders +#define MagickCIPAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/clip.h b/coders/clip.h index 5536ccacb..a4d14a38e 100644 --- a/coders/clip.h +++ b/coders/clip.h @@ -18,6 +18,8 @@ #define MagickCLIPHeaders +#define MagickCLIPAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/clipboard.h b/coders/clipboard.h index bff211dca..a6070a19b 100644 --- a/coders/clipboard.h +++ b/coders/clipboard.h @@ -18,6 +18,8 @@ #define MagickCLIPBOARDHeaders +#define MagickCLIPBOARDAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/cmyk.h b/coders/cmyk.h index 3558adee8..d163e69b2 100644 --- a/coders/cmyk.h +++ b/coders/cmyk.h @@ -18,6 +18,9 @@ #define MagickCMYKHeaders +#define MagickCMYKAliases \ + MagickCoderAlias("CMYK", "CMYKA") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/coders-private.h b/coders/coders-private.h index e13c2cd54..1af760877 100644 --- a/coders/coders-private.h +++ b/coders/coders-private.h @@ -19,6 +19,8 @@ #define MagickCoderHeader(coder,offset,magic) { coder, offset, \ (const unsigned char *) (magic), sizeof(magic)-1 }, +#define MagickCoderAlias(coder,alias) { coder, alias }, + #define MagickCoderExports(coder) \ extern ModuleExport size_t \ Register ## coder ## Image(void); \ diff --git a/coders/cut.h b/coders/cut.h index 28504da34..8d2fb416a 100644 --- a/coders/cut.h +++ b/coders/cut.h @@ -18,6 +18,8 @@ #define MagickCUTHeaders +#define MagickCUTAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/dcm.h b/coders/dcm.h index 037b6d50c..c42521a46 100644 --- a/coders/dcm.h +++ b/coders/dcm.h @@ -19,6 +19,8 @@ #define MagickDCMHeaders \ MagickCoderHeader("DCM", 128, "DICM") +#define MagickDCMAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/dds.h b/coders/dds.h index add2f47b0..4db1fb3c2 100644 --- a/coders/dds.h +++ b/coders/dds.h @@ -19,6 +19,8 @@ #define MagickDDSHeaders \ MagickCoderHeader("DDS", 0, "DDS ") +#define MagickDDSAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/debug.h b/coders/debug.h index 73d795365..a2a613c3d 100644 --- a/coders/debug.h +++ b/coders/debug.h @@ -18,6 +18,8 @@ #define MagickDEBUGHeaders +#define MagickDEBUGAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/dib.h b/coders/dib.h index 3f132c1ad..57a892a4c 100644 --- a/coders/dib.h +++ b/coders/dib.h @@ -19,6 +19,9 @@ #define MagickDIBHeaders \ MagickCoderHeader("DIB", 0, "\050\000") +#define MagickDIBAliases \ + MagickCoderAlias("DIB", "ICODIB") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/djvu.h b/coders/djvu.h index 02620c5c7..dca142eaa 100644 --- a/coders/djvu.h +++ b/coders/djvu.h @@ -19,6 +19,8 @@ #define MagickDJVUHeaders \ MagickCoderHeader("DJVU", 0, "AT&TFORM") +#define MagickDJVUAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/dng.h b/coders/dng.h index e42dc68de..b47cfc1f3 100644 --- a/coders/dng.h +++ b/coders/dng.h @@ -22,6 +22,31 @@ MagickCoderHeader("MRW", 0, "\x00MRM") \ MagickCoderHeader("RAF", 0, "FUJIFILMCCD-RAW ") +#define MagickDNGAliases \ + MagickCoderAlias("DNG", "3FR") \ + MagickCoderAlias("DNG", "ARW") \ + MagickCoderAlias("DNG", "CR2") \ + MagickCoderAlias("DNG", "CRW") \ + MagickCoderAlias("DNG", "DCR") \ + MagickCoderAlias("DNG", "DCRAW") \ + MagickCoderAlias("DNG", "ERF") \ + MagickCoderAlias("DNG", "IIQ") \ + MagickCoderAlias("DNG", "KDC") \ + MagickCoderAlias("DNG", "K25") \ + MagickCoderAlias("DNG", "MEF") \ + MagickCoderAlias("DNG", "MRW") \ + MagickCoderAlias("DNG", "NEF") \ + MagickCoderAlias("DNG", "NRW") \ + MagickCoderAlias("DNG", "ORF") \ + MagickCoderAlias("DNG", "PEF") \ + MagickCoderAlias("DNG", "RAF") \ + MagickCoderAlias("DNG", "RAW") \ + MagickCoderAlias("DNG", "RMF") \ + MagickCoderAlias("DNG", "RW2") \ + MagickCoderAlias("DNG", "SRF") \ + MagickCoderAlias("DNG", "SR2") \ + MagickCoderAlias("DNG", "X3F") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/dot.h b/coders/dot.h index 8ffdf7a62..fad5e8c76 100644 --- a/coders/dot.h +++ b/coders/dot.h @@ -19,6 +19,9 @@ #define MagickDOTHeaders \ MagickCoderHeader("DOT", 0, "digraph") +#define MagickDOTAliases \ + MagickCoderAlias("DOT", "GV") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/dps.h b/coders/dps.h index 2b5f5f7cf..d6049fb07 100644 --- a/coders/dps.h +++ b/coders/dps.h @@ -18,6 +18,8 @@ #define MagickDPSHeaders +#define MagickDPSAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/dpx.h b/coders/dpx.h index 4eac24aa6..b29e4efec 100644 --- a/coders/dpx.h +++ b/coders/dpx.h @@ -20,6 +20,8 @@ MagickCoderHeader("DPX", 0, "SDPX") \ MagickCoderHeader("DPX", 0, "XPDS") +#define MagickDPXAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/emf.h b/coders/emf.h index 643b7cdb1..915a58747 100644 --- a/coders/emf.h +++ b/coders/emf.h @@ -21,6 +21,9 @@ MagickCoderHeader("WMF", 0, "\327\315\306\232") \ MagickCoderHeader("WMF", 0, "\001\000\011\000") +#define MagickEMFAliases \ + MagickCoderAlias("EMF", "WMF") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/ept.h b/coders/ept.h index d32390ae6..9fd16a3b9 100644 --- a/coders/ept.h +++ b/coders/ept.h @@ -19,6 +19,10 @@ #define MagickEPTHeaders \ MagickCoderHeader("EPT", 0, "\305\320\323\306") +#define MagickEPTAliases \ + MagickCoderAlias("EPT", "EPT2") \ + MagickCoderAlias("EPT", "EPT3") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/exr.h b/coders/exr.h index f083ce938..c60ef1c95 100644 --- a/coders/exr.h +++ b/coders/exr.h @@ -19,6 +19,8 @@ #define MagickEXRHeaders \ MagickCoderHeader("EXR", 0, "\166\057\061\001") +#define MagickEXRAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/fax.h b/coders/fax.h index de7e27142..f6e798476 100644 --- a/coders/fax.h +++ b/coders/fax.h @@ -19,6 +19,10 @@ #define MagickFAXHeaders \ MagickCoderHeader("FAX", 0, "DFAX") +#define MagickFAXAliases \ + MagickCoderAlias("FAX", "G3") \ + MagickCoderAlias("FAX", "G4") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/fits.h b/coders/fits.h index d8c9027f4..d8101cfb2 100644 --- a/coders/fits.h +++ b/coders/fits.h @@ -20,6 +20,9 @@ MagickCoderHeader("FITS", 0, "IT0") \ MagickCoderHeader("FITS", 0, "SIMPLE") +#define MagickFITSAliases \ + MagickCoderAlias("FITS", "FTS") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/flif.h b/coders/flif.h index d5d09128d..a970cab69 100644 --- a/coders/flif.h +++ b/coders/flif.h @@ -19,6 +19,8 @@ #define MagickFLIFHeaders \ MagickCoderHeader("FLIF", 0, "FLIF") +#define MagickFLIFAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/fpx.h b/coders/fpx.h index 0b3623e47..e3586acab 100644 --- a/coders/fpx.h +++ b/coders/fpx.h @@ -18,6 +18,8 @@ #define MagickFPXHeaders +#define MagickFPXAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/gif.h b/coders/gif.h index 733d3fbd2..8d9723c12 100644 --- a/coders/gif.h +++ b/coders/gif.h @@ -19,6 +19,9 @@ #define MagickGIFHeaders \ MagickCoderHeader("GIF", 0, "GIF8") +#define MagickGIFAliases \ + MagickCoderAlias("GIF", "GIF87") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/gradient.h b/coders/gradient.h index 14673f2a2..ef91e403c 100644 --- a/coders/gradient.h +++ b/coders/gradient.h @@ -18,6 +18,9 @@ #define MagickGRADIENTHeaders +#define MagickGRADIENTAliases \ + MagickCoderAlias("GRADIENT", "RADIAL-GRADIENT") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/gray.h b/coders/gray.h index c94b7fc28..30cb18fc2 100644 --- a/coders/gray.h +++ b/coders/gray.h @@ -18,6 +18,9 @@ #define MagickGRAYHeaders +#define MagickGRAYAliases \ + MagickCoderAlias("GRAY", "GRAYA") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/hald.h b/coders/hald.h index 2bd5228c6..dcaac8af4 100644 --- a/coders/hald.h +++ b/coders/hald.h @@ -18,6 +18,8 @@ #define MagickHALDHeaders +#define MagickHALDAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/hdr.h b/coders/hdr.h index a72059dbd..1a398b283 100644 --- a/coders/hdr.h +++ b/coders/hdr.h @@ -20,6 +20,8 @@ MagickCoderHeader("HDR", 0, "#?RADIANCE") \ MagickCoderHeader("HDR", 0, "#?RGBE") +#define MagickHDRAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/heic.h b/coders/heic.h index bd6869e2f..1e778254b 100644 --- a/coders/heic.h +++ b/coders/heic.h @@ -21,6 +21,8 @@ MagickCoderHeader("HEIC", 4, "ftypheix") \ MagickCoderHeader("HEIC", 4, "ftypmif1") +#define MagickHEICAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/histogram.h b/coders/histogram.h index ac29c2700..fbbe24434 100644 --- a/coders/histogram.h +++ b/coders/histogram.h @@ -18,6 +18,8 @@ #define MagickHISTOGRAMHeaders +#define MagickHISTOGRAMAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/hrz.h b/coders/hrz.h index 44e6dc21c..4ea3181fa 100644 --- a/coders/hrz.h +++ b/coders/hrz.h @@ -18,6 +18,8 @@ #define MagickHRZHeaders +#define MagickHRZAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/html.h b/coders/html.h index 753576cbd..5ada00592 100644 --- a/coders/html.h +++ b/coders/html.h @@ -18,6 +18,10 @@ #define MagickHTMLHeaders +#define MagickHTMLAliases \ + MagickCoderAlias("HTML", "HTM") \ + MagickCoderAlias("HTML", "SHTML") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/icon.h b/coders/icon.h index 96f48c685..246d0917c 100644 --- a/coders/icon.h +++ b/coders/icon.h @@ -18,6 +18,10 @@ #define MagickICONHeaders +#define MagickICONAliases \ + MagickCoderAlias("ICON", "CUR") \ + MagickCoderAlias("ICON", "ICO") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/info.h b/coders/info.h index cc8f362a1..95b3677ec 100644 --- a/coders/info.h +++ b/coders/info.h @@ -18,6 +18,8 @@ #define MagickINFOHeaders +#define MagickINFOAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/inline.h b/coders/inline.h index 45c5efa83..efaa58355 100644 --- a/coders/inline.h +++ b/coders/inline.h @@ -18,6 +18,9 @@ #define MagickINLINEHeaders +#define MagickINLINEAliases \ + MagickCoderAlias("DATA", "INLINE") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/ipl.h b/coders/ipl.h index 57c3821df..7c35bb1ae 100644 --- a/coders/ipl.h +++ b/coders/ipl.h @@ -19,6 +19,8 @@ #define MagickIPLHeaders \ MagickCoderHeader("IPL", 0, "data") +#define MagickIPLAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/jbig.h b/coders/jbig.h index b82dcb2cd..43e1a6873 100644 --- a/coders/jbig.h +++ b/coders/jbig.h @@ -18,6 +18,10 @@ #define MagickJBIGHeaders +#define MagickJBIGAliases \ + MagickCoderAlias("JBIG", "BIE") \ + MagickCoderAlias("JBIG", "JBG") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/jnx.h b/coders/jnx.h index eabf12b96..a7c74993d 100644 --- a/coders/jnx.h +++ b/coders/jnx.h @@ -18,6 +18,8 @@ #define MagickJNXHeaders +#define MagickJNXAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/jp2.h b/coders/jp2.h index fa15b2cab..52c4a272a 100644 --- a/coders/jp2.h +++ b/coders/jp2.h @@ -21,6 +21,13 @@ MagickCoderHeader("JPC", 0, "\x0d\x0a\x87\x0a") \ MagickCoderHeader("J2K", 0, "\xff\x4f\xff\x51") +#define MagickJP2Aliases \ + MagickCoderAlias("JP2", "J2C") \ + MagickCoderAlias("JP2", "J2K") \ + MagickCoderAlias("JP2", "JPM") \ + MagickCoderAlias("JP2", "JPT") \ + MagickCoderAlias("JP2", "JPC") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/jpeg.h b/coders/jpeg.h index ac1f2ab00..f50cbac6a 100644 --- a/coders/jpeg.h +++ b/coders/jpeg.h @@ -19,6 +19,12 @@ #define MagickJPEGHeaders \ MagickCoderHeader("JPEG", 0, "\377\330\377") +#define MagickJPEGAliases \ + MagickCoderAlias("JPEG", "JPE") \ + MagickCoderAlias("JPEG", "JPG") \ + MagickCoderAlias("JPEG", "JPS") \ + MagickCoderAlias("JPEG", "PJPEG") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/json.h b/coders/json.h index dbd7c0f4f..92193a5e7 100644 --- a/coders/json.h +++ b/coders/json.h @@ -18,6 +18,8 @@ #define MagickJSONHeaders +#define MagickJSONAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/label.h b/coders/label.h index 85d36b2e0..61e71335c 100644 --- a/coders/label.h +++ b/coders/label.h @@ -18,6 +18,8 @@ #define MagickLABELHeaders +#define MagickLABELAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/mac.h b/coders/mac.h index 21a783756..acf81c653 100644 --- a/coders/mac.h +++ b/coders/mac.h @@ -18,6 +18,8 @@ #define MagickMACHeaders +#define MagickMACAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/magick.h b/coders/magick.h index 871443d6b..0848ecf70 100644 --- a/coders/magick.h +++ b/coders/magick.h @@ -18,6 +18,14 @@ #define MagickMAGICKHeaders +#define MagickMAGICKAliases \ + MagickCoderAlias("MAGICK", "GRANITE") \ + MagickCoderAlias("MAGICK", "H") \ + MagickCoderAlias("MAGICK", "LOGO") \ + MagickCoderAlias("MAGICK", "NETSCAPE") \ + MagickCoderAlias("MAGICK", "ROSE") \ + MagickCoderAlias("MAGICK", "WIZARD") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/map.h b/coders/map.h index 2cae3f673..2cf801cf0 100644 --- a/coders/map.h +++ b/coders/map.h @@ -18,6 +18,8 @@ #define MagickMAPHeaders +#define MagickMAPAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/mask.h b/coders/mask.h index eb246a4c5..46f082875 100644 --- a/coders/mask.h +++ b/coders/mask.h @@ -18,6 +18,8 @@ #define MagickMASKHeaders +#define MagickMASKAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/mat.h b/coders/mat.h index 64297f152..13b06685e 100644 --- a/coders/mat.h +++ b/coders/mat.h @@ -19,6 +19,8 @@ #define MagickMATHeaders \ MagickCoderHeader("MAT", 0, "MATLAB 5.0 MAT-file,") +#define MagickMATAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/matte.h b/coders/matte.h index e7685b415..66ef2c25c 100644 --- a/coders/matte.h +++ b/coders/matte.h @@ -18,6 +18,8 @@ #define MagickMATTEHeaders +#define MagickMATTEAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/meta.h b/coders/meta.h index 3ebc538e5..db8d5b79c 100644 --- a/coders/meta.h +++ b/coders/meta.h @@ -24,6 +24,20 @@ MagickCoderHeader("IPTCTEXT", 0, "2#0=\042�\042") \ MagickCoderHeader("IPTC", 0, "\034\002") +#define MagickMETAAliases \ + MagickCoderAlias("META", "8BIM") \ + MagickCoderAlias("META", "8BIMTEXT") \ + MagickCoderAlias("META", "8BIMWTEXT") \ + MagickCoderAlias("META", "APP1") \ + MagickCoderAlias("META", "APP1JPEG") \ + MagickCoderAlias("META", "EXIF") \ + MagickCoderAlias("META", "XMP") \ + MagickCoderAlias("META", "ICM") \ + MagickCoderAlias("META", "ICC") \ + MagickCoderAlias("META", "IPTC") \ + MagickCoderAlias("META", "IPTCTEXT") \ + MagickCoderAlias("META", "IPTCWTEXT") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/miff.h b/coders/miff.h index 0bb37159b..81d35e9a2 100644 --- a/coders/miff.h +++ b/coders/miff.h @@ -20,6 +20,8 @@ MagickCoderHeader("MIFF", 0, "Id=ImageMagick") \ MagickCoderHeader("MIFF", 0, "id=ImageMagick") +#define MagickMIFFAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/mono.h b/coders/mono.h index e5d5a7aa9..1a3fb4c8c 100644 --- a/coders/mono.h +++ b/coders/mono.h @@ -18,6 +18,8 @@ #define MagickMONOHeaders +#define MagickMONOAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/mpc.h b/coders/mpc.h index 29bb2a8dc..fc45f4d77 100644 --- a/coders/mpc.h +++ b/coders/mpc.h @@ -19,6 +19,9 @@ #define MagickMPCHeaders \ MagickCoderHeader("MPC", 0, "id=MagickCache") +#define MagickMPCAliases \ + MagickCoderAlias("MPC", "CACHE") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/mpeg.h b/coders/mpeg.h index 9f676c12f..b83f67db6 100644 --- a/coders/mpeg.h +++ b/coders/mpeg.h @@ -20,6 +20,18 @@ MagickCoderHeader("MPEG", 0, "\000\000\001\263") \ MagickCoderHeader("MPEG", 0, "RIFF") +#define MagickMPEGAliases \ + MagickCoderAlias("MPEG", "3GP") \ + MagickCoderAlias("MPEG", "3G2") \ + MagickCoderAlias("MPEG", "AVI") \ + MagickCoderAlias("MPEG", "MKV") \ + MagickCoderAlias("MPEG", "MOV") \ + MagickCoderAlias("MPEG", "MPG") \ + MagickCoderAlias("MPEG", "MP4") \ + MagickCoderAlias("MPEG", "M2V") \ + MagickCoderAlias("MPEG", "M4V") \ + MagickCoderAlias("MPEG", "WMV") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/mpr.h b/coders/mpr.h index ed10ecc59..7a3d1dd48 100644 --- a/coders/mpr.h +++ b/coders/mpr.h @@ -18,6 +18,9 @@ #define MagickMPRHeaders +#define MagickMPRAliases \ + MagickCoderAlias("MPR", "MPRI") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/msl.h b/coders/msl.h index 82a8e8a31..bad4436eb 100644 --- a/coders/msl.h +++ b/coders/msl.h @@ -18,6 +18,8 @@ #define MagickMSLHeaders +#define MagickMSLAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/mtv.h b/coders/mtv.h index f1ded1e7a..223de909e 100644 --- a/coders/mtv.h +++ b/coders/mtv.h @@ -18,6 +18,8 @@ #define MagickMTVHeaders +#define MagickMTVAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/mvg.h b/coders/mvg.h index a7acbabcf..98d49d0a2 100644 --- a/coders/mvg.h +++ b/coders/mvg.h @@ -18,6 +18,8 @@ #define MagickMVGHeaders +#define MagickMVGAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/null.h b/coders/null.h index 06063b495..cf177dfb9 100644 --- a/coders/null.h +++ b/coders/null.h @@ -18,6 +18,8 @@ #define MagickNULLHeaders +#define MagickNULLAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/otb.h b/coders/otb.h index 94f6643e5..203c9b350 100644 --- a/coders/otb.h +++ b/coders/otb.h @@ -18,6 +18,8 @@ #define MagickOTBHeaders +#define MagickOTBAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/palm.h b/coders/palm.h index 979f77c9a..672603ae1 100644 --- a/coders/palm.h +++ b/coders/palm.h @@ -18,6 +18,8 @@ #define MagickPALMHeaders +#define MagickPALMAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/pango.h b/coders/pango.h index 85a0fcb7b..50731205e 100644 --- a/coders/pango.h +++ b/coders/pango.h @@ -18,6 +18,8 @@ #define MagickPANGOHeaders +#define MagickPANGOAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/pattern.h b/coders/pattern.h index d9f1ace12..c04ca2d7f 100644 --- a/coders/pattern.h +++ b/coders/pattern.h @@ -18,6 +18,8 @@ #define MagickPATTERNHeaders +#define MagickPATTERNAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/pcd.h b/coders/pcd.h index 3b6741c07..f9d4075ec 100644 --- a/coders/pcd.h +++ b/coders/pcd.h @@ -19,6 +19,9 @@ #define MagickPCDHeaders \ MagickCoderHeader("PCD", 2048, "PCD_") +#define MagickPCDAliases \ + MagickCoderAlias("PCD", "PCDS") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/pcl.h b/coders/pcl.h index 5211030c7..d9ce5cc48 100644 --- a/coders/pcl.h +++ b/coders/pcl.h @@ -20,6 +20,8 @@ MagickCoderHeader("PCL", 0, "\033E\033") +#define MagickPCLAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/pcx.h b/coders/pcx.h index d76712bba..6a4e24936 100644 --- a/coders/pcx.h +++ b/coders/pcx.h @@ -21,6 +21,9 @@ MagickCoderHeader("PCX", 0, "\012\005") \ MagickCoderHeader("DCX", 0, "\261\150\336\72") +#define MagickPCXAliases \ + MagickCoderAlias("PCX", "DCX") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/pdb.h b/coders/pdb.h index 21f8b316a..5c0c487c7 100644 --- a/coders/pdb.h +++ b/coders/pdb.h @@ -19,6 +19,8 @@ #define MagickPDBHeaders \ MagickCoderHeader("PDB", 60, "vIMGView") +#define MagickPDBAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/pdf.h b/coders/pdf.h index a88e6fc00..706615dba 100644 --- a/coders/pdf.h +++ b/coders/pdf.h @@ -19,6 +19,11 @@ #define MagickPDFHeaders \ MagickCoderHeader("PDF", 0, "%PDF-") +#define MagickPDFAliases \ + MagickCoderAlias("PDF", "AI") \ + MagickCoderAlias("PDF", "EPDF") \ + MagickCoderAlias("PDF", "PDFA") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/pes.h b/coders/pes.h index 2a8649bd9..5794a7742 100644 --- a/coders/pes.h +++ b/coders/pes.h @@ -19,6 +19,8 @@ #define MagickPESHeaders \ MagickCoderHeader("PES", 0, "#PES") +#define MagickPESAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/pgx.h b/coders/pgx.h index 7d726108b..0e3195909 100644 --- a/coders/pgx.h +++ b/coders/pgx.h @@ -21,6 +21,8 @@ MagickCoderHeader("PGX", 0, "PG ML") \ MagickCoderHeader("PGX", 0, "PG LM") +#define MagickPGXAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/pict.h b/coders/pict.h index a2fa0388f..820e4b186 100644 --- a/coders/pict.h +++ b/coders/pict.h @@ -18,6 +18,9 @@ #define MagickPICTHeaders +#define MagickPICTAliases \ + MagickCoderAlias("PICT", "PCT") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/pix.h b/coders/pix.h index 2faa0ce10..3d63afc55 100644 --- a/coders/pix.h +++ b/coders/pix.h @@ -18,6 +18,8 @@ #define MagickPIXHeaders +#define MagickPIXAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/plasma.h b/coders/plasma.h index 4f1153b7e..d78c56292 100644 --- a/coders/plasma.h +++ b/coders/plasma.h @@ -18,6 +18,9 @@ #define MagickPLASMAHeaders +#define MagickPLASMAAliases \ + MagickCoderAlias("PLASMA", "FRACTAL") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/png.h b/coders/png.h index a89cac8c4..be700db23 100644 --- a/coders/png.h +++ b/coders/png.h @@ -21,6 +21,16 @@ MagickCoderHeader("JNG", 0, "\213JNG\r\n\032\n") \ MagickCoderHeader("MNG", 0, "\212MNG\r\n\032\n") +#define MagickPNGAliases \ + MagickCoderAlias("PNG", "MNG") \ + MagickCoderAlias("PNG", "PNG8") \ + MagickCoderAlias("PNG", "PNG24") \ + MagickCoderAlias("PNG", "PNG32") \ + MagickCoderAlias("PNG", "PNG48") \ + MagickCoderAlias("PNG", "PNG64") \ + MagickCoderAlias("PNG", "PNG00") \ + MagickCoderAlias("PNG", "JNG") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/pnm.h b/coders/pnm.h index 6f48d8810..6f7a05725 100644 --- a/coders/pnm.h +++ b/coders/pnm.h @@ -27,6 +27,13 @@ MagickCoderHeader("PFM", 0, "PF") \ MagickCoderHeader("PFM", 0, "Pf") +#define MagickPNMAliases \ + MagickCoderAlias("PNM", "PAM") \ + MagickCoderAlias("PNM", "PBM") \ + MagickCoderAlias("PNM", "PFM") \ + MagickCoderAlias("PNM", "PGM") \ + MagickCoderAlias("PNM", "PPM") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/ps.h b/coders/ps.h index f01e4a7d8..4ac1b1435 100644 --- a/coders/ps.h +++ b/coders/ps.h @@ -21,6 +21,12 @@ MagickCoderHeader("PS", 0, "\004%!") \ MagickCoderHeader("PS", 0, "\305\320\323\306") +#define MagickPSAliases \ + MagickCoderAlias("PS", "EPI") \ + MagickCoderAlias("PS", "EPS") \ + MagickCoderAlias("PS", "EPSF") \ + MagickCoderAlias("PS", "EPSI") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/ps2.h b/coders/ps2.h index 6728a6690..d16cf87e6 100644 --- a/coders/ps2.h +++ b/coders/ps2.h @@ -18,6 +18,9 @@ #define MagickPS2Headers +#define MagickPS2Aliases \ + MagickCoderAlias("PS2", "EPS2") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/ps3.h b/coders/ps3.h index 13c2260a1..7bbb98844 100644 --- a/coders/ps3.h +++ b/coders/ps3.h @@ -18,6 +18,9 @@ #define MagickPS3Headers +#define MagickPS3Aliases \ + MagickCoderAlias("PS3", "EPS3") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/psd.h b/coders/psd.h index 052279a27..bce180174 100644 --- a/coders/psd.h +++ b/coders/psd.h @@ -20,6 +20,9 @@ MagickCoderHeader("PSB", 0, "8BPB") \ MagickCoderHeader("PSD", 0, "8BPS") +#define MagickPSDAliases \ + MagickCoderAlias("PSD", "PSB") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/pwp.h b/coders/pwp.h index 3fa2618bd..7f4ffcd8b 100644 --- a/coders/pwp.h +++ b/coders/pwp.h @@ -19,6 +19,8 @@ #define MagickPWPHeaders \ MagickCoderHeader("PWP", 0, "SFW95") +#define MagickPWPAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/raw.h b/coders/raw.h index b6bbe9782..2d655a0b5 100644 --- a/coders/raw.h +++ b/coders/raw.h @@ -18,6 +18,17 @@ #define MagickRAWHeaders +#define MagickRAWAliases \ + MagickCoderAlias("RAW", "R") \ + MagickCoderAlias("RAW", "C") \ + MagickCoderAlias("RAW", "G") \ + MagickCoderAlias("RAW", "M") \ + MagickCoderAlias("RAW", "B") \ + MagickCoderAlias("RAW", "Y") \ + MagickCoderAlias("RAW", "A") \ + MagickCoderAlias("RAW", "O") \ + MagickCoderAlias("RAW", "K") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/rgb.h b/coders/rgb.h index 79584251e..caf7f6200 100644 --- a/coders/rgb.h +++ b/coders/rgb.h @@ -18,6 +18,10 @@ #define MagickRGBHeaders +#define MagickRGBAliases \ + MagickCoderAlias("RGB", "RGBA") \ + MagickCoderAlias("RGB", "RGBO") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/rgf.h b/coders/rgf.h index 65c61b0e1..d4bd456d9 100644 --- a/coders/rgf.h +++ b/coders/rgf.h @@ -18,6 +18,8 @@ #define MagickRGFHeaders +#define MagickRGFAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/rla.h b/coders/rla.h index 9c9f69ff5..8df77f241 100644 --- a/coders/rla.h +++ b/coders/rla.h @@ -18,6 +18,8 @@ #define MagickRLAHeaders +#define MagickRLAAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/rle.h b/coders/rle.h index 715f7cc02..735ba35a9 100644 --- a/coders/rle.h +++ b/coders/rle.h @@ -19,6 +19,8 @@ #define MagickRLEHeaders \ MagickCoderHeader("RLE", 0, "\122\314") +#define MagickRLEAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/scr.h b/coders/scr.h index 95a80096b..30af39f57 100644 --- a/coders/scr.h +++ b/coders/scr.h @@ -18,6 +18,8 @@ #define MagickSCRHeaders +#define MagickSCRAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/screenshot.h b/coders/screenshot.h index 8315a4250..7fa8f0627 100644 --- a/coders/screenshot.h +++ b/coders/screenshot.h @@ -18,6 +18,8 @@ #define MagickSCREENSHOTHeaders +#define MagickSCREENSHOTAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/sct.h b/coders/sct.h index 10d96debf..261d966ef 100644 --- a/coders/sct.h +++ b/coders/sct.h @@ -19,6 +19,8 @@ #define MagickSCTHeaders \ MagickCoderHeader("SCT", 0, "CT") +#define MagickSCTAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/sfw.h b/coders/sfw.h index 6534a5305..e9142c4b4 100644 --- a/coders/sfw.h +++ b/coders/sfw.h @@ -19,6 +19,8 @@ #define MagickSFWHeaders \ MagickCoderHeader("SFW", 0, "SFW94") +#define MagickSFWAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/sgi.h b/coders/sgi.h index f44fcb8b5..e26397397 100644 --- a/coders/sgi.h +++ b/coders/sgi.h @@ -19,6 +19,8 @@ #define MagickSGIHeaders \ MagickCoderHeader("SGI", 0, "\001\332") +#define MagickSGIAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/sixel.h b/coders/sixel.h index 0a4971c2b..732738ad7 100644 --- a/coders/sixel.h +++ b/coders/sixel.h @@ -18,6 +18,9 @@ #define MagickSIXELHeaders +#define MagickSIXELAliases \ + MagickCoderAlias("SIXEL", "SIX") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/stegano.h b/coders/stegano.h index 1e6c8dafc..8b8d4035e 100644 --- a/coders/stegano.h +++ b/coders/stegano.h @@ -18,6 +18,8 @@ #define MagickSTEGANOHeaders +#define MagickSTEGANOAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/sun.h b/coders/sun.h index a6c90e152..fcdd1578e 100644 --- a/coders/sun.h +++ b/coders/sun.h @@ -19,6 +19,9 @@ #define MagickSUNHeaders \ MagickCoderHeader("SUN", 0, "\131\246\152\225") +#define MagickSUNAliases \ + MagickCoderAlias("SUN", "RAS") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/svg.h b/coders/svg.h index 3f8caac12..dae805eda 100644 --- a/coders/svg.h +++ b/coders/svg.h @@ -22,6 +22,10 @@ MagickCoderHeader("SVG", 1, "SVG") \ MagickCoderHeader("SVG", 1, "svg") +#define MagickSVGAliases \ + MagickCoderAlias("SVG", "SVGZ") \ + MagickCoderAlias("SVG", "MSVG") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/tga.h b/coders/tga.h index 531664b37..62d03d608 100644 --- a/coders/tga.h +++ b/coders/tga.h @@ -18,6 +18,11 @@ #define MagickTGAHeaders +#define MagickTGAAliases \ + MagickCoderAlias("TGA", "ICB") \ + MagickCoderAlias("TGA", "VDA") \ + MagickCoderAlias("TGA", "VST") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/thumbnail.h b/coders/thumbnail.h index ea5383405..037363422 100644 --- a/coders/thumbnail.h +++ b/coders/thumbnail.h @@ -18,6 +18,8 @@ #define MagickTHUMBNAILHeaders +#define MagickTHUMBNAILAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/tiff.h b/coders/tiff.h index 8ed01a160..525305c37 100644 --- a/coders/tiff.h +++ b/coders/tiff.h @@ -22,6 +22,12 @@ MagickCoderHeader("TIFF64", 0, "\115\115\000\053\000\010\000\000") \ MagickCoderHeader("TIFF64", 0, "\111\111\053\000\010\000\000\000") +#define MagickTIFFAliases \ + MagickCoderAlias("TIFF", "GROUP4") \ + MagickCoderAlias("TIFF", "PTIF") \ + MagickCoderAlias("TIFF", "TIF") \ + MagickCoderAlias("TIFF", "TIFF64") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/tile.h b/coders/tile.h index 23326fdf5..b7292448e 100644 --- a/coders/tile.h +++ b/coders/tile.h @@ -18,6 +18,8 @@ #define MagickTILEHeaders +#define MagickTILEAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/tim.h b/coders/tim.h index b2bedd08f..c4aec8bfd 100644 --- a/coders/tim.h +++ b/coders/tim.h @@ -18,6 +18,8 @@ #define MagickTIMHeaders +#define MagickTIMAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/ttf.h b/coders/ttf.h index b4af4ef9f..df1b911e8 100644 --- a/coders/ttf.h +++ b/coders/ttf.h @@ -21,6 +21,13 @@ MagickCoderHeader("PFA", 0, "%!PS-AdobeFont-1.0") \ MagickCoderHeader("PFB", 6, "%!PS-AdobeFont-1.0") +#define MagickTTFAliases \ + MagickCoderAlias("TTF", "DFONT") \ + MagickCoderAlias("TTF", "PFA") \ + MagickCoderAlias("TTF", "PFB") \ + MagickCoderAlias("TTF", "OTF") \ + MagickCoderAlias("TTF", "TTC") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/txt.h b/coders/txt.h index 6ad6e4647..31f360c31 100644 --- a/coders/txt.h +++ b/coders/txt.h @@ -20,6 +20,10 @@ #define MagickTXTHeaders \ MagickCoderHeader("TXT", 0, MagickTXTID) +#define MagickTXTAliases \ + MagickCoderAlias("TXT", "SPARSE-COLOR") \ + MagickCoderAlias("TXT", "TEXT") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/uil.h b/coders/uil.h index eb6adbedb..5c3d2fe8a 100644 --- a/coders/uil.h +++ b/coders/uil.h @@ -18,6 +18,8 @@ #define MagickUILHeaders +#define MagickUILAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/url.h b/coders/url.h index 46146dba5..8e308266e 100644 --- a/coders/url.h +++ b/coders/url.h @@ -18,6 +18,12 @@ #define MagickURLHeaders +#define MagickURLAliases \ + MagickCoderAlias("URL", "HTTP") \ + MagickCoderAlias("URL", "HTTPS") \ + MagickCoderAlias("URL", "FTP") \ + MagickCoderAlias("URL", "FILE") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/uyvy.h b/coders/uyvy.h index 63219c197..effe6678e 100644 --- a/coders/uyvy.h +++ b/coders/uyvy.h @@ -18,6 +18,9 @@ #define MagickUYVYHeaders +#define MagickUYVYAliases \ + MagickCoderAlias("UYVY", "PAL") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/vicar.h b/coders/vicar.h index 542a71516..8ee4f5247 100644 --- a/coders/vicar.h +++ b/coders/vicar.h @@ -21,6 +21,8 @@ MagickCoderHeader("VICAR", 0, "NJPL1I") \ MagickCoderHeader("VICAR", 0, "PDS_VERSION_ID") +#define MagickVICARAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/vid.h b/coders/vid.h index 58e6f40a3..c3c54194a 100644 --- a/coders/vid.h +++ b/coders/vid.h @@ -18,6 +18,8 @@ #define MagickVIDHeaders +#define MagickVIDAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/viff.h b/coders/viff.h index c0525e697..1abc24ab6 100644 --- a/coders/viff.h +++ b/coders/viff.h @@ -19,6 +19,9 @@ #define MagickVIFFHeaders \ MagickCoderHeader("VIFF", 0, "\253\001") +#define MagickVIFFAliases \ + MagickCoderAlias("VIFF", "XV") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/vips.h b/coders/vips.h index 60c5961c9..9bc4cb243 100644 --- a/coders/vips.h +++ b/coders/vips.h @@ -20,6 +20,8 @@ MagickCoderHeader("VIPS", 0, "\010\362\246\266") \ MagickCoderHeader("VIPS", 0, "\266\246\362\010") +#define MagickVIPSAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/wbmp.h b/coders/wbmp.h index b521dd75f..77ec5c5e5 100644 --- a/coders/wbmp.h +++ b/coders/wbmp.h @@ -18,6 +18,8 @@ #define MagickWBMPHeaders +#define MagickWBMPAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/webp.h b/coders/webp.h index b0e4e7f5a..117c72624 100644 --- a/coders/webp.h +++ b/coders/webp.h @@ -19,6 +19,8 @@ #define MagickWEBPHeaders \ MagickCoderHeader("WEBP", 8, "WEBP") +#define MagickWEBPAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/wmf.h b/coders/wmf.h index c13916807..42f491b33 100644 --- a/coders/wmf.h +++ b/coders/wmf.h @@ -18,6 +18,8 @@ #define MagickWMFHeaders +#define MagickWMFAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/wpg.h b/coders/wpg.h index 010a9cbeb..fb5abf827 100644 --- a/coders/wpg.h +++ b/coders/wpg.h @@ -19,6 +19,8 @@ #define MagickWPGHeaders \ MagickCoderHeader("WPG", 0, "\377WPC") +#define MagickWPGAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/x.h b/coders/x.h index dedd68598..00a2b205e 100644 --- a/coders/x.h +++ b/coders/x.h @@ -18,6 +18,8 @@ #define MagickXHeaders +#define MagickXAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/xbm.h b/coders/xbm.h index 72e55fa2e..6ab0d59e3 100644 --- a/coders/xbm.h +++ b/coders/xbm.h @@ -19,6 +19,8 @@ #define MagickXBMHeaders \ MagickCoderHeader("XBM", 0, "#define") +#define MagickXBMAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/xc.h b/coders/xc.h index 1cbe8dfb5..270454399 100644 --- a/coders/xc.h +++ b/coders/xc.h @@ -18,6 +18,9 @@ #define MagickXCHeaders +#define MagickXCAliases \ + MagickCoderAlias("XC", "CANVAS") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/xcf.h b/coders/xcf.h index 08d52d1ee..a71dfb578 100644 --- a/coders/xcf.h +++ b/coders/xcf.h @@ -20,6 +20,8 @@ MagickCoderHeader("XCF", 0, "gimp xcf") +#define MagickXCFAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/xpm.h b/coders/xpm.h index 43f5a5546..79c5b3978 100644 --- a/coders/xpm.h +++ b/coders/xpm.h @@ -19,6 +19,10 @@ #define MagickXPMHeaders \ MagickCoderHeader("XPM", 1, "* XPM *") +#define MagickXPMAliases \ + MagickCoderAlias("XPM", "PICON") \ + MagickCoderAlias("XPM", "PM") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/xps.h b/coders/xps.h index 6e83e2bed..039d3efe1 100644 --- a/coders/xps.h +++ b/coders/xps.h @@ -18,6 +18,8 @@ #define MagickXPSHeaders +#define MagickXPSAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/xtrn.h b/coders/xtrn.h index 9c7e857a2..89d5e0f58 100644 --- a/coders/xtrn.h +++ b/coders/xtrn.h @@ -18,6 +18,9 @@ #define MagickXTRNHeaders +#define MagickXTRNAliases \ + MagickCoderAlias("XTRN", "XTRNARRAY") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/xwd.h b/coders/xwd.h index aefde91fd..c95968bfb 100644 --- a/coders/xwd.h +++ b/coders/xwd.h @@ -18,6 +18,8 @@ #define MagickXWDHeaders +#define MagickXWDAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/ycbcr.h b/coders/ycbcr.h index 24e3aea64..9e278064d 100644 --- a/coders/ycbcr.h +++ b/coders/ycbcr.h @@ -18,6 +18,9 @@ #define MagickYCBCRHeaders +#define MagickYCBCRAliases \ + MagickCoderAlias("YCbCr", "YCbCrA") + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif diff --git a/coders/yuv.h b/coders/yuv.h index c79541a90..097b2394d 100644 --- a/coders/yuv.h +++ b/coders/yuv.h @@ -18,6 +18,8 @@ #define MagickYUVHeaders +#define MagickYUVAliases + #if defined(__cplusplus) || defined(c_plusplus) extern "C" { #endif -- 2.40.0