head	1.2;
access;
symbols
	RELENG_4_11_0_RELEASE:1.1.1.3.6.1
	RELENG_4_11:1.1.1.3.6.1.0.18
	RELENG_4_11_BP:1.1.1.3.6.1
	RELENG_4_10_0_RELEASE:1.1.1.3.6.1
	RELENG_4_10:1.1.1.3.6.1.0.16
	RELENG_4_10_BP:1.1.1.3.6.1
	RELENG_4_9_0_RELEASE:1.1.1.3.6.1
	RELENG_4_9:1.1.1.3.6.1.0.14
	RELENG_4_9_BP:1.1.1.3.6.1
	RELENG_4_8_0_RELEASE:1.1.1.3.6.1
	RELENG_4_8:1.1.1.3.6.1.0.12
	RELENG_4_8_BP:1.1.1.3.6.1
	RELENG_4_7_0_RELEASE:1.1.1.3.6.1
	RELENG_4_7:1.1.1.3.6.1.0.10
	RELENG_4_7_BP:1.1.1.3.6.1
	RELENG_4_6_2_RELEASE:1.1.1.3.6.1
	RELENG_4_6_1_RELEASE:1.1.1.3.6.1
	RELENG_4_6_0_RELEASE:1.1.1.3.6.1
	RELENG_4_6:1.1.1.3.6.1.0.8
	RELENG_4_6_BP:1.1.1.3.6.1
	RELENG_4_5_0_RELEASE:1.1.1.3.6.1
	RELENG_4_5:1.1.1.3.6.1.0.6
	RELENG_4_5_BP:1.1.1.3.6.1
	RELENG_4_4_0_RELEASE:1.1.1.3.6.1
	RELENG_4_4:1.1.1.3.6.1.0.4
	RELENG_4_4_BP:1.1.1.3.6.1
	RELENG_4_3_0_RELEASE:1.1.1.3.6.1
	RELENG_4_3:1.1.1.3.6.1.0.2
	RELENG_4_3_BP:1.1.1.3.6.1
	RELENG_4_2_0_RELEASE:1.1.1.3
	RELENG_4_1_1_RELEASE:1.1.1.3
	PRE_SMPNG:1.1.1.3
	RELENG_4_1_0_RELEASE:1.1.1.3
	RELENG_3_5_0_RELEASE:1.1.1.3
	RELENG_4_0_0_RELEASE:1.1.1.3
	RELENG_4:1.1.1.3.0.6
	RELENG_4_BP:1.1.1.3
	RELENG_3_4_0_RELEASE:1.1.1.3
	RELENG_3_3_0_RELEASE:1.1.1.3
	RELENG_3_2_PAO:1.1.1.3.0.4
	RELENG_3_2_PAO_BP:1.1.1.3
	RELENG_3_2_0_RELEASE:1.1.1.3
	RELENG_3_1_0_RELEASE:1.1.1.3
	RELENG_3:1.1.1.3.0.2
	RELENG_3_BP:1.1.1.3
	RELENG_2_2_8_RELEASE:1.1.1.2.2.1
	RELENG_3_0_0_RELEASE:1.1.1.3
	RELENG_2_2_7_RELEASE:1.1.1.2.2.1
	RELENG_2_2_6_RELEASE:1.1.1.2.2.1
	RELENG_2_2_5_RELEASE:1.1.1.2.2.1
	RELENG_2_2_2_RELEASE:1.1.1.2
	RELENG_2_2_1_RELEASE:1.1.1.2
	file_3_22:1.1.1.3
	RELENG_2_2_0_RELEASE:1.1.1.2
	RELENG_2_1_7_RELEASE:1.1.1.1
	RELENG_2_1_6_1_RELEASE:1.1.1.1
	RELENG_2_1_6_RELEASE:1.1.1.1
	RELENG_2_2:1.1.1.2.0.2
	RELENG_2_2_BP:1.1.1.2
	RELENG_2_1_5_RELEASE:1.1.1.1
	file_3_19:1.1.1.2
	RELENG_2_1_0_RELEASE:1.1.1.1
	RELENG_2_1_0:1.1.1.1.0.6
	RELENG_2_1_0_BP:1.1.1.1
	RELENG_2_0_5_RELEASE:1.1.1.1
	RELENG_2_0_5:1.1.1.1.0.4
	RELENG_2_0_5_BP:1.1.1.1
	RELENG_2_0_5_ALPHA:1.1.1.1
	RELEASE_2_0:1.1.1.1
	BETA_2_0:1.1.1.1
	ALPHA_2_0:1.1.1.1.0.2
	file_3_14:1.1.1.1
	DARWIN:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2000.11.05.09.06.04;	author obrien;	state dead;
