From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 21 Feb 2023 13:10:55 +0000 (+0300)
Subject: djxl produces separate alpha-channel graymap
X-Git-Url: http://www.git.stargrave.org/?p=galgen.git;a=commitdiff_plain;h=280e40f6958cc16f30899e546baf849e04e470a3

djxl produces separate alpha-channel graymap
---

diff --git a/galgen.zsh b/galgen.zsh
index 8a99740..e58c88c 100755
--- a/galgen.zsh
+++ b/galgen.zsh
@@ -6,6 +6,13 @@ pagesize=${PAGESIZE:-100}
 set -e
 setopt EXTENDED_GLOB
 
+djxl2ppm() {
+    djxl $1 $1.ppm
+    [[ -r ${1}-ec0.ppm ]] || return 0
+    mv ${1}-ec0.ppm $1.ppm
+    rm ${1}-ec1.pgm
+}
+
 imgs=((*.jxl|*.webp~*.preview.webp)(Om))
 for (( i=1 ; i <= ${#imgs} ; i++ )) {
     local img=${imgs[$i]}
@@ -40,7 +47,7 @@ EOF
             echo "<a href=\"$img.jpg\">JPEG</a>" >> $dst
         else
             [[ -r $img.png ]] || {
-                djxl $img $img.ppm
+                djxl2ppm $img
                 pamtopng < $img.ppm > $img.png
                 rm $img.ppm
                 pngcrush -rem alla -rem allb -z 2 $img.png $img.png.png
@@ -51,7 +58,7 @@ EOF
             echo "<a href=\"$img.png\">PNG</a>" >> $dst
         fi
         rm $img.info
-        [[ -r $img.preview.webp ]] || djxl $img $img.ppm
+        [[ -r $img.preview.webp ]] || djxl2ppm $img
     else
         echo "<pre>" >> $dst
         webpinfo $img >> $dst