From 019698126f64ddf9fdec9a602a94a1331274c606 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 21 Jun 2010 15:09:03 +0200 Subject: [PATCH 1/1] generate-jpeg: minor fixes --- misc/tools/generate-jpeg.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/misc/tools/generate-jpeg.sh b/misc/tools/generate-jpeg.sh index f9ba64a9..6c88ccbe 100755 --- a/misc/tools/generate-jpeg.sh +++ b/misc/tools/generate-jpeg.sh @@ -3,19 +3,14 @@ set -e : ${qual:=95} +: ${qual_alpha:=99} for X in "$@"; do case "$X" in *.jpg) - if [ -n "$scaledown" ]; then - mogrify -geometry "$scaledown" -quality 100 "$X" - fi jpegoptim --strip-all -m$qual "$X" ;; *.png|*.tga) - if [ -n "$scaledown" ]; then - mogrify -geometry "$scaledown" -quality 100 "$X" - fi if convert "$X" -depth 16 RGBA:- | perl -e 'while(read STDIN, $_, 8) { substr($_, 6, 2) eq "\xFF\xFF" or exit 1; ++$pix; } exit not $pix;'; then echo "$X has no alpha, converting" convert "$X" -quality 100 "${X%.*}.jpg" @@ -25,7 +20,8 @@ for X in "$@"; do echo "$X has alpha, converting twice" convert "$X" -alpha extract -quality 100 "${X%.*}.jpg" convert "$X" -alpha off -quality 100 "${X%.*}_alpha.jpg" - jpegoptim --strip-all -m$qual "${X%.*}_alpha.jpg" + jpegoptim --strip-all -m$qual "${X%.*}.jpg" + jpegoptim --strip-all -m$qual_alpha "${X%.*}_alpha.jpg" rm -f "$X" fi ;; -- 2.39.2