Deleted Added
full compact
images (276415) images (277592)
1
2#------------------------------------------------------------------------------
1
2#------------------------------------------------------------------------------
3# $File: images,v 1.97 2014/12/08 16:06:19 christos Exp $
3# $File: images,v 1.102 2015/01/02 02:36:35 christos Exp $
4# images: file(1) magic for image formats (see also "iff", and "c-lang" for
5# XPM bitmaps)
6#
7# originally from jef@helios.ee.lbl.gov (Jef Poskanzer),
8# additions by janl@ifi.uio.no as well as others. Jan also suggested
9# merging several one- and two-line files into here.
10#
11# little magic: PCX (first byte is 0x0a)

--- 98 unchanged lines hidden (view full) ---

110>10 byte x \b, version %d.
111>11 byte x \b%d
112
113# Tag Image File Format, from Daniel Quinlan (quinlan@yggdrasil.com)
114# The second word of TIFF files is the TIFF version number, 42, which has
115# never changed. The TIFF specification recommends testing for it.
1160 string MM\x00\x2a TIFF image data, big-endian
117!:mime image/tiff
4# images: file(1) magic for image formats (see also "iff", and "c-lang" for
5# XPM bitmaps)
6#
7# originally from jef@helios.ee.lbl.gov (Jef Poskanzer),
8# additions by janl@ifi.uio.no as well as others. Jan also suggested
9# merging several one- and two-line files into here.
10#
11# little magic: PCX (first byte is 0x0a)

--- 98 unchanged lines hidden (view full) ---

