# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1561993749 -7200
# Node ID 808a9e7827f1f73a9612841beed6a2472ff107df
# Parent  f1e92a9bbf089e77d5e37f7ff0799fb03e53a0f3
sane-backends/sane.cgi: libpng support

diff -r f1e92a9bbf08 -r 808a9e7827f1 sane-backends/stuff/tazpanel/sane.cgi
--- a/sane-backends/stuff/tazpanel/sane.cgi	Mon Jul 01 12:11:40 2019 +0200
+++ b/sane-backends/stuff/tazpanel/sane.cgi	Mon Jul 01 17:09:09 2019 +0200
@@ -102,6 +102,8 @@
 
 imgformat() {
 tmp=$(mktemp -u -t tazsane.XXXXXX)
+pnm2png=convert; pnm2png_cmd="> $tmp.pnm; convert $tmp.pnm png:-"
+[ "$(which pnm2png)" ] && pnm2png=pnm2png && pnm2png_cmd="|pnm2png"
 while read key name type exe pkg cmd ; do
 	case "$key" in
 	\#*)	continue
@@ -145,8 +147,7 @@
 		esac ;;
 	esac
 done <<EOT
-#png		tazsane.png		image/png		pnm2png|convert		imagemagick 	> $tmp.pnm; [ "$(which pnm2png)" ] && pnm2png < $tmp.pnm || convert $tmp.pnm png:-
-png		tazsane.png		image/png		convert		imagemagick 	> $tmp.pnm; convert $tmp.pnm png:-
+png		tazsane.png		image/png		$pnm2png	imagemagick 	$pnm2png_cmd
 jpeg		tazsane.jpg		image/jpeg		convert		imagemagick 	> $tmp.pnm; convert $tmp.pnm jpg:-
 jpeg2000	tazsane.jp2		image/jpeg2000-image	convert		imagemagick 	> $tmp.pnm; convert $tmp.pnm jp2:-
 tiff		tazsane.tiff		image/tiff		convert		imagemagick 	> $tmp.pnm; convert $tmp.pnm tiff:-
@@ -384,7 +385,7 @@
 EOT
 		esac
 		[ "$name" == "resolution" ] && f="$f onchange=showGeometry()"
-		echo "<td>$f type=\"text\" title=\"$min .. $max. $help\" size=4 maxlength=4>$u"
+		echo "<td>$f type=\"text\" title=\"$min .. $max. $help\" size=5 maxlength=5>$u"
 		res_min=$min
 		res_max=$max
 	fi