Add a border before trimming; this allows it to be safely used on nice clean scans

diff --git a/scan2pages.sh b/scan2pages.sh
index ce588f7..45f6215 100755 (executable)
--- a/scan2pages.sh
+++ b/scan2pages.sh
@@ -18,10 +18,6 @@ __EOF__
 }
 
 ## Setup and utilities ##
-# Unpaper
-UNPAPER_PATH="/home/wheel/dja/public-html/scandal/unpaper-0.3/bin"
-PATH=$UNPAPER_PATH:$PATH
-
 # Mac OS X doesn't have seq. It has jot instead.
 Linux_seq="seq"
 Darwin_seq="jot -"
@@ -112,8 +108,9 @@ for pg in `$my_seq 1 $pages`; do
                # ... downscale, blur,
                convert $convertflags -resize 25% -depth 8 -blur 10 $origpnm $dir/pg-mask-${pgn}.pnm ||exit 1
 
-               # ... get crop co-ords
-               cropcords=$(convert -resize 400% -trim -fuzz 90% -format "%wx%h%O" $dir/pg-mask-${pgn}.pnm info: || 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)
                
                # ... crop and despeckle? the final pre-prepared image
                convert $convertflags -crop $cropcords $origpnm $preppnm || exit 1