Update .gitignore

.gitignore

@@ -2,3 +2,6 @@ child_porn
 imageutils.test
 cpu.out
 profile.out
+*.png
+*.jpg
+*.jpeg

cmd/playground/circles/circles.go

@@ -29,14 +29,14 @@ func Circles(b image.Rectangle, radius int) chan iu.Circle {
 
 var exchange = color.ModelFunc(
 	func(c color.Color) color.Color {
-		if color.Alpha16Model.Convert(c) == color.Transparent{
+		if color.Alpha16Model.Convert(c) == color.Transparent {
 			return color.Opaque
 		}
 		return color.Transparent
 	},
 )
 
-type Exchange struct { image.Image }
+type Exchange struct{ image.Image }
 
 func (e Exchange) ColorModel() color.Model { return color.Alpha16Model }
 func (e Exchange) Bounds() image.Rectangle { return e.Image.Bounds() }
@@ -47,7 +47,7 @@ func (e Exchange) At(x, y int) color.Color {
 
 var blackAndWhite = color.ModelFunc(
 	func(c color.Color) color.Color {
-		if color.Alpha16Model.Convert(c) == color.Transparent{
+		if color.Alpha16Model.Convert(c) == color.Transparent {
 			return color.Black
 		}
 		return color.White
@@ -55,7 +55,7 @@ var blackAndWhite = color.ModelFunc(
 )
 
 // Black and white's alpha image.
-type BlackAndWhite struct { image.Image }
+type BlackAndWhite struct{ image.Image }
 
 func (b BlackAndWhite) ColorModel() color.Model { return color.GrayModel }
 func (b BlackAndWhite) Bounds() image.Rectangle { return b.Image.Bounds() }

cmd/playground/circles/colored.go

@@ -15,10 +15,10 @@ func main() {
 	circles := Circles(canvas.Bounds(), 2160/6)
 
 	palette := []color.Color{
-		color.RGBA{R:255, A:255},
+		color.RGBA{R: 255, A: 255},
-		color.RGBA{G:255, A:255},
+		color.RGBA{G: 255, A: 255},
-		color.RGBA{B:255, A:255},
+		color.RGBA{B: 255, A: 255},
 	}
 	c := palette[rand.Int()%2]
-	
+
 }

cmd/playground/circles/main.go

@@ -10,10 +10,10 @@ func main() {
 
 		draw.Draw(canvas, c.Bounds(), xor{c, canvas}, c.Bounds().Min, draw.Src)
 		/*
-		draw.DrawMask(
+			draw.DrawMask(
-			canvas, canvas.Bounds(), &image.Uniform{color.White},
+				canvas, canvas.Bounds(), &image.Uniform{color.White},
-			image.Point{}, xor{c, canvas}, image.Point{}, draw.Src,
+				image.Point{}, xor{c, canvas}, image.Point{}, draw.Src,
-		)
+			)
 		*/
 	}
 	/*

cmd/playground/circles/xor.go

@@ -11,7 +11,7 @@ func (t xor) At(x, y int) color.Color {
 	srcColor := t.ColorModel().Convert(t.src.At(x, y))
 
 	// xor operation (a || b) && !(a && b)
-	if ((dstColor == color.Opaque) || (srcColor == color.Opaque)) && 
+	if ((dstColor == color.Opaque) || (srcColor == color.Opaque)) &&
 		!((dstColor == color.Opaque) && (srcColor == color.Opaque)) {
 		return color.Opaque
 	}

cmd/playground/circles/xor_colored.go

@@ -1,3 +1 @@
 package main
-
-

cmd/playground/main.go

@@ -5,5 +5,5 @@ import (
 )
 
 func main() {
-	
+
 }

cmd/scale/downscale.go

@@ -1,4 +1,5 @@
 //go:build upsampling
+
 package main
 
 import (

cmd/scale/griddownscale.go

@@ -1,23 +1,22 @@
-packagemain
+package main
 
 import (
 	"flag"
 	"image"
 
 	"git.nkpl.cc/twocookedfaggots/imageutils/pkg/downscale"
-	"git.nkpl.cc/twocookedfaggots/imageutils/downscale"
 	"git.nkpl.cc/twocookedfaggots/imageutils/util"
 )
 
-var x = flag.Int("x", 256, "dx value of new bounds")
+var x = flag.Int("x", 1024, "dx value of new bounds")
-var y = flag.Int("y", 256, "dy value of new bounds")
+var y = flag.Int("y", 1024, "dy value of new bounds")
 
 func main() {
 	flag.Parse()
 	if err := util.ProcessStdio(func(img image.Image) image.Image {
 		return downscale.GridDownscale{
-			Image: img,
+			Image:     img,
-			Rectangle: image.Rect(0,0,x,y),
+			NewBounds: image.Rect(0, 0, *x, *y),
 		}
 	}); err != nil {
 		panic(err)

cmd/textonimage/main.go

@@ -10,29 +10,27 @@ var (
 func main() {
 	flag.Parse()
 
-		
-	
 	f, err := truetype.Parse(gomono.TTF)
-        if err != nil {
+	if err != nil {
-                panic(err)
+		panic(err)
-        }
+	}
-        face := truetype.NewFace(f, &truetype.Options{
+	face := truetype.NewFace(f, &truetype.Options{
-                Size:    float64(img.Bounds().Dx() / size),
+		Size:    float64(img.Bounds().Dx() / size),
-                DPI:     72,
+		DPI:     72,
-                Hinting: font.HintingNone,
+		Hinting: font.HintingNone,
-        })
+	})
 
-        d := &font.Drawer{
+	d := &font.Drawer{
-                Dst:  dst,
+		Dst:  dst,
-                Src:  image.NewUniform(color.Black),
+		Src:  image.NewUniform(color.Black),
-                Face: face,
+		Face: face,
-                Dot: fixed.Point26_6{fixed.Int26_6(img.Bounds().Dx() /
+		Dot: fixed.Point26_6{fixed.Int26_6(img.Bounds().Dx() /
-                        x,
+			x,
-                ),
+		),
-                        fixed.Int26_6(img.Bounds().Dy() /
+			fixed.Int26_6(img.Bounds().Dy() /
-                                y,
+				y,
-                        ),
+			),
-                },
+		},
-        }
+	}
-        d.DrawString(time.Now().Format(time.Kitchen))
+	d.DrawString(time.Now().Format(time.Kitchen))
 }

http/http.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"net/http"
 	"log"
+	"net/http"
 )
 
 type imageTransform struct {
@@ -29,14 +29,14 @@ func indexHTML(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusInternalServerError)
 		log.Println("copy error:", err)
 		return
-	}	
+	}
 }
 
 func main() {
 	http.HandleFunc("/", indexHTML)
 	http.Handle("POST /upload", imageTransform)
 
-	err := http.ListenAndServe(":8080", nil) 
+	err := http.ListenAndServe(":8080", nil)
 	if err != nil {
 		log.Panicln(err)
 	}

http/test.go

@@ -5,13 +5,13 @@
 package main
 
 import (
+	"git.nkpl.cc/twocookedfaggots/imageutils"
+	"git.nkpl.cc/twocookedfaggots/imageutils/http/blank"
 	"image"
 	"image/color"
-	"image/png"
 	"image/jpeg"
+	"image/png"
 	"os"
-"git.nkpl.cc/twocookedfaggots/imageutils"
-	"git.nkpl.cc/twocookedfaggots/imageutils/http/blank"
 )
 
 func BlankFillWhite(img image.Image) image.Image {

pkg/center/main.go

@@ -12,7 +12,7 @@ func (i Into) At(x, y int) color.Color {
 	r := image.Rect(x1, y1,
 		x1+i.Src.Bounds().Dx(), y1+i.Src.Bounds().Dy())
 	if (image.Point{x, y}).In(r) {
-		return i.Src.At(x-x1,y-y2)
+		return i.Src.At(x-x1, y-y2)
 	}
 	return i.Dst.At(x, y)
 }

pkg/dithering/grid.go

@@ -27,7 +27,7 @@ func (g grid) At(x, y int) color.Color {
 	if n == 0 {
 		return color.Black
 	}
-	step := int((side*side-1) / n)
+	step := int((side*side - 1) / n)
 	if (y*side+x)%step == 0 {
 		return color.White
 	}

pkg/downscale/grid.go

@@ -18,7 +18,7 @@ func (sub sub) At(x, y int) color.Color {
 
 type GridDownscale struct {
 	image.Image
-	newBounds image.Rectangle
+	NewBounds image.Rectangle
 }
 
 func blend(c1, c2 color.Color) color.RGBA {
@@ -39,24 +39,25 @@ func blend(c1, c2 color.Color) color.RGBA {
 }
 
 func avgColor(img image.Image) (c color.Color) {
-	dx, dy := img.Bounds().Dx(), img.Bounds().Dy()
+	b := img.Bounds()
-	for y := 0; y < dy; y++ {
+	c = img.At(b.Min.X, b.Min.Y)
-		for x := 0; x < dx; x++ {
+	for y := b.Min.Y; y < b.Max.Y; y++ {
+		for x := b.Min.X + 1; x < b.Max.X; x++ {
 			c = blend(c, img.At(x, y))
 		}
 	}
 	return
 }
 
-func (grid grid) ColorModel() color.Model { return grid.Image.ColorModel }
+func (grid GridDownscale) ColorModel() color.Model { return grid.Image.ColorModel() }
-func (grid grid) Bounds() image.Rectangle { return grid.NewBounds }
+func (grid GridDownscale) Bounds() image.Rectangle { return grid.NewBounds }
-func (grid grid) At(x, y int) color.Color {
+func (grid GridDownscale) At(x, y int) color.Color {
 	b := grid.Image.Bounds()
 	dx, dy := b.Dx(), b.Dy()
 	cellBounds := image.Rect(
 		0, 0,
-		dx/grid.newBounds.Dx(),
+		dx/grid.NewBounds.Dx(),
-		dy/grid.newBounds.Dy(),
+		dy/grid.NewBounds.Dy(),
 	)
 
 	r := grid.Image.Bounds().Intersect(
@@ -68,6 +69,7 @@ func (grid grid) At(x, y int) color.Color {
 			},
 		),
 	)
+	println(r.Min.X, r.Min.Y)
 
 	return avgColor(sub{grid.Image, r})
 }

pkg/mesh/wallpaper/swaybg.go

@@ -12,11 +12,11 @@ var err error
 
 func Wallpaper(img image.Image) error {
 	/*
-	cmd := exec.Command(
+		cmd := exec.Command(
-		"swaybg",
+			"swaybg",
-		"--image", "/dev/stdin",
+			"--image", "/dev/stdin",
-		"--mode", "fill",
+			"--mode", "fill",
-	)
+		)
 	*/
 	cmd := exec.Command("imv", "/dev/stdin")
 

pkg/mkpalette/palette.go

@@ -57,10 +57,10 @@ func main() {
 		slices.Collect(maps.Keys(p)), imgutil.ColorToHex,
 	)
 	/*
-	h := make([]hex, 0, len(s))
+		h := make([]hex, 0, len(s))
-	for i := range s {
+		for i := range s {
-		h = append(h, hex(s[i]))
+			h = append(h, hex(s[i]))
-	}
+		}
 	*/
 	err = w.Write(s)
 	check(err)

pkg/showpalette/show.go

@@ -68,7 +68,7 @@ func main() {
 			},
 		),
 	)
-	
+
 	err = png.Encode(os.Stdout, showColors{palette})
 	check(err)
 }

scale_test.go

@@ -33,7 +33,6 @@ func BenchmarkScale(b *testing.B) {
 	}
 }
 
-
 type SinglePixel struct{}
 
 func (s SinglePixel) At(x, y int) color.Color {