djxl produces separate alpha-channel graymap

[galgen.git] / galgen.zsh

diff --git a/galgen.zsh b/galgen.zsh
index 5d16919c3b23b20baa52f84ca20ef5e50130670d..e58c88cd9f417034f7a083353cf6bf15a109106c 100755 (executable)
--- a/galgen.zsh
+++ b/galgen.zsh
@@ -1,10 +1,17 @@
 #!/usr/bin/env zsh
-# Copyright (C) 2022 Sergey Matveev <stargrave@stargrave.org>
+# Copyright (C) 2022-2023 Sergey Matveev <stargrave@stargrave.org>
+
+pagesize=${PAGESIZE:-100}
 
 set -e
 setopt EXTENDED_GLOB
 
-pagesize=100
+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++ )) {
@@ -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