110>10 byte x \b, version %d.
111>11 byte x \b%d
112
113# Tag Image File Format, from Daniel Quinlan (quinlan@yggdrasil.com)
114# The second word of TIFF files is the TIFF version number, 42, which has
115# never changed. The TIFF specification recommends testing for it.
1160 string MM\x00\x2a TIFF image data, big-endian
117!:mime image/tiff
118>(4.L) use tiff_ifd
118>(4.L) use \^tiff_ifd
1190 string II\x2a\x00 TIFF image data, little-endian
120!:mime image/tiff
121>(4.l) use tiff_ifd
122
1230 name tiff_ifd
124>0 leshort x \b, direntries=%d
125>2 use tiff_entry
126
1270 name tiff_entry
1190 string II\x2a\x00 TIFF image data, little-endian
120!:mime image/tiff
121>(4.l) use tiff_ifd
122
1230 name tiff_ifd
124>0 leshort x \b, direntries=%d
125>2 use tiff_entry
126
1270 name tiff_entry
128# NewSubFileType
129>0 leshort 0xfe
130>>12 use tiff_entry
128>0 leshort 0x100
129>>4 lelong 1
130>>>12 use tiff_entry
131>0 leshort 0x100
132>>4 lelong 1
133>>>12 use tiff_entry
131>>>8 lelong x \b, width=%d
134>>>8 leshort x \b, width=%d
132>0 leshort 0x101
133>>4 lelong 1
135>0 leshort 0x101
136>>4 lelong 1
134>>>8 lelong x \b, height=%d
137>>>8 leshort x \b, height=%d
135>>>12 use tiff_entry
136>0 leshort 0x102
138>>>12 use tiff_entry
139>0 leshort 0x102
137>>8 lelong x \b, bps=%d
140>>8 leshort x \b, bps=%d
138>>12 use tiff_entry
139>0 leshort 0x103
140>>4 lelong 1 \b, compression=
141>>12 use tiff_entry
142>0 leshort 0x103
143>>4 lelong 1 \b, compression=
141>>>8 lelong 1 \bnone
142>>>8 lelong 2 \bhuffman
143>>>8 lelong 3 \bbi-level group 3
144>>>8 lelong 4 \bbi-level group 4
145>>>8 lelong 5 \bLZW
146>>>8 lelong 6 \bJPEG (old)
147>>>8 lelong 7 \bJPEG
148>>>8 lelong 8 \bdeflate
149>>>8 lelong 9 \bJBIG, ITU-T T.85
150>>>8 lelong 0xa \bJBIG, ITU-T T.43
151>>>8 lelong 0x7ffe \bNeXT RLE 2-bit
152>>>8 lelong 0x8005 \bPackBits (Macintosh RLE)
153>>>8 lelong 0x8029 \bThunderscan RLE
154>>>8 lelong 0x807f \bRasterPadding (CT or MP)
155>>>8 lelong 0x8080 \bRLE (Line Work)
156>>>8 lelong 0x8081 \bRLE (High-Res Cont-Tone)
157>>>8 lelong 0x8082 \bRLE (Binary Line Work)
158>>>8 lelong 0x80b2 \bDeflate (PKZIP)
159>>>8 lelong 0x80b3 \bKodak DCS
160>>>8 lelong 0x8765 \bJBIG
161>>>8 lelong 0x8798 \bJPEG2000
162>>>8 lelong 0x8799 \bNikon NEF Compressed
144>>>8 leshort 1 \bnone
145>>>8 leshort 2 \bhuffman
146>>>8 leshort 3 \bbi-level group 3
147>>>8 leshort 4 \bbi-level group 4
148>>>8 leshort 5 \bLZW
149>>>8 leshort 6 \bJPEG (old)
150>>>8 leshort 7 \bJPEG
151>>>8 leshort 8 \bdeflate
152>>>8 leshort 9 \bJBIG, ITU-T T.85
153>>>8 leshort 0xa \bJBIG, ITU-T T.43
154>>>8 leshort 0x7ffe \bNeXT RLE 2-bit
155>>>8 leshort 0x8005 \bPackBits (Macintosh RLE)
156>>>8 leshort 0x8029 \bThunderscan RLE
157>>>8 leshort 0x807f \bRasterPadding (CT or MP)
158>>>8 leshort 0x8080 \bRLE (Line Work)
159>>>8 leshort 0x8081 \bRLE (High-Res Cont-Tone)
160>>>8 leshort 0x8082 \bRLE (Binary Line Work)
161>>>8 leshort 0x80b2 \bDeflate (PKZIP)
162>>>8 leshort 0x80b3 \bKodak DCS
163>>>8 leshort 0x8765 \bJBIG
164>>>8 leshort 0x8798 \bJPEG2000
165>>>8 leshort 0x8799 \bNikon NEF Compressed
163>>>8 default x
166>>>8 default x
164>>>>8 lelong x \b(unknown 0x%x)
167>>>>8 leshort x \b(unknown 0x%x)
165>>>12 use tiff_entry
166>0 leshort 0x106 \b, PhotometricIntepretation=
168>>>12 use tiff_entry
169>0 leshort 0x106 \b, PhotometricIntepretation=
167>>8 lelong 0 \bWhiteIsZero
168>>8 lelong 1 \bBlackIsZero
169>>8 lelong 2 \bRGB
170>>8 lelong 3 \bRGB Palette
171>>8 lelong 4 \bTransparency Mask
172>>8 lelong 5 \bCMYK
173>>8 lelong 6 \bYCbCr
174>>8 lelong 8 \bCIELab
175>>>8 lelong x \b(unknown=0x%x)
170>>8 leshort 0 \bWhiteIsZero
171>>8 leshort 1 \bBlackIsZero
172>>8 leshort 2 \bRGB
173>>8 leshort 3 \bRGB Palette
174>>8 leshort 4 \bTransparency Mask
175>>8 leshort 5 \bCMYK
176>>8 leshort 6 \bYCbCr
177>>8 leshort 8 \bCIELab
178>>>8 leshort x \b(unknown=0x%x)
176>>12 use tiff_entry
177# FillOrder
178>0 leshort 0x10a
179>>4 lelong 1
180>>>12 use tiff_entry
181# DocumentName
182>0 leshort 0x10d
183>>(8.l) string x \b, name=%s
184>>>12 use tiff_entry
185# ImageDescription
186>0 leshort 0x10e
187>>(8.l) string x \b, description=%s
188>>>12 use tiff_entry
179>>12 use tiff_entry
180# FillOrder
181>0 leshort 0x10a
182>>4 lelong 1
183>>>12 use tiff_entry
184# DocumentName
185>0 leshort 0x10d
186>>(8.l) string x \b, name=%s
187>>>12 use tiff_entry
188# ImageDescription
189>0 leshort 0x10e
190>>(8.l) string x \b, description=%s
191>>>12 use tiff_entry
192# Make
193>0 leshort 0x10f
194>>(8.l) string x \b, manufacturer=%s
195>>>12 use tiff_entry
196# Model
197>0 leshort 0x110
198>>(8.l) string x \b, model=%s
199>>>12 use tiff_entry
189# StripOffsets
190>0 leshort 0x111
191>>12 use tiff_entry
200# StripOffsets
201>0 leshort 0x111
202>>12 use tiff_entry
192# NewSubFileType
193>0 leshort 0xfe
203# Orientation
204>0 leshort 0x112 \b, orientation=
205>>8 leshort 1 \bupper-left
206>>8 leshort 3 \blower-right
207>>8 leshort 6 \bupper-right
208>>8 leshort 8 \blower-left
209>>8 leshort 9 \bundefined
210>>8 default x
211>>>8 leshort x \b[*%d*]
194>>12 use tiff_entry
212>>12 use tiff_entry
213# XResolution
214>0 leshort 0x11a
215>>8 lelong x \b, xresolution=%d
216>>12 use tiff_entry
217# YResolution
218>0 leshort 0x11b
219>>8 lelong x \b, yresolution=%d
220>>12 use tiff_entry
221# ResolutionUnit
222>0 leshort 0x128
223>>8 leshort x \b, resolutionunit=%d
224>>12 use tiff_entry
225# Software
226>0 leshort 0x131
227>>(8.l) string x \b, software=%s
228>>12 use tiff_entry
195# Datetime
196>0 leshort 0x132
197>>(8.l) string x \b, datetime=%s
229# Datetime
230>0 leshort 0x132
231>>(8.l) string x \b, datetime=%s
198>>>12 use tiff_entry
232>>12 use tiff_entry
199# HostComputer
200>0 leshort 0x13c
201>>(8.l) string x \b, hostcomputer=%s
233# HostComputer
234>0 leshort 0x13c
235>>(8.l) string x \b, hostcomputer=%s
202>>>12 use tiff_entry
236>>12 use tiff_entry
237# WhitePoint
238>0 leshort 0x13e
239>>12 use tiff_entry
240# PrimaryChromaticities
241>0 leshort 0x13f
242>>12 use tiff_entry
243# YCbCrCoefficients
244>0 leshort 0x211
245>>12 use tiff_entry
246# YCbCrPositioning
247>0 leshort 0x213
248>>12 use tiff_entry
249# ReferenceBlackWhite
250>0 leshort 0x214
251>>12 use tiff_entry
252# Copyright
253>0 leshort 0x8298
254>>(8.l) string x \b, copyright=%s
255>>12 use tiff_entry
256# ExifOffset
257>0 leshort 0x8769
258>>12 use tiff_entry
259# GPS IFD
260>0 leshort 0x8825 \b, GPS-Data
261>>12 use tiff_entry
262
203#>0 leshort x \b, unknown=0x%x
263#>0 leshort x \b, unknown=0x%x
264#>>12 use tiff_entry
204
2050 string MM\x00\x2b Big TIFF image data, big-endian
206!:mime image/tiff
2070 string II\x2b\x00 Big TIFF image data, little-endian
208!:mime image/tiff
209
210# PNG [Portable Network Graphics, or "PNG's Not GIF"] images
211# (Greg Roelofs, newt@uchicago.edu)

--- 829 unchanged lines hidden ---
265
2660 string MM\x00\x2b Big TIFF image data, big-endian
267!:mime image/tiff
2680 string II\x2b\x00 Big TIFF image data, little-endian
269!:mime image/tiff
270
271# PNG [Portable Network Graphics, or "PNG's Not GIF"] images
272# (Greg Roelofs, newt@uchicago.edu)

--- 829 unchanged lines hidden ---