From 6347acde9f7284577411eccb46c876c7fbad1a2c Mon Sep 17 00:00:00 2001 From: mdouchement <marc.douchement@gmail.com> Date: Sun, 2 Sep 2018 13:21:56 +0200 Subject: [PATCH] Updated instanciation API --- README.md | 6 +++--- data/main.go | 4 ++-- fast_bilateral.go | 10 +++++----- fast_bilateral_test.go | 4 ++-- luminance/fast_bilateral.go | 10 +++++----- luminance/fast_bilateral_test.go | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index e9937d6..a81a027 100644 --- a/README.md +++ b/README.md @@ -22,10 +22,10 @@ Please cite above paper for research purpose. ```go // Fast Bilateral -bilateral.NewFastBilateralAuto(m) +bilateral.Auto(m) // Luminance Fast Bilateral -luminance.NewFastBilateralAuto(m) +luminance.Auto(m) ``` ## Requirements @@ -47,7 +47,7 @@ defer fi.Close() m, _, _ := image.Decode(fi) start := time.Now() -fbl := bilateral.NewFastBilateral(m, 16, 0.1) +fbl := bilateral.New(m, 16, 0.1) fbl.Execute() m2 := fbl.ResultImage() // Or use `At(x, y)` func or just use `fbl` as an image.Image for chained treatments. diff --git a/data/main.go b/data/main.go index d0b9a63..719c623 100644 --- a/data/main.go +++ b/data/main.go @@ -34,11 +34,11 @@ func main() { var m2 image.Image start := time.Now() if entry["type"] == "lum" { - fbl := luminance.NewFastBilateralAuto(m) + fbl := luminance.Auto(m) fbl.Execute() m2 = fbl.ResultImage() } else { - fbl := bilateral.NewFastBilateralAuto(m) + fbl := bilateral.Auto(m) fbl.Execute() m2 = fbl.ResultImage() } diff --git a/fast_bilateral.go b/fast_bilateral.go index ba4c90e..aa9d64b 100644 --- a/fast_bilateral.go +++ b/fast_bilateral.go @@ -43,15 +43,15 @@ type FastBilateral struct { auto bool } -// NewFastBilateralAuto instanciates a new FastBilateral with automatic sigma values. -func NewFastBilateralAuto(m image.Image) *FastBilateral { - f := NewFastBilateral(m, 16, 0.1) +// Auto instanciates a new FastBilateral with automatic sigma values. +func Auto(m image.Image) *FastBilateral { + f := New(m, 16, 0.1) f.auto = true return f } -// NewFastBilateral instanciates a new FastBilateral. -func NewFastBilateral(img image.Image, sigmaSpace, sigmaRange float64) *FastBilateral { +// New instanciates a new FastBilateral. +func New(img image.Image, sigmaSpace, sigmaRange float64) *FastBilateral { dimension := 5 // default: x, y, colors (z1, z2, z3) fbl := &FastBilateral{ Image: img, diff --git a/fast_bilateral_test.go b/fast_bilateral_test.go index c57385d..49c6341 100644 --- a/fast_bilateral_test.go +++ b/fast_bilateral_test.go @@ -19,7 +19,7 @@ func TestFastBilateralColor(t *testing.T) { mi := images["base"] mo := images["filtered"] - filter := bilateral.NewFastBilateralAuto(mi) + filter := bilateral.Auto(mi) filter.Execute() if filter.ColorModel() != color.RGBAModel { @@ -47,7 +47,7 @@ func TestFastBilateralGray(t *testing.T) { mi := images["base-gray"] mo := images["base-gray-filtered"] - filter := bilateral.NewFastBilateralAuto(mi) + filter := bilateral.Auto(mi) filter.Execute() if filter.ColorModel() != color.RGBAModel { diff --git a/luminance/fast_bilateral.go b/luminance/fast_bilateral.go index d4791ac..198cc62 100644 --- a/luminance/fast_bilateral.go +++ b/luminance/fast_bilateral.go @@ -38,15 +38,15 @@ type FastBilateral struct { auto bool } -// NewFastBilateralAuto instanciates a new FastBilateral with automatic sigma values. -func NewFastBilateralAuto(m image.Image) *FastBilateral { - f := NewFastBilateral(m, 16, 0.1) +// Auto instanciates a new FastBilateral with automatic sigma values. +func Auto(m image.Image) *FastBilateral { + f := New(m, 16, 0.1) f.auto = true return f } -// NewFastBilateral instanciates a new FastBilateral. -func NewFastBilateral(m image.Image, sigmaSpace, sigmaRange float64) *FastBilateral { +// New instanciates a new FastBilateral. +func New(m image.Image, sigmaSpace, sigmaRange float64) *FastBilateral { return &FastBilateral{ Image: m, SigmaRange: sigmaRange, diff --git a/luminance/fast_bilateral_test.go b/luminance/fast_bilateral_test.go index 6f1024a..9b06ae8 100644 --- a/luminance/fast_bilateral_test.go +++ b/luminance/fast_bilateral_test.go @@ -19,7 +19,7 @@ func TestFastBilateralColor(t *testing.T) { mi := images["base"] mo := images["filtered"] - filter := luminance.NewFastBilateralAuto(mi) + filter := luminance.Auto(mi) filter.Execute() if filter.ColorModel() != color.RGBAModel { @@ -47,7 +47,7 @@ func TestFastBilateralGray(t *testing.T) { mi := images["base-gray"] mo := images["base-gray-filtered"] - filter := luminance.NewFastBilateralAuto(mi) + filter := luminance.Auto(mi) filter.Execute() if filter.ColorModel() != color.RGBAModel {