X-Git-Url: https://git.ucc.asn.au/?p=dja%2Fscandal.git;a=blobdiff_plain;f=scan2pages.sh;h=b129963b7effba28a49baac6f935be08c7102e9b;hp=f27ecf9e2c14d540166836c8dbe6d9cc560f4f80;hb=13a56d0f2178dd64270ae0b9d6e2994de42e9c07;hpb=3a3956db5cd08a5475017090b9fd9a1ebc12b86c

diff --git a/scan2pages.sh b/scan2pages.sh
index f27ecf9..b129963 100755
--- a/scan2pages.sh
+++ b/scan2pages.sh
@@ -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
@@ -160,21 +160,46 @@ for pg in `$my_seq 1 $pages`; do
 		cp $origpnm $preppnm
 	fi;
 	
+	# check it hasn't mostly disappeared - e.g. if the scan was all black
+	# (e.g. forgot to put the book down when you first hit scan)
+	# ... not sure why such a convoluted form is required. expr doesn't like
+	# processing a convert -format "%w * %h" or any variant thereof
+	if [[ $(convert  $preppnm -format '%[fx:s.w*s.h>1000]' info:) = "0" ]]; then
+		[[ $verbose == 1 ]] && echo "Discarding pg ${pgn}: not enough remains after masking."
+		continue; 
+	fi;
+	
 	#unpaper it
 	#names go a bit funny here
 	#also, ignore flags starting here
 	unppnm=$dir/upg-${pgn}-%01d.pnm
 	unpaper $unpaperflags --layout double --overwrite --no-blackfilter -ni 10 -op 2 $preppnm $unppnm || exit 1
 
+	#detect if the page is 2-up
+	for subpg in $($my_seq 1 2); do
+		echo Processing subpg ${subpg}.
+		if $(dirname $0)/detect2pages.sh $dir/upg-${pgn}-${subpg}.pnm ${pgn} ${subpg}; then
+			if [[ $verbose == 1 ]]; then
+				echo "Resplitting subpg ${subpg}."
+			fi
+			unpaper $unpaperflags --pre-rotate 90 --layout double --overwrite --no-blackfilter -op 2 $dir/upg-${pgn}-${subpg}.pnm $dir/upg-${pgn}-${subpg}-%01d.pnm
+		else
+			cp $dir/upg-${pgn}-${subpg}.pnm $dir/upg-${pgn}-${subpg}-1.pnm
+		fi;
+
+	done;
+
 	#final convert and clean w/ bebook optimisation
 	if [[ $bebook ]]; then
-		convert $convertflags -colorspace Gray -median 1 $dir/upg-${pgn}-?.pnm -resize 1200x1600 $dir/final-${pgn}-%01d.${extension} || exit 1
+		convert $convertflags -colorspace Gray -median 1 $dir/upg-${pgn}-1-?.pnm -trim -resize 1800x2400 $dir/final-${pgn}-1-%01d.${extension} || exit 1
+		convert $convertflags -colorspace Gray -median 1 $dir/upg-${pgn}-2-?.pnm -trim -resize 1800x2400 $dir/final-${pgn}-2-%01d.${extension} || exit 1
 	else
-		convert $convertflags $dir/upg-${pgn}-?.pnm $dir/final-${pgn}-%01d.${extension} || exit 1
+		convert $convertflags $dir/upg-${pgn}-1-?.pnm $dir/final-${pgn}-1-%01d.${extension} || exit 1
+		convert $convertflags $dir/upg-${pgn}-2-?.pnm $dir/final-${pgn}-2-%01d.${extension} || exit 1
 	fi
 	
 done
 
-mkdir $dir/pages
+mkdir -p $dir/pages
 mv $dir/final-*.${extension} $dir/pages