From: bones_was_here <bones_was_here@xa.org.au>
Date: Sat, 19 Feb 2022 11:20:26 +0000 (+1000)
Subject: Work around imagemagick regression that puts everything upside down
X-Git-Tag: xonotic-v0.8.5~19^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e7a15fe087a0004525df0d3fc6f2ff84598f71e4;p=xonotic%2Fxonotic-maps.pk3dir.git

Work around imagemagick regression that puts everything upside down
---

diff --git a/textures/alphamod/make.sh b/textures/alphamod/make.sh
index 4f7e30eb..9c900da7 100644
--- a/textures/alphamod/make.sh
+++ b/textures/alphamod/make.sh
@@ -3,6 +3,7 @@ for x in `seq 0 100`; do
 	a=$(($x * 20 / 9))
 	b=$((33 + $x * 20 / 9))
 	convert \
+		-auto-orient \
 		-size 128x128 \
 		xc:"rgb($a,$a,$a)" \
 		-fill "rgb($b,$b,$b)" \
diff --git a/textures/exomorphx/makenorms.sh b/textures/exomorphx/makenorms.sh
index e297cf48..8d32049e 100644
--- a/textures/exomorphx/makenorms.sh
+++ b/textures/exomorphx/makenorms.sh
@@ -14,6 +14,6 @@ for X in */*_norm.tga; do
 	echo "change 1"
 	../../../../misc/tools/fft-normalmap-to-heightmap-soft.sh "$X" "$X" none 0.017 0
 	echo "."
-	convert "$X" -alpha extract "out/`echo "$X" | tr / -`"
+	convert "$X" -auto-orient -alpha extract "out/`echo "$X" | tr / -`"
 done
 echo "wq"
diff --git a/textures/phillipk1x/makenorms.sh b/textures/phillipk1x/makenorms.sh
index 11cc2d6e..01bcbf29 100644
--- a/textures/phillipk1x/makenorms.sh
+++ b/textures/phillipk1x/makenorms.sh
@@ -8,6 +8,6 @@ for X in */*_norm.tga; do
 	echo "change 1"
 	../../../../misc/tools/fft-normalmap-to-heightmap-soft.sh "$X" "$X" none 0.149 0
 	echo "."
-	convert "$X" -alpha extract "out/`echo "$X" | tr / -`"
+	convert "$X" -auto-orient -alpha extract "out/`echo "$X" | tr / -`"
 done
 echo "wq"
diff --git a/textures/phillipk2x/makenorms.sh b/textures/phillipk2x/makenorms.sh
index d7a31c7a..9b423e92 100644
--- a/textures/phillipk2x/makenorms.sh
+++ b/textures/phillipk2x/makenorms.sh
@@ -8,6 +8,6 @@ for X in */*_norm.tga; do
 	echo "change 1"
 	../../../../misc/tools/fft-normalmap-to-heightmap-soft.sh "$X" "$X" none 0.149 0
 	echo "."
-	convert "$X" -alpha extract "out/`echo "$X" | tr / -`"
+	convert "$X" -auto-orient -alpha extract "out/`echo "$X" | tr / -`"
 done
 echo "wq"