From 778fc08e5d4b58d457e1754325eb0ff4127ccf1d Mon Sep 17 00:00:00 2001
From: Nick White <git@njw.name>
Date: Mon, 13 May 2019 17:41:30 +0100
Subject: Rename cleanup to wipe, and only export main function

---
 preproc/cmd/cleanup/main.go | 62 ---------------------------------------------
 preproc/cmd/wipe/main.go    | 56 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 62 deletions(-)
 delete mode 100644 preproc/cmd/cleanup/main.go
 create mode 100644 preproc/cmd/wipe/main.go

(limited to 'preproc/cmd')

diff --git a/preproc/cmd/cleanup/main.go b/preproc/cmd/cleanup/main.go
deleted file mode 100644
index 7ea0c84..0000000
--- a/preproc/cmd/cleanup/main.go
+++ /dev/null
@@ -1,62 +0,0 @@
-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/preproc/cmd/wipe/main.go b/preproc/cmd/wipe/main.go
new file mode 100644
index 0000000..e735a0a
--- /dev/null
+++ b/preproc/cmd/wipe/main.go
@@ -0,0 +1,56 @@
+package main
+
+// TODO: add minimum size variable (default ~30%?)
+
+import (
+	"flag"
+	"fmt"
+	"image"
+	"image/draw"
+	_ "image/jpeg"
+	"image/png"
+	"log"
+	"os"
+
+	"rescribe.xyz/go.git/preproc"
+)
+
+func main() {
+	flag.Usage = func() {
+		fmt.Fprintf(os.Stderr, "Usage: wipe [-t thresh] [-w winsize] inimg outimg\n")
+		fmt.Fprintf(os.Stderr, "Wipes the sections of an image which are outside the content area.\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)
+
+	clean := preproc.Wipe(gray, *wsize, *thresh)
+
+	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)
+	}
+}
-- 
cgit v1.2.1-24-ge1ad