From: Christos Zoulas <christos@zoulas.com>
Date: Thu, 18 Dec 2014 21:56:58 +0000 (+0000)
Subject: Fix big-endian tiff images.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=999c6d3b277908e6dd1926d14dbe5711e3899703;p=file

Fix big-endian tiff images.
---

diff --git a/magic/Magdir/images b/magic/Magdir/images
index 9fda2b03..a1a877cc 100644
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: images,v 1.97 2014/12/08 16:06:19 christos Exp $
+# $File: images,v 1.98 2014/12/18 21:56:58 christos Exp $
 # images:  file(1) magic for image formats (see also "iff", and "c-lang" for
 # XPM bitmaps)
 #
@@ -115,7 +115,7 @@
 # never changed.  The TIFF specification recommends testing for it.
 0	string		MM\x00\x2a	TIFF image data, big-endian
 !:mime	image/tiff
->(4.L)	use		tiff_ifd
+>(4.L)	use		\^tiff_ifd
 0	string		II\x2a\x00	TIFF image data, little-endian
 !:mime	image/tiff
 >(4.l)	use		tiff_ifd
@@ -128,51 +128,51 @@
 >0	leshort		0x100
 >>4	lelong		1
 >>>12	use		tiff_entry
->>>8	lelong		x		\b, width=%d
+>>>8	leshort		x		\b, width=%d
 >0	leshort		0x101
 >>4	lelong		1
->>>8	lelong		x		\b, height=%d
+>>>8	leshort		x		\b, height=%d
 >>>12	use		tiff_entry
 >0	leshort		0x102
->>8	lelong		x		\b, bps=%d
+>>8	leshort		x		\b, bps=%d
 >>12	use		tiff_entry
 >0	leshort		0x103
 >>4	lelong		1		\b, compression=
->>>8	lelong		1		\bnone
->>>8	lelong		2		\bhuffman
->>>8	lelong		3		\bbi-level group 3
->>>8	lelong		4		\bbi-level group 4
->>>8	lelong		5		\bLZW
->>>8	lelong		6		\bJPEG (old)
->>>8	lelong		7		\bJPEG
->>>8	lelong		8		\bdeflate
->>>8	lelong		9		\bJBIG, ITU-T T.85
->>>8	lelong		0xa		\bJBIG, ITU-T T.43
->>>8	lelong		0x7ffe		\bNeXT RLE 2-bit
->>>8	lelong		0x8005		\bPackBits (Macintosh RLE)
->>>8	lelong		0x8029		\bThunderscan RLE
->>>8	lelong		0x807f		\bRasterPadding (CT or MP)
->>>8	lelong		0x8080		\bRLE (Line Work)
->>>8	lelong		0x8081		\bRLE (High-Res Cont-Tone)
->>>8	lelong		0x8082		\bRLE (Binary Line Work)
->>>8	lelong		0x80b2		\bDeflate (PKZIP)
->>>8	lelong		0x80b3		\bKodak DCS
->>>8	lelong		0x8765		\bJBIG
->>>8	lelong		0x8798		\bJPEG2000
->>>8	lelong		0x8799		\bNikon NEF Compressed
+>>>8	leshort		1		\bnone
+>>>8	leshort		2		\bhuffman
+>>>8	leshort		3		\bbi-level group 3
+>>>8	leshort		4		\bbi-level group 4
+>>>8	leshort		5		\bLZW
+>>>8	leshort		6		\bJPEG (old)
+>>>8	leshort		7		\bJPEG
+>>>8	leshort		8		\bdeflate
+>>>8	leshort		9		\bJBIG, ITU-T T.85
+>>>8	leshort		0xa		\bJBIG, ITU-T T.43
+>>>8	leshort		0x7ffe		\bNeXT RLE 2-bit
+>>>8	leshort		0x8005		\bPackBits (Macintosh RLE)
+>>>8	leshort		0x8029		\bThunderscan RLE
+>>>8	leshort		0x807f		\bRasterPadding (CT or MP)
+>>>8	leshort		0x8080		\bRLE (Line Work)
+>>>8	leshort		0x8081		\bRLE (High-Res Cont-Tone)
+>>>8	leshort		0x8082		\bRLE (Binary Line Work)
+>>>8	leshort		0x80b2		\bDeflate (PKZIP)
+>>>8	leshort		0x80b3		\bKodak DCS
+>>>8	leshort		0x8765		\bJBIG
+>>>8	leshort		0x8798		\bJPEG2000
+>>>8	leshort		0x8799		\bNikon NEF Compressed
 >>>8	default		x	
->>>>8	lelong		x		\b(unknown 0x%x)
+>>>>8	leshort		x		\b(unknown 0x%x)
 >>>12	use		tiff_entry
 >0	leshort		0x106		\b, PhotometricIntepretation=
->>8	lelong		0		\bWhiteIsZero
->>8	lelong		1		\bBlackIsZero
->>8	lelong		2		\bRGB
->>8	lelong		3		\bRGB Palette
->>8	lelong		4		\bTransparency Mask
->>8	lelong		5		\bCMYK
->>8	lelong		6		\bYCbCr
->>8	lelong		8		\bCIELab
->>>8	lelong		x		\b(unknown=0x%x)
+>>8	leshort		0		\bWhiteIsZero
+>>8	leshort		1		\bBlackIsZero
+>>8	leshort		2		\bRGB
+>>8	leshort		3		\bRGB Palette
+>>8	leshort		4		\bTransparency Mask
+>>8	leshort		5		\bCMYK
+>>8	leshort		6		\bYCbCr
+>>8	leshort		8		\bCIELab
+>>>8	leshort		x		\b(unknown=0x%x)
 >>12	use		tiff_entry
 # FillOrder
 >0	leshort		0x10a