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,9 +15,9 @@ 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/xor_colored.go

@@ -1,3 +1 @@
 package 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,
-			Rectangle: image.Rect(0,0,x,y),
+			NewBounds: image.Rect(0, 0, *x, *y),
 		}
 	}); err != nil {
 		panic(err)

cmd/textonimage/main.go

@@ -10,8 +10,6 @@ var (
 func main() {
 	flag.Parse()
 
-		
-	
 	f, err := truetype.Parse(gomono.TTF)
 	if err != nil {
 		panic(err)

http/http.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"net/http"
 	"log"
+	"net/http"
 )
 
 type imageTransform struct {

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})
 }

scale_test.go

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