From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 7 Nov 2010 13:52:09 +0000 (+0100)
Subject: jpegoptim is hereby FIRED (causes chroma subsampling)
X-Git-Tag: xonotic-v0.1.0preview~77
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=39c66fef1e6323a722489b5f6a7c4ca97f903e86;p=xonotic%2Fxonotic.git

jpegoptim is hereby FIRED (causes chroma subsampling)
---

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index 79956b02..be4d5b6d 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -99,15 +99,33 @@ reduce_jpeg2_jpeg2()
 	ia=$1; shift
 	o=$1; shift
 	oa=$1; shift
-	cp "$i" "$o" && jpegoptim --strip-all -m"$1" "$o" && \
-	cp "$ia" "$oa" && jpegoptim --strip-all -m"$2" "$oa"
+	if convert "$i" TGA:- | cjpeg -targa -quality "$1" -optimize -sample 1x1,1x1,1x1 > "$o"; then
+		if [ "`stat -c %s "$i"`" -lt "`stat -c %s "$o"`" ]; then
+			cp "$i" "$o"
+		fi
+	else
+		return 0
+	fi
+	if convert "$ia" TGA:- | cjpeg -targa -quality "$2" -optimize -sample 1x1,1x1,1x1 > "$oa"; then
+		if [ "`stat -c %s "$ia"`" -lt "`stat -c %s "$oa"`" ]; then
+			cp "$ia" "$oa"
+		fi
+	else
+		return 1
+	fi
 }
 
 reduce_jpeg_jpeg()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	cp "$i" "$o" && jpegoptim --strip-all -m"$1" "$o"
+	if convert "$i" TGA:- | cjpeg -targa -quality "$1" -optimize -sample 1x1,1x1,1x1 > "$o"; then
+		if [ "`stat -c %s "$i"`" -lt "`stat -c %s "$o"`" ]; then
+			cp "$i" "$o"
+		fi
+	else
+		return 0
+	fi
 }
 
 reduce_ogg_ogg()
@@ -140,10 +158,16 @@ reduce_rgba_jpeg2()
 	i=$1; shift; shift
 	o=$1; shift
 	oa=$1; shift
-	convert "$i" -alpha off     -quality 100 "$o" && \
-	convert "$i" -alpha extract -quality 100 "$oa" && \
-	jpegoptim --strip-all -m"$1" "$o" && \
-	jpegoptim --strip-all -m"$2" "$oa"
+	if convert "$i" TGA:- | cjpeg -targa -quality "$1" -optimize -sample 1x1,1x1,1x1 > "$o"; then
+		:
+	else
+		return 0
+	fi
+	if convert "$ia" TGA:- | cjpeg -targa -quality "$2" -optimize -sample 1x1,1x1,1x1 > "$oa"; then
+		:
+	else
+		return 1
+	fi
 }
 
 reduce_rgb_dds()
@@ -158,8 +182,11 @@ reduce_rgb_jpeg()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	convert "$i" -quality 100 "$o" && \
-	jpegoptim --strip-all -m"$1" "$o"
+	if convert "$i" TGA:- | cjpeg -targa -quality "$1" -optimize -sample 1x1,1x1,1x1 > "$o"; then
+		:
+	else
+		return 0
+	fi
 }
 
 has_alpha()