Skip to content

Commit

Permalink
fix: golang/go#52153
Browse files Browse the repository at this point in the history
  • Loading branch information
@hmmftg
hmmftg committed Sep 11, 2023
1 parent e2020c6 commit 5e696ac
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 47 deletions.
4 changes: 2 additions & 2 deletions example/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (

ig "github.com/hmmftg/image-generator"

"golang.org/x/image/font"
"golang.org/x/image/font/opentype"
"github.com/hmmftg/image/font"
"github.com/hmmftg/image/font/opentype"
)

const borderSpace = 0.05
Expand Down
2 changes: 1 addition & 1 deletion export.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"image/png"
"os"

"golang.org/x/image/bmp"
"github.com/hmmftg/image/bmp"
)

type ImageData struct {
Expand Down
4 changes: 2 additions & 2 deletions git-commands.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
git tag v0.0.4
git push origin v0.0.4
git tag v0.0.5
git push origin v0.0.5
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.21.1
require (
github.com/StephaneBunel/bresenham v0.0.0-20211027152503-ec76d7b8e923
github.com/hmmftg/garabic v1.16.11
golang.org/x/image v0.12.0
github.com/hmmftg/image v0.12.1
)

require golang.org/x/text v0.13.0 // indirect
33 changes: 2 additions & 31 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,9 @@ github.com/StephaneBunel/bresenham v0.0.0-20211027152503-ec76d7b8e923 h1:tiBl/Mv
github.com/StephaneBunel/bresenham v0.0.0-20211027152503-ec76d7b8e923/go.mod h1:IEPPVq1llBFm+OeVCgoAyFiTqK5aE2c2tH4QEsjnQCM=
github.com/hmmftg/garabic v1.16.11 h1:fZKX3WcDC80I3RX/FbcuzSG1OKY92kCNRLZSI9xqxSo=
github.com/hmmftg/garabic v1.16.11/go.mod h1:S2no7yA5LcaXeKGX7bYa307VhlcqT2EhtgqwncSCFJo=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/image v0.12.0 h1:w13vZbU4o5rKOFFR8y7M+c4A5jXDC0uXTdHYRP8X2DQ=
golang.org/x/image v0.12.0/go.mod h1:Lu90jvHG7GfemOIcldsh9A2hS01ocl6oNO7ype5mEnk=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
github.com/hmmftg/image v0.12.1 h1:YuMDD46LDzTqd4nGr8qFjGPJS8UBAJ5O73QrrB920Z0=
github.com/hmmftg/image v0.12.1/go.mod h1:Srwt/KgBNUwX7drC4nVbFGJ/BJHy8k4JG4GL5cBuBac=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
2 changes: 1 addition & 1 deletion image.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
//"image/draw"
"log"

"golang.org/x/image/draw"
"github.com/hmmftg/image/draw"
)

type Image struct {
Expand Down
4 changes: 2 additions & 2 deletions initialize.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os"
"path/filepath"

"golang.org/x/image/bmp"
"golang.org/x/image/font/opentype"
"github.com/hmmftg/image/bmp"
"github.com/hmmftg/image/font/opentype"
)

func exists(path string) bool {
Expand Down
4 changes: 2 additions & 2 deletions model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package imagegenerator
import (
"image"

"golang.org/x/image/font"
"golang.org/x/image/font/opentype"
"github.com/hmmftg/image/font"
"github.com/hmmftg/image/font/opentype"
)

type Drawable interface {
Expand Down
4 changes: 2 additions & 2 deletions precess.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"image"
"math"

"golang.org/x/image/font"
"golang.org/x/image/font/opentype"
"github.com/hmmftg/image/font"
"github.com/hmmftg/image/font/opentype"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions text.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"strings"

"github.com/hmmftg/garabic"
"golang.org/x/image/font"
"golang.org/x/image/font/opentype"
"golang.org/x/image/math/fixed"
"github.com/hmmftg/image/font"
"github.com/hmmftg/image/font/opentype"
"github.com/hmmftg/image/math/fixed"
)

type Text struct {
Expand Down

0 comments on commit 5e696ac

Please sign in to comment.