From 797a8dca9408eb58620bc33dde9b5da51bbfee5f Mon Sep 17 00:00:00 2001 From: Nick White Date: Fri, 24 Jul 2020 18:59:51 +0100 Subject: Update commands to use the updated interfaces --- cmd/preprocmulti/main.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'cmd/preprocmulti/main.go') diff --git a/cmd/preprocmulti/main.go b/cmd/preprocmulti/main.go index 911c791..b99909a 100644 --- a/cmd/preprocmulti/main.go +++ b/cmd/preprocmulti/main.go @@ -59,8 +59,6 @@ func main() { 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) if *binwsize == 0 { *binwsize = autowsize(b) @@ -72,11 +70,14 @@ func main() { var clean, threshimg image.Image log.Print("Precalculating integral images") - integrals := integralimg.ToAllIntegralImg(gray) + intImg := integralimg.NewImage(b) + draw.Draw(intImg, b, img, b.Min, draw.Src) + intSqImg := integralimg.NewSqImage(b) + draw.Draw(intSqImg, b, img, b.Min, draw.Src) for _, k := range ksizes { log.Print("Binarising") - threshimg = preproc.PreCalcedSauvola(integrals, gray, k, *binwsize) + threshimg = preproc.PreCalcedSauvola(*intImg, *intSqImg, img, k, *binwsize) if *btype == "zeroinv" { threshimg, err = preproc.BinToZeroInv(threshimg.(*image.Gray), img.(*image.RGBA)) -- cgit v1.2.1-24-ge1ad