From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 29 May 2013 04:49:02 +0000 (+0200)
Subject: cwebp requires png, so be it
X-Git-Tag: xonotic-v0.7.0~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0b7aa6135e6039a3b7f1a377ec1d719ccbf49de8;p=xonotic%2Fxonotic.git

cwebp requires png, so be it
---

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index 413e148d..09c04245 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -251,8 +251,8 @@ reduce_jpeg2_webp()
 	ia=$1; shift
 	o=$1; shift; shift
 	# this one MUST run
-	convert "$i" "$ia" -compose CopyOpacity -composite -type TrueColorMatte "$tmpdir/x.tga" && \
-	cwebp $1 "$tmpdir/x.tga" -o "$o"
+	convert "$i" "$ia" -compose CopyOpacity -composite -type TrueColorMatte "$tmpdir/x.png" && \
+	cwebp $1 "$tmpdir/x.png" -o "$o"
 }
 
 reduce_jpeg_jpeg()
@@ -341,7 +341,8 @@ reduce_rgba_webp()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	cwebp $1 "$i" -o "$o"
+	convert "$i" "$tmpdir/x.png" && \
+	cwebp $1 "$tmpdir/x.png" -o "$o"
 }
 
 has_alpha()