branches;
next	1.1;

1.1
date	94.09.03.19.16.25;	author csgr;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	94.09.03.19.16.26;	author csgr;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	96.01.23.12.27.44;	author mpp;	state Exp;
branches
	1.1.1.2.2.1;
next	1.1.1.3;

1.1.1.3
date	97.03.18.17.59.27;	author mpp;	state Exp;
branches
	1.1.1.3.6.1;
next	;

1.1.1.3.6.1
date	2000.11.29.19.32.50;	author obrien;	state dead;
branches;
next	;

1.1.1.2.2.1
date	97.08.18.18.59.43;	author jdp;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Switch over to using the Christos Zoulas maintained version in contrib/
This also gives use the same exact results as NetBSD, thus sharing more
code with our bretheren.
@
text
@# image formats, originally from jef@@helios.ee.lbl.gov (Jef Poskanzer),
# additions by janl@@ifi.uio.no as well as others. Jan also suggested
# merging several one- and two-line files into here.
#
# XXX - byte order for GIF and TIFF fields?
#

0	string		xbtoa			btoa'd file

# PBMPLUS
0	string		P1			PBM file
0	string		P2			PGM file
0	string		P3			PPM file
0	string		P4			PBM "rawbits" file
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	leshort		>0		%hd x
>8	leshort		>0		%hd,
>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	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)
0	string		\361\0\100\273	CMU window manager bitmap
0	string		#FIG		FIG graphics savefile text
>6      string          2.1            	Version 2.1
>6      string          2.0            	Version 2.0
0	string		GKSM		GKS Metafile
8	string		ILBM		IFF ILBM file
6	string		JFIF		JPEG picture
0       string          ARF_BEGARF     	PHIGS clear text archive

# From: <u31b3hs@@pool.informatik.rwth-aachen.de> (Michael Haardt)
0	string          yz      MGR bitmap, modern format, 8 bit aligned
0	string          zz      MGR bitmap, old format, 1 bit deep, 16 bit aligned
0	string          xz      MGR bitmap, old format, 1 bit deep, 32 bit aligned
0	string          yx      MGR bitmap, modern format, squeezed

0	string		%bitmap		FBM pixmap
>30	long		0x31		(mono)
>30	long		0x33		(color)

4	string		Research,	Digifax-G3-File
>29	byte		1		, fine resolution
>29	byte		0		, normal resolution
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Bring in file 3.14 by Ian Darwin (and Christos Zoulas)

The following files were moved to different names:
- file.man -> file.1
- magic.man -> magic.5

The following file was removed:
- Magdir/Makefile
@
text
@@


1.1.1.2
log
@Upgrade to file version 3.19.
@
text
@d1 1
a1 5

#------------------------------------------------------------------------------
# images:  file(1) magic for image formats (see also "iff")
#
# originally from jef@@helios.ee.lbl.gov (Jef Poskanzer),
d5 2
a6 2
# little magic: PCX (first byte is 0x0a)
# no magic: Targa
d8 1
a8 17
# PBMPLUS images
# The next byte following the magic is always whitespace.
0	string		P1		PBM image text
0	string		P2		PGM image text
0	string		P3		PPM image text
0	string		P4		PBM "rawbits" image data
0	string		P5		PGM "rawbits" image data
0	string		P6		PPM "rawbits" image data

# NIFF (Navy Interchange File Format, a modification of TIFF) images
0	string		IIN1		NIFF image data

