From b32f1000ca413302a3bc1f9dec81eeade8eed345 Mon Sep 17 00:00:00 2001
From: Petr Pavlu <setup@dagobah.cz>
Date: Thu, 21 Jul 2011 19:52:23 +0200
Subject: [PATCH] Improve magic of uncompressed TGA files

---
 freedesktop.org.xml.in |    9 ++++++++-
 tests/list             |    2 ++
 tests/test2.tga        |  Bin 0 -> 1244 bytes
 3 files changed, 10 insertions(+), 1 deletions(-)
 create mode 100644 tests/test2.tga

diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index 5e83ee7..cf08bb7 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -4336,7 +4336,14 @@ command to generate the output files.
       <match type="string" value="\0\3" offset="1"/>
       <match type="string" value="\0\xa" offset="1"/>
       <match type="string" value="\0\xb" offset="1"/>
-      <match type="string" value="\0\2" offset="1"/> <!-- Same magic as CUR files -->
+    </magic>
+    <magic priority="50">
+      <match type="string" value="\0\2" offset="1">
+        <match type="byte" value="0x08" offset="16"/>
+        <match type="byte" value="0x10" offset="16"/>
+        <match type="byte" value="0x18" offset="16"/>
+        <match type="byte" value="0x20" offset="16"/>
+      </match>
     </magic>
     <glob pattern="*.icb"/>
     <glob pattern="*.tga"/>
diff --git a/tests/list b/tests/list
index 5373a1f..efbbfa6 100644
--- a/tests/list
+++ b/tests/list
@@ -36,6 +36,8 @@ test.ps  application/postscript
 test.psd image/vnd.adobe.photoshop
 test.sgi image/x-sgi ox
 test.tga image/x-tga
+# Uncompressed TGA
+test2.tga image/x-tga
 test.tif image/tiff
 test.xbm image/x-xbitmap ox
 test.xcf image/x-xcf
diff --git a/tests/test2.tga b/tests/test2.tga
new file mode 100644
index 0000000000000000000000000000000000000000..518013f17f6362c6b0034c4b3f6abb14228ff332
GIT binary patch
literal 1244
zcmV<21S9(Z00IC2000000000K02BZi01sio22q<LPmU-<UROAAbWLe_PDzARMxb3!
zm^)~tB%r(>t+^_yx)-g+7P{X6zvBR<<Qlm58PW0;(-~~K7hSL;M2tvRV^l#~U`KI&
zI#7^1OQJwlr$AVoGKIDvv9%$ixjVbcA(_r2w9y=@-7TWwH?8a#u_;x#C{naLK#W07
za#&e@X<=`YKx>9TSdutGt4n5*Ig*k^t*14lur-~@IGWr!n#44o%{rLdG@{cvkt$ES
z9$LafPnbJKdR|;~Y-4wDTTpmEQI}Fxu2O4=SbUX0k-RsZtWlk@N`Sskmd8n`zAlr?
zN|n(;drV``L2b)2R=7V)oJd`KP)~M=U0{YmMWS6-qFhglPi~@YZLMy8tY>PYV1Tq|
ze7Q!D)<A#CSZvKfVrpB{PC@8OPRU6}!(L62ZbDpwOgoBFOR#D%n`ktUQ&EOqWtU}N
zsB?3sS!%6UV7pmpx?x|(Zfe0=RC8C|UpVkRGTT5U%0^A5Xi9pJSw?_bLWFoIh+`*{
zl018iNREYCfRtE^iE6QSRK9jl$9Y7wbwt5(SBhE1c2(RqF2Ob@qE9!ZXDx(%JzkJW
zMu}WGab7TRpD=!^J%yP-goQY(j9ihDY^i%nxq3~!fl#=HSA#s|a7oTsKEp&9rav-{
zZ#{f;Qe2u^N_}B8YJW6mktcVbFNUBfZIMEerChVAV8@h8%8*0Mno7lsVTV)bdO^K$
zLd;<%m|-EGS2lWESxawePjzB7Ph}udk}gcDHA$)<Te~=jyGW6^QopcN+_Fy7u~y@i
zOodRwYE`{jK($yUqDVV@NH}jqPe({cH%mnxIcYjKgDXX;AWo?sTE8)B&K{GyFQ&6E
z*tt{2vNqnpIcHtFZDF!(K%iJ0Z%90FG(1>FR6I^mB~3{eKUW|se?2*eBt(fJQmZCm
z!z+=m8KSNyw609hv_9OmLS8n#Nma04Ie=>|c3MnSOG-mdK`38HC|g?|SXCG?aW-9p
z8eWVTOn(f0nkSZuBd(KB&6`B$piJtqR%kk<Z!@xRPjzA`Vq{QETTDJyVK8P{EnZ3w
zQCJ>IZ6QW;E?jjKSA8aApemKBN~)ke%8)zZpit<fN^v-re@d=+PkdfIT3%9OeP=ac
zavVu>A6IK3RAm!TbrDc-Do<%CYj7)bdpnPdMZ%0evx+mlrb6PaT!}fMd`X;<Q+an*
zUwd0od}c#jcQ;*aCuU<WU~CssgAYr18CPZ}aAYBXcsinxNx76-;EPkwmsst>QkOrF
ztzLDQUTvjodYnLFg=0i+d^c@=CsBPNWOpWTZXb1F8DCfvY-cHdWi_daSJ#19`Gr{R
zl34GZXOK~uonw5YTau)0d5u$Mh*@TaVl!E9FLHM^VS7z-U`~KIM1o5_eMmf?R$Rbv
zTI7;m?4Dfyk%9l6h;&u6iARZ*UXhqokfus|l}~tqQ%jO#J9=e7cvDH1Jzj@BL3%S_
zavp7#IAz9UZ`*Bn+-`dJf|u=ZyKXSJj6t53WQUnlmWxJ?m_~AiHcEy-Rh?Hch(a}{
zBS4D|UaTKtnHyt_A6vLLX5&49?PHAdQ>^J$#{d8T0000008~;{MOH~uNl#8KSVl=q
GMJ@pS5e{eo

literal 0
HcmV?d00001

-- 
1.7.6