Suggested by janl@ifi.uio.no: merge in GIF, TIFF, etc., and rename

to "images". Shorten comments. Add JPEG and Artisan, also from Jan.

diff --git a/magic/Magdir/images b/magic/Magdir/images
index 26a76b7d81c18fe97fe1f5097df9d818004b8437..572cabd2a6e1a376bd90c689642fd71a8ecaacf3 100644 (file)
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -1,20 +1,10 @@
-# Portable BitMap stuff.
-# $Header: /home/glen/git/file/cvs/file/magic/Magdir/images,v 1.3 1990/10/10 15:50:57 ian Exp $
-
-# Old pbm format (most didn't have real magic number).
-0      short   0x2a17  old "compact bitmap" data (Poskanzer)
-
-# From:        jef@helios.ee.lbl.gov (Jef Poskanzer)
-# To:  ian@sq.com
-# Subject: magic
-# 
-# PBMPLUS auxiliary magic numbers file
+# image formats, originally from jef@helios.ee.lbl.gov (Jef Poskanzer),
+# additions by all and sundry.
 #
-# All of these entries use the "string" format so that they will work on
-# both big-endian and little-endian machines.
 
 0      string          xbtoa                   btoa'd file
 
+# PBMPLUS
 0      string          P1                      PBM file
 0      string          P2                      PGM file
 0      string          P3                      PPM file
@@ -22,3 +12,37 @@
 0      string          P5                      PGM "rawbits" file
 0      string          P6                      PPM "rawbits" file
 
+# TIFF and friends
+0      string          \115\115                TIFF file, big-endian
+>2      short           >0                     version %d
+0      string          \111\111                TIFF file, little-endian
+>2      short           >0                     version %d
+#
+# NIFF (Navy Interchange File Format, a modification of TIFF)
+0      string          IIN1                    NIFF raster data
+
+# GIF
+0      string          GIF             GIF picture
+>3     string          87a             - version %s
+>3     string          89a             - version %s
+>6     short           >0              %d x
+>8     short           >0              %d,
+>10    byte            &0x40           interlaced,
+>10    byte&0x07       =0x00           2 colors
+>10    byte&0x07       =0x01           4 colors
+>10    byte&0x07       =0x02           8 colors
+>10    byte&0x07       =0x03           16 colors
+>10    byte&0x07       =0x04           32 colors
+>10    byte&0x07       =0x05           64 colors
+>10    byte&0x07       =0x06           128 colors
+>10    byte&0x07       =0x07           256 colors
+
+# Miscellany
+0      string          \361\0\100\273          CMU window manager bitmap
+0      string          yz                      MGR bitmap
+8      string          ILBM                    IFF ILBM file
+6      string          JFIF                    JPEG picture
+0      long            1123028772              Artisan image file
+>4     long            1       rectangular 24-bit image
+>4     long            2       rectangular 8-bit image with colormap
+>4      long            3      rectangular 32-bit image (24-bit with matte)