boyska 8 лет назад
Родитель
Сommit
e02a67ba31
2 измененных файлов с 4 добавлено и 2 удалено
  1. 1 0
      etc/splitall.rc
  2. 3 2
      usr/local/bin/unwarpall

+ 1 - 0
etc/splitall.rc

@@ -1,4 +1,5 @@
 colordetect='colordetect --hue 180 --min-value 80 --param2 20 --coordinates - --cut-left 30% --cut-right 30% --cut-top 10% --cut-bottom 10% --min-dist 10% --min-radius 1% --max-radius 6%'
 imagecut=imagecut
+unwarp_calib=''
 
 # vim: set ft=sh:

+ 3 - 2
usr/local/bin/unwarpall

@@ -4,6 +4,7 @@ set -e
 set -u
 
 unwarper=ppmunwarp
+unwarp_calib=""
 TMPDIR=${TMPDIR:-/tmp}
 [[ -f /etc/splitall.rc ]] && source /etc/splitall.rc
 
@@ -23,13 +24,13 @@ calibrate() {
 	if [[ ! -f "$dir/unwarp.L" ]]; then
 		unwarpcalibration=$(ls -1 $dir/*.L.jpg| sort| head -n1)
 		convert $unwarpcalibration "${unwarpcalibration%.jpg}.ppm"
-		$unwarper -c "${unwarpcalibration%.jpg}.ppm" > "$dir/unwarp.L" 
+		$unwarper $unwarp_calib -c "${unwarpcalibration%.jpg}.ppm" > "$dir/unwarp.L" 
 		rm "${unwarpcalibration%.jpg}.ppm"
 	fi
 	if [[ ! -f "$dir/unwarp.R" ]]; then
 		unwarpcalibration=$(ls -1 $dir/*.R.jpg| sort| head -n1)
 		convert $unwarpcalibration "${unwarpcalibration%.jpg}.ppm"
-		$unwarper -c "${unwarpcalibration%.jpg}.ppm" > "$dir/unwarp.R" 
+		$unwarper $unwarp_calib -c "${unwarpcalibration%.jpg}.ppm" > "$dir/unwarp.R" 
 		rm "${unwarpcalibration%.jpg}.ppm"
 	fi
 }