From: Christos Zoulas <christos@zoulas.com>
Date: Thu, 1 Jan 2015 04:17:41 +0000 (+0000)
Subject: use indirect to parse the Exif data, which is really TIFF.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18db77a86cfab466658e746b6296c02c16065dac;p=file

use indirect to parse the Exif data, which is really TIFF.
---

diff --git a/magic/Magdir/jpeg b/magic/Magdir/jpeg
index 0e3a1c11..b6fd76a5 100644
--- a/magic/Magdir/jpeg
+++ b/magic/Magdir/jpeg
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: jpeg,v 1.22 2015/01/01 02:57:40 christos Exp $
+# $File: jpeg,v 1.23 2015/01/01 04:17:41 christos Exp $
 # JPEG images
 # SunOS 5.5.1 had
 #
@@ -31,6 +31,9 @@
 # Next, show thumbnail info, if it exists:
 >>18	byte		!0		\b, thumbnail %dx
 >>>19	byte		x		\b%d
+>6	string		Exif		\b, Exif standard: [
+>>12	indirect	x
+>>12	string		x		\b]
 
 # Jump to the first segment
 >(4.S+4)	use		jpeg_segment
@@ -68,11 +71,9 @@
 
 >0	beshort		0xFFE1		
 #>>(2.S+2)	use			jpeg_segment
->>4	string		Exif		Exif Standard
->>>10	string		MM		(big endian)
->>>>20	use		\^tiff_entry
->>>10	string		II		(little endian)
->>>>20	use		tiff_entry
+>>4	string		Exif		\b, Exif Standard: [
+>>>10	indirect	x		
+>>>10	string		x		\b]
 
 # Application specific markers
 >0	beshort&0xFFE0	=0xFFE0