Rename cleanup package to preproc, and add basic cmd version

7 files changed, 64 insertions, 2 deletions

diff --git a/preproc/cmd/cleanup/main.go b/preproc/cmd/cleanup/main.go
new file mode 100644
index 0000000..7ea0c84
--- /dev/null
+++ b/preproc/cmd/cleanup/main.go
@@ -0,0 +1,62 @@
+package main
+
+// TODO: add minimum size variable (default ~30%?)
+// TODO: make into a small library
+// TODO: have the integral image specific stuff done by interface functions
+
+import (
+	"flag"
+	"fmt"
+	"image"
+	"image/draw"
+	_ "image/jpeg"
+	"image/png"
+	"log"
+	"os"
+
+	"rescribe.xyz/go.git/binarize"
+	"rescribe.xyz/go.git/preproc"
+)
+
+func main() {
+	flag.Usage = func() {
+		fmt.Fprintf(os.Stderr, "Usage: cleanup [-t thresh] [-w winsize] inimg outimg\n")
+		flag.PrintDefaults()
+	}
+	wsize := flag.Int("w", 5, "Window size for mask finding algorithm.")
+	thresh := flag.Float64("t", 0.05, "Threshold for the proportion of black pixels below which a window is determined to be the edge.")
+	flag.Parse()
+	if flag.NArg() < 2 {
+		flag.Usage()
+		os.Exit(1)
+	}
+
+	f, err := os.Open(flag.Arg(0))
+	defer f.Close()
+	if err != nil {
+		log.Fatalf("Could not open file %s: %v\n", flag.Arg(0), err)
+	}
+	img, _, err := image.Decode(f)
+	if err != nil {
+		log.Fatalf("Could not decode image: %v\n", err)
+	}
+	b := img.Bounds()
+	gray := image.NewGray(image.Rect(0, 0, b.Dx(), b.Dy()))
+	draw.Draw(gray, b, img, b.Min, draw.Src)
+
+	integral := binarize.Integralimg(gray)
+
+	lowedge, highedge := preproc.Findedges(integral, *wsize, *thresh)
+
+	clean := preproc.Wipesides(gray, lowedge, highedge)
+
+	f, err = os.Create(flag.Arg(1))
+	if err != nil {
+		log.Fatalf("Could not create file %s: %v\n", flag.Arg(1), err)
+	}
+	defer f.Close()
+	err = png.Encode(f, clean)
+	if err != nil {
+		log.Fatalf("Could not encode image: %v\n", err)
+	}
+}
diff --git a/cleanup/testdata/pg1.png b/preproc/testdata/pg1.png
index c7c4249..c7c4249 100644
--- a/cleanup/testdata/pg1.png
+++ b/preproc/testdata/pg1.png
diff --git a/cleanup/testdata/pg1_integralwipesides_t0.02_w5.png b/preproc/testdata/pg1_integralwipesides_t0.02_w5.png
index 6b4ccb2..6b4ccb2 100644
--- a/cleanup/testdata/pg1_integralwipesides_t0.02_w5.png
+++ b/preproc/testdata/pg1_integralwipesides_t0.02_w5.png
diff --git a/cleanup/testdata/pg1_integralwipesides_t0.05_w25.png b/preproc/testdata/pg1_integralwipesides_t0.05_w25.png
index 39dc88d..39dc88d 100644
--- a/cleanup/testdata/pg1_integralwipesides_t0.05_w25.png
+++ b/preproc/testdata/pg1_integralwipesides_t0.05_w25.png
diff --git a/cleanup/testdata/pg1_integralwipesides_t0.05_w5.png b/preproc/testdata/pg1_integralwipesides_t0.05_w5.png
index 50df855..50df855 100644
--- a/cleanup/testdata/pg1_integralwipesides_t0.05_w5.png
+++ b/preproc/testdata/pg1_integralwipesides_t0.05_w5.png
diff --git a/cleanup/wipesides.go b/preproc/wipesides.go
index ce3b374..2afe1d2 100644
--- a/cleanup/wipesides.go
+++ b/preproc/wipesides.go
@@ -1,4 +1,4 @@
-package cleanup
+package preproc
 
 // TODO: add minimum size variable (default ~30%?)
 // TODO: have the integral image specific stuff done by interface functions
diff --git a/cleanup/wipesides_test.go b/preproc/wipesides_test.go
index aa3e590..76151fb 100644
--- a/cleanup/wipesides_test.go
+++ b/preproc/wipesides_test.go
@@ -1,4 +1,4 @@
-package cleanup
+package preproc
 
 // TODO: add different pages as test cases
 // TODO: test non integral img version