# Tag Image File Format, from Daniel Quinlan (quinlan@@yggdrasil.com)
# The second word of TIFF files is the TIFF version number, 42, which has
# never changed.  The TIFF specification recommends testing for it.
0	string		MM\x00\x2a	TIFF image data, big-endian
0	string		II\x2a\x00	TIFF image data, little-endian
d10 13
a22 2
# PNG [Portable Network Graphics, or "PNG's Not GIF"] images
# (Greg Roelofs, newt@@uchicago.edu)
d24 2
a25 15
# 137 P N G \r \n ^Z \n [4-byte length] H E A D [HEAD data] [HEAD crc] ...
#
0	string		\x89PNG		PNG image data,
>4	belong		!0x0d0a1a0a	CORRUPTED,
>16	belong		x		%ld x
>20	belong		x		%ld,
>24	byte		x		%d-bit
>25	byte		0		grayscale,
>25	byte		2		\b/color RGB,
>25	byte		3		colormap,
>25	byte		4		gray+alpha,
>25	byte		6		\b/color RGBA,
#>26	byte		0		deflate/32K,
>28	byte		0		non-interlaced
>28	byte		1		interlaced
d28 3
a30 3
0	string		GIF8		GIF image data
>4	string		7a		\b, version 8%s,
>4	string		9a		\b, version 8%s,
d33 1
a33 1
#>10	byte		&0x80		color mapped,
d43 9
a51 28
# ITC (CMU WM) raster files.  It is essentially a byte-reversed Sun raster,
# 1 plane, no encoding.
0	string		\361\0\100\273	CMU window manager raster image data
>4	lelong		>0		%d x
>8	lelong		>0		%d,
>12	lelong		>0		%d-bit

# Magick Image File Format
0	string		id=ImageMagick	MIFF image data

# Artisan
0	long		1123028772	Artisan image data
>4	long		1		\b, rectangular 24-bit
>4	long		2		\b, rectangular 8-bit with colormap
>4	long		3		\b, rectangular 32-bit (24-bit with matte)

# FIG (Facility for Interactive Generation of figures), an object-based format
0	string		#FIG		FIG image text
>5	string		x		\b, version %.3s

