[GM-commit] GraphicsMagick: magick/magic.c: Make the magic-based format desc...
Swiss army knife of image processing
Brought to you by:
bfriesen
Menu
▾
▴
[GM-commit] GraphicsMagick: magick/magic.c: Make the magic-based format desc...
|
From: GraphicsMagick C. <gra...@li...> - 2025-02-08 20:32:05
|
changeset b0142af1dd01 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=b0142af1dd01 summary: magick/magic.c: Make the magic-based format descriptions more detailed and helpful. diffstat: ChangeLog | 5 +++ VisualMagick/installer/inc/version.isx | 4 +- magick/magic.c | 44 ++++++++++++++++++++------------- magick/version.h | 4 +- www/ChangeLog.html | 7 +++++ 5 files changed, 42 insertions(+), 22 deletions(-) diffs (138 lines): diff -r 298914accccd -r b0142af1dd01 ChangeLog --- a/ChangeLog Fri Feb 07 17:27:03 2025 -0600 +++ b/ChangeLog Sat Feb 08 14:31:31 2025 -0600 @@ -1,3 +1,8 @@ +2025-02-08 Bob Friesenhahn <bfr...@si...> + + * magick/magic.c: Make the magic-based format descriptions more + detailed and helpful. + 2025-02-07 Bob Friesenhahn <bfr...@si...> * magick/magic.c (ListMagicInfo): Include a format description in diff -r 298914accccd -r b0142af1dd01 VisualMagick/installer/inc/version.isx --- a/VisualMagick/installer/inc/version.isx Fri Feb 07 17:27:03 2025 -0600 +++ b/VisualMagick/installer/inc/version.isx Sat Feb 08 14:31:31 2025 -0600 @@ -10,5 +10,5 @@ #define public MagickPackageName "GraphicsMagick" #define public MagickPackageVersion "1.4" -#define public MagickPackageVersionAddendum ".020250207" -#define public MagickPackageReleaseDate "snapshot-20250207" +#define public MagickPackageVersionAddendum ".020250208" +#define public MagickPackageReleaseDate "snapshot-20250208" diff -r 298914accccd -r b0142af1dd01 magick/magic.c --- a/magick/magic.c Fri Feb 07 17:27:03 2025 -0600 +++ b/magick/magic.c Sat Feb 08 14:31:31 2025 -0600 @@ -71,24 +71,24 @@ MAGIC("8BIMWTEXT", "Photoshop resource wide text format", 0, "8\000B\000I\000M\000#"), MAGIC("8BIMTEXT", "Photoshop resource text format", 0, "8BIM#"), MAGIC("8BIM", "Photoshop resource format", 0, "8BIM"), - MAGIC("BMP", "BMP BA", 0, "BA"), - MAGIC("BMP", "BMP BM", 0, "BM"), - MAGIC("BMP", "BMP CI", 0, "CI"), - MAGIC("BMP", "BMP CP", 0, "CP"), - MAGIC("BMP", "BMP IC", 0, "IC"), - MAGIC("BMP", "BMP PI", 0, "PI"), + MAGIC("BMP", "BMP (OS/2 struct bitmap array)", 0, "BA"), + MAGIC("BMP", "BMP (Windows 3.1x, 95, NT, ...)", 0, "BM"), + MAGIC("BMP", "BMP (OS/2 struct color icon)", 0, "CI"), + MAGIC("BMP", "BMP (OS/2 const color pointer)", 0, "CP"), + MAGIC("BMP", "BMP (OS/2 struct icon)", 0, "IC"), + MAGIC("BMP", "BMP (OS/2 pointer)", 0, "PI"), MAGIC("CALS", "CALS (MIL-STD-1840) Type 1 image", 21, "version: MIL-STD-1840"), MAGIC("CALS", "CALS (MIL-STD-1840) Type 1 image", 0, "srcdocid:"), MAGIC("CALS", "CALS (MIL-STD-1840) Type 1 image", 9, "srcdocid:"), MAGIC("CALS", "CALS (MIL-STD-1840) Type 1 image", 8, "rorient:"), MAGIC("CGM", "Computer Graphics Metaformat", 0, "BEGMF"), - MAGIC("CIN", "Cineon Image File", 0, "\200\052\137\327"), - MAGIC("DCM", "DICOM", 128, "DICM"), + MAGIC("CIN", "Kodak Cineon Image File", 0, "\200\052\137\327"), + MAGIC("DCM", "DICOM medical image", 128, "DICM"), MAGIC("DCX", "ZSoft IBM PC multi-page Paintbrush", 0, "\261\150\336\72"), MAGIC("DIB", "Microsoft DIB", 0, "\050\000"), MAGIC("DOT", "Graphviz DOT", 0, "digraph"), - MAGIC("DPX", "SMPTE 268M-2003 (DPX 2.0)", 0, "SDPX"), - MAGIC("DPX", "SMPTE 268M-2003 (DPX 2.0)", 0, "XPDS"), + MAGIC("DPX", "SMPTE 268M-2003 (DPX 2.0) (BE)", 0, "SDPX"), + MAGIC("DPX", "SMPTE 268M-2003 (DPX 2.0) (LE)", 0, "XPDS"), MAGIC("EMF", "Microsoft EMF", 40, "\040\105\115\106\000\000\001\000"), MAGIC("EPT", "Adobe Encapsulated PostScript (with preview)", 0, "\305\320\323\306"), MAGIC("FAX", "Group 3 FAX", 0, "DFAX"), @@ -106,7 +106,7 @@ MAGIC("HEIF", "HEIF - Scalable sequence", 4, "ftyphevs"), MAGIC("HEIC", "HEIF - Nokia alpha image", 4, "ftypmif1"), MAGIC("HEIC", "HEIF - Nokia animation image", 4, "ftypmsf1"), - MAGIC("HDF", "Heirarchical Data Format", 1, "HDF"), + /* MAGIC("HDF", "Heirarchical Data Format", 1, "HDF"), */ MAGIC("HPGL", "HP Graphics Language", 0, "IN;"), MAGIC("HTML", "Hypertext Markup Language", 1, "HTML"), MAGIC("HTML", "Hypertext Markup Language", 1, "html"), @@ -146,9 +146,17 @@ MAGIC("PPM", "Portable pixmap file format (binary)", 0, "P6"), MAGIC("P7", "XV Thumbnail (P7 332)", 0, "P7 332"), /* XV Thumbnail */ MAGIC("PAM", "XV Thumbnail (P7)", 0, "P7"), /* Should be listed after "P7 332" */ - MAGIC("PS", "Adobe Postscript", 0, "%!"), - MAGIC("PS", "Adobe Postscript", 0, "\004%!"), - MAGIC("PS", "Adobe Postscript", 0, "\305\320\323\306"), + MAGIC("PS", "Adobe Encapsulated Postscript 3.0", 0, "%!PS-Adobe-3.0 EPSF-3.0"), + MAGIC("PS", "Adobe Encapsulated Postscript 2.1", 0, "%!PS-Adobe-3.0 EPSF-2.1"), + MAGIC("PS", "Adobe Encapsulated Postscript 2.0", 0, "%!PS-Adobe-2.0 EPSF-2.0"), + MAGIC("PS", "Adobe Encapsulated Postscript 1.2", 0, "%!PS-Adobe-2.0 EPSF-1.2"), + MAGIC("PS", "Adobe Postscript 3.0", 0, "%!PS-Adobe-3.0"), + MAGIC("PS", "Adobe Postscript 2.0", 0, "%!PS-Adobe-2.0"), + MAGIC("PS", "Adobe Postscript 2.1", 0, "%!PS-Adobe-2.1"), + MAGIC("PS", "Adobe Postscript 1.0", 0, "%!PS-Adobe-1.0"), + MAGIC("PS", "Adobe Postscript", 0, "%!"), /* Generic */ + MAGIC("PS", "Adobe Postscript", 0, "\004%!"), /* EOT character. Maybe used when printing. */ + MAGIC("PS", "Adobe Encapsulated PostScript Interchange (EPT)", 0, "\305\320\323\306"), /* aka EPT */ MAGIC("PSD", "Photoshop PSD", 0, "8BPS"), MAGIC("PWP", "Seattle Film Works", 0, "SFW95"), MAGIC("RAD", "Radiance", 0, "#?RADIANCE"), @@ -160,11 +168,11 @@ MAGIC("SUN", "SUN Rasterfile", 0, "\131\246\152\225"), MAGIC("SVG", "Scalable Vector Graphics", 1, "?XML"), MAGIC("SVG", "Scalable Vector Graphics", 1, "?xml"), - MAGIC("TIFF", "Tagged Image File Format", 0, "\115\115\000\052"), - MAGIC("TIFF", "Tagged Image File Format", 0, "\111\111\052\000"), + MAGIC("TIFF", "Tagged Image File Format (BE Classic)", 0, "\115\115\000\052"), + MAGIC("TIFF", "Tagged Image File Format (LE Classic)", 0, "\111\111\052\000"), MAGIC("TOPOL", "TopoL X Image", 0, " "), - MAGIC("BIGTIFF", "Tagged Image File Format (64 bit)", 0, "\115\115\000\053\000\010\000\000"), - MAGIC("BIGTIFF", "Tagged Image File Format (64 bit)", 0, "\111\111\053\000\010\000\000\000"), + MAGIC("BIGTIFF", "Tagged Image File Format (BE Big)", 0, "\115\115\000\053\000\010\000\000"), + MAGIC("BIGTIFF", "Tagged Image File Format (LE Big)", 0, "\111\111\053\000\010\000\000\000"), MAGIC("VICAR", "VICAR rasterfile format (LBLSIZE)", 0, "LBLSIZE"), MAGIC("VICAR", "VICAR rasterfile format (NJPL1I)", 0, "NJPL1I"), MAGIC("VIFF","Khoros Visualization image", 0, "\253\001"), diff -r 298914accccd -r b0142af1dd01 magick/version.h --- a/magick/version.h Fri Feb 07 17:27:03 2025 -0600 +++ b/magick/version.h Sat Feb 08 14:31:31 2025 -0600 @@ -38,8 +38,8 @@ #define MagickLibVersion 0x282502 #define MagickLibVersionText "1.4" #define MagickLibVersionNumber 28,25,2 -#define MagickChangeDate "20250207" -#define MagickReleaseDate "snapshot-20250207" +#define MagickChangeDate "20250208" +#define MagickReleaseDate "snapshot-20250208" /* The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines diff -r 298914accccd -r b0142af1dd01 www/ChangeLog.html --- a/www/ChangeLog.html Fri Feb 07 17:27:03 2025 -0600 +++ b/www/ChangeLog.html Sat Feb 08 14:31:31 2025 -0600 @@ -38,6 +38,13 @@ <main id="graphicsmagick-changelog"> <h1 class="title">GraphicsMagick ChangeLog</h1> +<p>2025-02-08 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p> +<blockquote> +<ul class="simple"> +<li><p>magick/magic.c: Make the magic-based format descriptions more +detailed and helpful.</p></li> +</ul> +</blockquote> <p>2025-02-07 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p> <blockquote> <ul class="simple"> |
