cherry-pick.FILE5_18-7-g2c947ac.raise-the-strength-of-the-targa.patch 1.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. Upstream-Author: Christos Zoulas <christos@zoulas.com>
  2. Date: Sun Mar 30 21:41:45 2014 +0000
  3. Commit: 2c947accbc7066cf1c78a9268a1d5b27ab798945
  4. Description:
  5. raise the strength of the targa magic, instead of dropping the cursor magic
  6. so that they does not get recognized as lotus 123 files. From Christoph Biedl
  7. --- a/magic/Magdir/images
  8. +++ b/magic/Magdir/images
  9. @@ -18,14 +18,17 @@
  10. # `xv' recognizes only a subset of the following (RGB with pixelsize = 24)
  11. # `tgatoppm' recognizes a superset (Index may be anything)
  12. 1 belong&0xfff7ffff 0x01010000 Targa image data - Map
  13. +!:strength + 2
  14. >2 byte&8 8 - RLE
  15. >12 leshort >0 %hd x
  16. >14 leshort >0 %hd
  17. 1 belong&0xfff7ffff 0x00020000 Targa image data - RGB
  18. +!:strength + 2
  19. >2 byte&8 8 - RLE
  20. >12 leshort >0 %hd x
  21. >14 leshort >0 %hd
  22. 1 belong&0xfff7ffff 0x00030000 Targa image data - Mono
  23. +!:strength + 2
  24. >2 byte&8 8 - RLE
  25. >12 leshort >0 %hd x
  26. >14 leshort >0 %hd
  27. --- a/magic/Magdir/msdos
  28. +++ b/magic/Magdir/msdos
  29. @@ -590,7 +590,6 @@
  30. >4 ubyte !0 \b, %d colors
  31. 0 belong 0x00000100
  32. -!:strength - 2
  33. >9 byte 0
  34. >>0 byte x MS Windows icon resource
  35. !:mime image/x-icon
  36. @@ -614,7 +613,6 @@
  37. 0 belong 0x00000200
  38. >9 byte 0
  39. -!:strength - 2
  40. >>0 byte x MS Windows cursor resource
  41. !:mime image/x-cur
  42. >>4 use cur-dir