tidy

octu0 · Apr 6, 2021 · 62b3748 · 62b3748
1 parent 7933b1e
commit 62b3748
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 27 deletions.
diff --git a/canny.go b/canny.go
@@ -106,7 +106,7 @@ func MorphologyCannyWithDilate(
  img *image.RGBA,
  thresholdMax, thresholdMin int,
  mode CannyMorphologyMode,
- morphSize int,
+ morphSize int,
  dilateSize int,
 ) (*image.RGBA, error) {
  width, height := wh(img)

diff --git a/cli/bridge/canny.go b/cli/bridge/canny.go
@@ -14,9 +14,9 @@ func cannyAction(c *cli.Context) error {
  return err
  }
 
- mode := blurry.CannyMorphologyMode(c.Int("mode"))
- size := c.Int("size")
- dilate := c.Int("dilate")
+ mode := blurry.CannyMorphologyMode(c.Int("mode"))
+ size := c.Int("size")
+ dilate := c.Int("dilate")
  out, err := blurry.MorphologyCannyWithDilate(in, c.Int("max"), c.Int("min"), mode, size, dilate)
  if err != nil {
  return err

diff --git a/cli/bridge/rotate.go b/cli/bridge/rotate.go
@@ -14,7 +14,7 @@ func rotateAction(c *cli.Context) error {
  return err
  }
 
- mode := blurry.RotationMode(c.Int("rotate"))
+ mode := blurry.RotationMode(c.Int("rotate"))
 
  out, err := blurry.Rotate(in, mode)
  if err != nil {

diff --git a/cli/genrun/canny.go b/cli/genrun/canny.go
@@ -14,24 +14,24 @@ func cannyAction(c *cli.Context) error {
  args := []string{
  c.String("max"),
  c.String("min"),
- }
+ }
 
- var cmd string = "canny"
+ var cmd string = "canny"
 
- if c.String("dilate") != "0" {
- switch c.String("mode") {
- case "0":
- cmd = "canny_dilate"
- args = append(args, c.String("dilate"))
- case "1":
- cmd = "canny_morphology_open"
- args = append(args, c.String("size"))
- args = append(args, c.String("dilate"))
- case "2":
- cmd = "canny_morphology_close"
- args = append(args, c.String("size"))
- args = append(args, c.String("dilate"))
- }
+ if c.String("dilate") != "0" {
+ switch c.String("mode") {
+ case "0":
+ cmd = "canny_dilate"
+ args = append(args, c.String("dilate"))
+ case "1":
+ cmd = "canny_morphology_open"
+ args = append(args, c.String("size"))
+ args = append(args, c.String("dilate"))
+ case "2":
+ cmd = "canny_morphology_close"
+ args = append(args, c.String("size"))
+ args = append(args, c.String("dilate"))
+ }
  }
  if err := runLocal(runtimePath, generateOutFilePath, c.String("input"), cmd, args); err != nil {
  return err

diff --git a/cli/genrun/genrun.go b/cli/genrun/genrun.go
@@ -28,11 +28,11 @@ func generate(runtimePath, blurryPath string) (string, error) {
  }
  runtimePath = realRuntimePath
 
- blurryFileName := filepath.Base(blurryPath)
- blurryDirName  := filepath.Dir(blurryPath)
- blurryExt  := filepath.Ext(blurryFileName)
- blurryGenName  := strings.Replace(blurryFileName, blurryExt, "_gen" + blurryExt, strings.LastIndex(blurryFileName, blurryExt))
- blurryGenPath  := filepath.Join(blurryDirName, blurryGenName)
+ blurryFileName := filepath.Base(blurryPath)
+ blurryDirName := filepath.Dir(blurryPath)
+ blurryExt := filepath.Ext(blurryFileName)
+ blurryGenName := strings.Replace(blurryFileName, blurryExt, "_gen"+blurryExt, strings.LastIndex(blurryFileName, blurryExt))
+ blurryGenPath := filepath.Join(blurryDirName, blurryGenName)
 
  mktemp, err := exec.Command("mktemp", "/tmp/outXXXX").Output()
  if err != nil {
@@ -63,7 +63,7 @@ func generate(runtimePath, blurryPath string) (string, error) {
  "-std=c++11",
  "-o", generateOutFilePath,
  blurryPath,
- blurryGenPath,
+ blurryGenPath,
  }
  log.Printf("info: generate %v", genArgs)