From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 1 Apr 2012 06:01:33 +0000 (+0200)
Subject: Imagemagick: write good TGAs
X-Git-Tag: xonotic-v0.7.0~61
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e6785c973c61cb822940111a2846b8163c58222b;p=xonotic%2Fxonotic.git

Imagemagick: write good TGAs
---

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index ff69cbb5..072d7731 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -204,7 +204,7 @@ reduce_jpeg2_dds()
 	i=$1; shift
 	ia=$1; shift
 	o=$1; shift; shift 
-	convert "$i" "$ia" -compose CopyOpacity -composite "$tmpdir/x.tga" && \
+	convert "$i" "$ia" -compose CopyOpacity -composite -type TrueColorMatte "$tmpdir/x.tga" && \
 	pickdxta "$dds_tool" "$dds_sepalpha" "$tmpdir/x.tga" "$o" $1
 }
 
@@ -213,7 +213,7 @@ reduce_jpeg2_dds_premul()
 	i=$1; shift
 	ia=$1; shift
 	o=$1; shift; shift 
-	convert "$i" "$ia" -compose CopyOpacity -composite "$tmpdir/x.tga" && \
+	convert "$i" "$ia" -compose CopyOpacity -composite -type TrueColorMatte "$tmpdir/x.tga" && \
 	pickdxta "$dds_tool" "$dds_prealpha" "$tmpdir/x.tga" "$o" $1
 }
 
@@ -273,7 +273,7 @@ reduce_rgba_dds()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	convert "$i" "$tmpdir/x.tga" && \
+	convert "$i" -type TrueColorMatte "$tmpdir/x.tga" && \
 	pickdxta "$dds_tool" "$dds_sepalpha" "$tmpdir/x.tga" "$o" $1
 }
 
@@ -281,7 +281,7 @@ reduce_rgba_dds_premul()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	convert "$i" "$tmpdir/x.tga" && \
+	convert "$i" -type TrueColorMatte "$tmpdir/x.tga" && \
 	pickdxta "$dds_tool" "$dds_prealpha" "$tmpdir/x.tga" "$o" $1
 }
 
@@ -306,7 +306,7 @@ reduce_rgb_dds()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	convert "$i" "$tmpdir/x.tga" && \
+	convert "$i" -type TrueColor "$tmpdir/x.tga" && \
 	"$meprefix"compress-texture "$dds_tool" "$dds_noalpha" "$tmpdir/x.tga" "$o" $1
 }
 
diff --git a/misc/tools/compress-texture b/misc/tools/compress-texture
index 5ee658c6..9e3b58e5 100755
--- a/misc/tools/compress-texture
+++ b/misc/tools/compress-texture
@@ -46,7 +46,7 @@ esac
 
 if [ -n "$fourcchack" ]; then
 	fourcchack_dir=`mktemp -d`
-	convert "$src" -fx "u*u.a" "$fourcchack_dir/src.$ext"
+	convert "$src" -fx "u*u.a" -type TrueColorMatte "$fourcchack_dir/src.$ext"
 	src="$fourcchack_dir/src.$ext"
 fi