raise the strength of the targa magic, instead of dropping the cursor magic

so that they does not get recognized as lotus 123 files. From Christoph Biedl

diff --git a/magic/Magdir/images b/magic/Magdir/images
index 3b6294edf1310a416f12ddcf5b9f2f48b43ecc3b..41cddec270149728009d17cf463ccea32ce58e69 100644 (file)
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: images,v 1.86 2013/11/19 23:56:04 christos Exp $
+# $File: images,v 1.87 2013/12/11 14:14:20 christos Exp $
 # images:  file(1) magic for image formats (see also "iff", and "c-lang" for
 # XPM bitmaps)
 #
@@ -18,14 +18,17 @@
 # `xv' recognizes only a subset of the following (RGB with pixelsize = 24)
 # `tgatoppm' recognizes a superset (Index may be anything)
 1      belong&0xfff7ffff       0x01010000      Targa image data - Map
+!:strength + 2
 >2     byte&8                  8               - RLE
 >12    leshort                 >0              %hd x
 >14    leshort                 >0              %hd
 1      belong&0xfff7ffff       0x00020000      Targa image data - RGB
+!:strength + 2
 >2     byte&8                  8               - RLE
 >12    leshort                 >0              %hd x
 >14    leshort                 >0              %hd
 1      belong&0xfff7ffff       0x00030000      Targa image data - Mono
+!:strength + 2
 >2     byte&8                  8               - RLE
 >12    leshort                 >0              %hd x
 >14    leshort                 >0              %hd

diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos
index 8b42d3d67dde91e434230c2fa55aa4f73511a4a3..b2b1fdbb4f176fe535b90722071ec349f9f1285d 100644 (file)
--- a/magic/Magdir/msdos
+++ b/magic/Magdir/msdos
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: msdos,v 1.92 2014/03/14 18:47:29 christos Exp $
+# $File: msdos,v 1.93 2014/03/28 19:06:09 christos Exp $
 # msdos:  file(1) magic for MS-DOS files
 #
 
@@ -590,7 +590,6 @@
 >4  ubyte   !0  \b, %d colors
 
 0   belong  0x00000100
-!:strength - 2
 >9  byte    0
 >>0 byte    x           MS Windows icon resource
 !:mime image/x-icon
@@ -614,7 +613,6 @@
 
 0   belong  0x00000200
 >9  byte    0
-!:strength - 2
 >>0 byte    x           MS Windows cursor resource
 !:mime image/x-cur
 >>4 use     cur-dir