X-Git-Url: https://git.ucc.asn.au/?p=dja%2Fscandal.git;a=blobdiff_plain;f=scan2pages.sh;h=321d31ca647a3c9e2927b72bc08026ef4f2fc22b;hp=399e1c2c06e716948b5e5a19e0ddb73314a5d05b;hb=fd2bfda99261fbf0b9b1f78bf00b5d86e420d679;hpb=820f188e1c9610501aef9290a81b78335cc41a8d

diff --git a/scan2pages.sh b/scan2pages.sh
index 399e1c2..321d31c 100755
--- a/scan2pages.sh
+++ b/scan2pages.sh
@@ -44,7 +44,7 @@ skipmask=
 verbose=
 extension="png"
 bebook=
-while getopts 'vd:sfpmucF:' OPTION
+while getopts 'vd:D:sfpmucF:b' OPTION
 do
 	case $OPTION in
 	v)	verbose=1
@@ -148,11 +148,11 @@ for pg in `$my_seq 1 $pages`; do
 	if [[ ! $skipmask && ( ! $([ -e $preppnm ]) || $forcemask ) ]]; then
 		# create mask: 
 		# ... downscale, blur,
-		convert $convertflags -resize 25% -depth 8 -blur 10 $origpnm $dir/pg-mask-${pgn}.pnm ||exit 1
+		convert $convertflags -resize 10% -depth 8 -blur 10 -median 2 $origpnm $dir/pg-mask-${pgn}.pnm ||exit 1
 
 		# ... get crop co-ords. They're off by ~2 as I don't know how to
 		# properly correct for the border.
-		cropcords=$(convert -border 1x1 -bordercolor '#000' -resize 400% -trim -fuzz 90% -format "%wx%h%O" $dir/pg-mask-${pgn}.pnm info: || exit 1)
+		cropcords=$(convert -border 1x1 -bordercolor '#000' -resize 1000% -trim -fuzz 90% -format "%wx%h%O" $dir/pg-mask-${pgn}.pnm info: || exit 1)
 		
 		# ... crop and despeckle? the final pre-prepared image
 		convert $convertflags -crop $cropcords $origpnm $preppnm || exit 1
@@ -168,7 +168,7 @@ for pg in `$my_seq 1 $pages`; do
 
 	#final convert and clean w/ bebook optimisation
 	if [[ $bebook ]]; then
-		convert $convertflags $dir/upg-${pgn}-?.pnm -depth 4 -resize 600x800 final-${pgn}-%01d.${extension} || exit 1
+		convert $convertflags -colorspace Gray -median 1 $dir/upg-${pgn}-?.pnm -resize 1200x1600 $dir/final-${pgn}-%01d.${extension} || exit 1
 	else
 		convert $convertflags $dir/upg-${pgn}-?.pnm $dir/final-${pgn}-%01d.${extension} || exit 1
 	fi
@@ -176,5 +176,5 @@ for pg in `$my_seq 1 $pages`; do
 done
 
 mkdir $dir/pages
-mv $dir/upg-*.${extension} $dir/pages
+mv $dir/final-*.${extension} $dir/pages