change order for image convert

This commit is contained in:
Mario Fetka 2012-02-13 18:36:09 +01:00
parent 89fa16c834
commit fc04aefe84

View File

@ -138,7 +138,7 @@ convert_image() {
# Its higher so force x160 and let imagemagic decide the right wight # Its higher so force x160 and let imagemagic decide the right wight
# then add transparency to the rest of the image to fit 160x160 # then add transparency to the rest of the image to fit 160x160
log_debug "Icon Wight: $wight < Hight: $hight" log_debug "Icon Wight: $wight < Hight: $hight"
convert $src -colorspace sRGB -transparent white -background transparent \ convert -colorspace sRGB $src -transparent white -background transparent \
-resize x160 -size 160x160 xc:transparent +swap -gravity center \ -resize x160 -size 160x160 xc:transparent +swap -gravity center \
-composite -modulate 110 $dst -composite -modulate 110 $dst
builder_check_error "converting image" builder_check_error "converting image"
@ -146,14 +146,14 @@ convert_image() {
# Its wider so force 160x and let imagemagic decide the right hight # Its wider so force 160x and let imagemagic decide the right hight
# then add transparency to the rest of the image to fit 160x160 # then add transparency to the rest of the image to fit 160x160
log_debug "Icon Wight: $wight > Hight: $hight" log_debug "Icon Wight: $wight > Hight: $hight"
convert $src -colorspace sRGB -transparent white -background transparent \ convert -colorspace sRGB $src -transparent white -background transparent \
-resize 160x -size 160x160 xc:transparent +swap -gravity center \ -resize 160x -size 160x160 xc:transparent +swap -gravity center \
-composite -modulate 110 $dst -composite -modulate 110 $dst
builder_check_error "converting image" builder_check_error "converting image"
elif [ $wight -eq $hight ] ; then elif [ $wight -eq $hight ] ; then
# Its scare so force 160x160 # Its scare so force 160x160
log_debug "Icon Wight: $wight = Hight: $hight" log_debug "Icon Wight: $wight = Hight: $hight"
convert $src -colorspace sRGB -transparent white -background transparent \ convert -colorspace sRGB $src -transparent white -background transparent \
-resize 160x160 -size 160x160 xc:transparent +swap -gravity center \ -resize 160x160 -size 160x160 xc:transparent +swap -gravity center \
-composite -modulate 110 $dst -composite -modulate 110 $dst
builder_check_error "converting image" builder_check_error "converting image"
@ -161,7 +161,7 @@ convert_image() {
# Imagemagic is unable to detect the aspect ratio so just force 160x160 # Imagemagic is unable to detect the aspect ratio so just force 160x160
# this could result in streched images # this could result in streched images
log_debug "Icon Wight: $wight unknown Hight: $hight" log_debug "Icon Wight: $wight unknown Hight: $hight"
convert $src -colorspace sRGB -transparent white -background transparent \ convert -colorspace sRGB $src -transparent white -background transparent \
-resize 160x160 xc:transparent +swap -gravity center -composite \ -resize 160x160 xc:transparent +swap -gravity center -composite \
-modulate 110 $dst -modulate 110 $dst
builder_check_error "converting image" builder_check_error "converting image"