PR/496: Add more image formats

diff --git a/magic/Magdir/images b/magic/Magdir/images
index b962cec2aacd6193a0a2423c5c06f4dbe5a98657..2372f32652424ae4dfa0075412df99a78e755290 100644 (file)
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: images,v 1.110 2015/11/09 17:02:41 christos Exp $
+# $File: images,v 1.111 2015/11/09 18:21:05 christos Exp $
 # images:  file(1) magic for image formats (see also "iff", and "c-lang" for
 # XPM bitmaps)
 #
@@ -1152,4 +1152,38 @@
 # icon type
 >>8    string          x               \b, "%4.4s" type
 
-
+# TIM images
+0              lelong          0x00000010      TIM image,
+>4             lelong          0x8             4-Bit,
+>4             lelong          0x9             8-Bit,
+>4             lelong          0x2             15-Bit,
+>4             lelong          0x3             24-Bit,
+>4             lelong          &8
+>>(8.l+12)     leshort         x               Pixel at (%d,
+>>(8.l+14)     leshort         x               \b%d)
+>>(8.l+16)     leshort         x               Size=%dx
+>>(8.l+18)     leshort         x               \b%d,
+>>4            lelong          0x8             16 CLUT Entries at
+>>4            lelong          0x9             256 CLUT Entries at
+>>12           leshort         x               (%d,
+>>14           leshort         x               \b%d)
+>4             lelong          ^8
+>>12           leshort         x               Pixel at (%d,
+>>14           leshort         x               \b%d)
+>>16           leshort         x               Size=%dx
+>>18           leshort         x               \b%d
+
+# MDEC streams
+0              lelong          0x80010160      MDEC video stream,
+>16            leshort         x               %dx
+>18            leshort         x               \b%d
+#>8            lelong          x               %d frames
+#>4            leshort         x               secCount=%d;
+#>6            leshort         x               nSectors=%d;
+#>12           lelong          x               frameSize=%d;
+
+# BS encoded bitstreams
+2              leshort         0x3800          BS image,
+>6             leshort         x               Version %d,
+>4             leshort         x               Quantization %d,
+>0             leshort         x               (Decompresses to %d words)