Take out a hack only useful for a particular old book scan; use png in intermediate...

diff --git a/scan2pages.sh b/scan2pages.sh
index 025205d..6d232f5 100755 (executable)
--- a/scan2pages.sh
+++ b/scan2pages.sh
@@ -131,10 +131,10 @@ for pg in `$my_seq 1 $pages`; do
        pgn=$(printf '%03d' $pg)
        
        # convert from pdf
-       origpnm=$dir/pg-${pgn}.pnm
+       origfile=$dir/pg-${pgn}.png
        if [ ! -e $origpnm ] || [[ $forcepdf ]]; then
                convert $convertflags -depth $depth -density $dpi $file[$(expr $pg - 1)] \
-                       $origpnm || exit 1
+                       $origfile || exit 1
        fi;
        
        # preprocess it!
@@ -142,11 +142,11 @@ for pg in `$my_seq 1 $pages`; do
        if [[ ! $skipmask ]] && ( [ ! -e $preppnm ] || [[ $forcemask ]] ); then
                # create mask: 
                # ... downscale, blur,
-               convert $convertflags -resize 10% -depth 8 -blur 10 -median 2 $origpnm $dir/pg-mask-${pgn}.pnm ||exit 1
+               convert $convertflags -resize 10% -depth 8 -blur 10 -median 2 $origfile $dir/pg-mask-${pgn}.png ||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 1000% -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}.png info: || exit 1)
                
                # ... crop and despeckle? the final pre-prepared image
                convert $convertflags -crop $cropcords $origpnm $preppnm || exit 1
@@ -165,7 +165,7 @@ for pg in `$my_seq 1 $pages`; do
        #names go a bit funny here
        unppnmbase=$dir/upg-${pgn}
        if [ ! -e ${unppnmbase}-1.pnm ] || [ ! -e ${unppnmbase}-2.pnm ] || [[ $forceunpaper ]]; then
-               unpaper $unpaperflags --layout double --overwrite --no-blackfilter -ni 10 -op 2 $preppnm ${unppnmbase}-%01d.pnm || exit 1
+               unpaper $unpaperflags --layout double --overwrite -ni 10 -op 2 $preppnm ${unppnmbase}-%01d.pnm || exit 1
        fi;
        
        #detect if the page is 2-up
@@ -175,7 +175,7 @@ for pg in `$my_seq 1 $pages`; do
                        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
+                       unpaper $unpaperflags --pre-rotate 90 --layout double --overwrite -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;