# PHIGS
0	string		ARF_BEGARF		PHIGS clear text archive
0	string		@@(#)SunPHIGS		SunPHIGS
# version number follows, in the form m.n
>40	string		SunBin			binary
>32	string		archive			archive

# GKS (Graphics Kernel System)
d53 17
a69 131
>24	string		SunGKS		\b, SunGKS

# CGM image files
0	string		BEGMF		clear text Computer Graphics Metafile
# XXX - questionable magic
0	beshort&0xffe0	0x0020		binary Computer Graphics Metafile
0	beshort		0x3020		character Computer Graphics Metafile

# MGR bitmaps  (Michael Haardt, u31b3hs@@pool.informatik.rwth-aachen.de)
0	string	yz	MGR bitmap, modern format, 8-bit aligned
0	string	zz	MGR bitmap, old format, 1-bit deep, 16-bit aligned
0	string	xz	MGR bitmap, old format, 1-bit deep, 32-bit aligned
0	string	yx	MGR bitmap, modern format, squeezed

# Fuzzy Bitmap (FBM) images
0	string		%bitmap\0	FBM image data
>30	long		0x31		\b, mono
>30	long		0x33		\b, color

# facsimile data
1	string		PC\ Research,\ Inc	group 3 fax data
>29	byte		0		\b, normal resolution (204x98 DPI)
>29	byte		1		\b, fine resolution (204x196 DPI)

# JPEG images
0	beshort		0xffd8		JPEG image data
>6	string		JFIF		\b, JFIF standard
# HSI is Handmade Software's proprietary JPEG encoding scheme
0	string		hsi1		JPEG image data, HSI proprietary

# PC bitmaps (OS/2, Windoze BMP files)  (Greg Roelofs, newt@@uchicago.edu)
0	string		BM		PC bitmap data
>14	leshort		12		\b, OS/2 1.x format
>>18	leshort		x		\b, %d x
>>20	leshort		x		%d
>14	leshort		64		\b, OS/2 2.x format
>>18	leshort		x		\b, %d x
>>20	leshort		x		%d
>14	leshort		40		\b, Windows 3.x format
>>18	lelong		x		\b, %d x
>>22	lelong		x		%d x
>>28	leshort		x		%d
0	string		IC		PC icon data
0	string		PI		PC pointer image data
0	string		CI		PC color icon data
0	string		CP		PC color pointer image data
# Conflicts with other entries [BABYL]
#0	string		BA		PC bitmap array data

# XPM icons (Greg Roelofs, newt@@uchicago.edu)
# note possible collision with C/REXX entry in c-lang; currently commented out
0	string		/*\ XPM\ */	X pixmap image text

# Utah Raster Toolkit RLE images (janl@@ifi.uio.no)
0	leshort		0xcc52		RLE image data,
>6	leshort		x		%d x
>8	leshort		x		%d
>2	leshort		>0		\b, lower left corner: %d
>4	leshort		>0		\b, lower right corner: %d
>10	byte&0x1	=0x1		\b, clear first
>10	byte&0x2	=0x2		\b, no background
>10	byte&0x4	=0x4		\b, alpha channel
>10	byte&0x8	=0x8		\b, comment
>11	byte		>0		\b, %d color channels
>12	byte		>0		\b, %d bits per pixel
>13	byte		>0		\b, %d color map channels

# image file format (Robert Potter, potter@@cs.rochester.edu)
0	string		Imagefile\ version-	iff image data
# this adds the whole header (inc. version number), informative but longish
>10	string		>\0		%s

# Sun raster images, from Daniel Quinlan (quinlan@@yggdrasil.com)
0	belong		0x59a66a95	Sun raster image data
>4	belong		>0		\b, %d x
>8	belong		>0		%d,
>12	belong		>0		%d-bit,
#>16	belong		>0		%d bytes long,
>20	belong		0		old format,
#>20	belong		1		standard,
>20	belong		2		compressed,
>20	belong		3		RGB,
>20	belong		4		TIFF,
>20	belong		5		IFF,
>20	belong		0xffff		reserved for testing,
>24	belong		0		no colormap
>24	belong		1		RGB colormap
>24	belong		2		raw colormap
#>28	belong		>0		colormap is %d bytes long

# SGI image file format, from Daniel Quinlan (quinlan@@yggdrasil.com)
# file://sgi.com/graphics/SGIIMAGESPEC
0	beshort		474		SGI image data
#>2	byte		0		\b, verbatim
>2	byte		1		\b, RLE
#>3	byte		1		\b, normal precision
>3	byte		2		\b, high precision
>4	beshort		x		\b, %d-D
>6	beshort		x		\b, %d x
>8	beshort		x		%d
>10	beshort		x		\b, %d channel
>10	beshort		!1		\bs
>80	string		>0		\b, "%s"

0	string		IT01		FIT image data
>4	belong		x		\b, %d x
>8	belong		x		%d x
>12	belong		x		%d
#
0	string		IT02		FIT image data
>4	belong		x		\b, %d x
>8	belong		x		%d x
>12	belong		x		%d
#
2048	string		PCD_IPI		Kodak Photo CD image pack file
0	string		PCD_OPA		Kodak Photo CD overview pack file

# FITS format.  Jeff Uphoff <juphoff@@tarsier.cv.nrao.edu>
# FITS is the Flexible Image Transport System, the de facto standard for
# data and image transfer, storage, etc., for the astronomical community.
# (FITS floating point formats are big-endian.)
0	string	SIMPLE\ \ =	FITS image data
>109	string	8		\b, 8-bit, character or unsigned binary integer
>108	string	16		\b, 16-bit, two's complement binary integer
>107	string	\ 32		\b, 32-bit, two's complement binary integer
>107	string	-32		\b, 32-bit, floating point, single precision
>107	string	-64		\b, 64-bit, floating point, double precision

# other images
0	string	This\ is\ a\ BitMap\ file	Lisp Machine bit-array-file
0	string		!!		Bennet Yee's "face" format
@


1.1.1.2.2.1
log
@Sync with -current.
@
text
@d56 8
a63 8
#>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
a118 7
# SunOS 5.5.1 had
#
#	0	string		\377\330\377\340	JPEG file
#	0	string		\377\330\377\356	JPG file
#
# both of which turn into "JPEG image data" here.
#
a224 5

# From SunOS 5.5.1 "/etc/magic" - appeared right before Sun raster image
# stuff.
#
0	beshort		0x1010		PEX Binary Archive
@


1.1.1.3
log
@Upgrade to file version 3.22.

Obtained from: ftp://ftp.deshaw.com/pub/file/file-3.22.tar.gz
@
text
@d56 8
a63 8
#>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
a118 7
# SunOS 5.5.1 had
#
#	0	string		\377\330\377\340	JPEG file
#	0	string		\377\330\377\356	JPG file
#
# both of which turn into "JPEG image data" here.
#
a224 5

# From SunOS 5.5.1 "/etc/magic" - appeared right before Sun raster image
# stuff.
#
0	beshort		0x1010		PEX Binary Archive
@


1.1.1.3.6.1
log
@MFC: switch over to using the Christos Zoulas maintained version in contrib/
@
text
@@

