deps: Formally replace gg. (#359)

This commit replaces the references in our codebase to import our
version of gg. The risk of the previous method is other modules don't
also make the override.

Author: betterengineering

go.mod

@@ -2,13 +2,10 @@ module tidbyt.dev/pixlet
 
 go 1.19
 
-replace github.com/fogleman/gg => github.com/tidbyt/gg v0.0.0-20220808163829-95806fa1d427
-
 require (
 	github.com/antchfx/xmlquery v1.3.12
 	github.com/dustin/go-humanize v1.0.0
 	github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4
-	github.com/fogleman/gg v1.3.0
 	github.com/fsnotify/fsnotify v1.5.4
 	github.com/go-playground/validator/v10 v10.11.0
 	github.com/google/pprof v0.0.0-20220729232143-a41b82acbcb1
@@ -24,6 +21,7 @@ require (
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 	github.com/spf13/cobra v1.5.0
 	github.com/stretchr/testify v1.8.0
+	github.com/tidbyt/gg v0.0.0-20220808163829-95806fa1d427
 	github.com/tidbyt/go-libwebp v0.0.0-20220802221933-1fabc3b46601
 	github.com/vmihailenco/msgpack/v5 v5.3.5
 	github.com/zachomedia/go-bdf v0.0.0-20220611021443-a3af701111be

render/animation.go

@@ -3,7 +3,7 @@ package render
 import (
 	"image"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 // Animations turns a list of children into an animation, where each

render/animation/positioned.go

@@ -4,7 +4,7 @@ import (
 	"image"
 	"math"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 
 	"tidbyt.dev/pixlet/render"
 )

render/animation/rotate.go

@@ -1,7 +1,7 @@
 package animation
 
 import (
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 // Transform by rotating by a given angle in degrees.

render/animation/scale.go

@@ -1,7 +1,7 @@
 package animation
 
 import (
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 // Transform by scaling by a given factor.

render/animation/transform.go

@@ -1,7 +1,7 @@
 package animation
 
 import (
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 type Transform interface {

render/animation/transformation.go

@@ -5,7 +5,7 @@ import (
 	"image"
 	"sort"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 
 	"tidbyt.dev/pixlet/render"
 )

render/animation/translate.go

@@ -1,7 +1,7 @@
 package animation
 
 import (
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 // Transform by translating by a given offset.

render/box.go

@@ -4,7 +4,7 @@ import (
 	"image"
 	"image/color"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 // A Box is a rectangular widget that can hold a child widget.

render/circle.go

@@ -5,7 +5,7 @@ import (
 	"image/color"
 	"math"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 // Circle draws a circle with the given `diameter` and `color`. If a

render/column.go

@@ -3,7 +3,7 @@ package render
 import (
 	"image"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 // Column lays out and draws its children vertically (in a column).

render/image.go

@@ -12,8 +12,8 @@ import (
 	_ "image/jpeg"
 	_ "image/png"
 
-	"github.com/fogleman/gg"
 	"github.com/nfnt/resize"
+	"github.com/tidbyt/gg"
 	"github.com/tidbyt/go-libwebp/webp"
 )
 
@@ -84,11 +84,11 @@ func (p *Image) InitFromGIF(data []byte) error {
 	}
 
 	p.Delay = img.Delay[0] * 10
-	
+
 	var prev_src *image.Paletted
 	disposal_length := len(img.Disposal)
 	compositing_op := draw.Src
-	
+
 	last := image.NewRGBA(image.Rect(0, 0, img.Config.Width, img.Config.Height))
 
 	for index, src := range img.Image {
@@ -105,7 +105,7 @@ func (p *Image) InitFromGIF(data []byte) error {
 		// if this is a non-DisposalPrevious frame
 		// and the next frame is DisposalPrevious
 		// store the src to reset before the next frame draws
-		if (!is_disposal_previous && index + 1 < disposal_length && img.Disposal[index+1] == gif.DisposalPrevious) {
+		if !is_disposal_previous && index+1 < disposal_length && img.Disposal[index+1] == gif.DisposalPrevious {
 			prev_src = src
 		}
 

render/marquee.go

@@ -3,7 +3,7 @@ package render
 import (
 	"image"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 // Marquee scrolls its child horizontally or vertically.

render/padding.go

@@ -4,7 +4,7 @@ import (
 	"image"
 	"image/color"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 type Insets struct {

render/plot.go

@@ -5,7 +5,7 @@ import (
 	"image/color"
 	"math"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 var DefaultPlotColor = color.RGBA{0xff, 0xff, 0xff, 0xff}

render/root.go

@@ -5,7 +5,7 @@ import (
 	"image/color"
 	"sync"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 const (

render/row.go

@@ -3,7 +3,7 @@ package render
 import (
 	"image"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 // Row lays out and draws its children horizontally (in a row).

render/sequence.go

@@ -3,7 +3,7 @@ package render
 import (
 	"image"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 // Sequence renders a list of child widgets in sequence.

render/stack.go

@@ -3,7 +3,7 @@ package render
 import (
 	"image"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 // Stack draws its children on top of each other.

render/starfield.go

@@ -7,7 +7,7 @@ import (
 	"math"
 	"math/rand"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 type Starfield struct {

render/testutil.go

@@ -6,7 +6,7 @@ import (
 	"image/color"
 	"strings"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 var DefaultPalette = map[string]color.RGBA{

render/text.go

@@ -4,7 +4,7 @@ import (
 	"image"
 	"image/color"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 var (

render/tracer.go

@@ -4,7 +4,7 @@ import (
 	"image"
 	"image/color"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 type Tracer struct {

render/vector.go

@@ -3,7 +3,7 @@ package render
 import (
 	"image"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 // A vector draws its children either vertically or horizontally (like

render/widget.go

@@ -3,7 +3,7 @@ package render
 import (
 	"image"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 // A Widget is a self-contained object that can render itself as an image.

render/wrappedtext.go

@@ -4,7 +4,7 @@ import (
 	"image"
 	"image/color"
 
-	"github.com/fogleman/gg"
+	"github.com/tidbyt/gg"
 )
 
 // WrappedText draws multi-line text.