add more tags

XXX: Indirect string offsets are probably wrong.

diff --git a/magic/Magdir/images b/magic/Magdir/images
index a1a877cca80c4637990aeab5f08d947fe9d032c6..3d07284f1ec3b0b9e49bae6eb8e98467e55cad88 100644 (file)
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: images,v 1.98 2014/12/18 21:56:58 christos Exp $
+# $File: images,v 1.99 2015/01/01 02:58:07 christos Exp $
 # images:  file(1) magic for image formats (see also "iff", and "c-lang" for
 # XPM bitmaps)
 #
@@ -186,21 +186,54 @@
 >0     leshort         0x10e
 >>(8.l)        string          x               \b, description=%s
 >>>12  use             tiff_entry
+# Make
+>0     leshort         0x10f
+>>&(8.l+28)    string  x               \b, manufacturer=%s
+>>>12  use             tiff_entry
+# Model
+>0     leshort         0x110
+>>&(8.l+28)    string  x               \b, model=%s
+>>>12  use             tiff_entry
 # StripOffsets
 >0     leshort         0x111
 >>12   use             tiff_entry
+# XResolution
+>0     leshort         0x11a
+>>8    lelong          x               \b, xresolution=%d
+>>12   use             tiff_entry
+# YResolution
+>0     leshort         0x11b
+>>8    lelong          x               \b, yresolution=%d
+>>12   use             tiff_entry
+# ResolutionUnit
+>0     leshort         0x128
+>>8    leshort         x               \b, resolutionunit=%d
+>>12   use             tiff_entry
+# Software
+>0     leshort         0x131
+>>&(8.l+28)    string  x               \b, software=%s
+>>>12  use             tiff_entry
 # NewSubFileType
 >0     leshort         0xfe
 >>12   use             tiff_entry
 # Datetime
 >0     leshort         0x132
->>(8.l)        string          x               \b, datetime=%s
+>>&(8.l+28)    string  x               \b, datetime=%s
 >>>12  use             tiff_entry
 # HostComputer
 >0     leshort         0x13c
->>(8.l)        string          x               \b, hostcomputer=%s
+>>&(8.l+28)    string  x               \b, hostcomputer=%s
+>>>12  use             tiff_entry
+# Copyright
+>0     leshort         0x8298
+>>&(8.l+28)    string  x               \b, copyright=%s
 >>>12  use             tiff_entry
+# ExifOffset
+>0     leshort         0x8769
+>>>12  use             tiff_entry
+
 #>0    leshort         x               \b, unknown=0x%x
+#>>>12 use             tiff_entry
 
 0      string          MM\x00\x2b      Big TIFF image data, big-endian
 !:mime image/tiff