Skip to content

Commit

Permalink
go.mod: update GIM (changes from ozankasikci/go-image-merge#9)
Browse files Browse the repository at this point in the history
  • Loading branch information
gucio321 committed Apr 26, 2021
1 parent 1e9a4b4 commit 042d075
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 13 deletions.
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ require (
github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7
github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/ozankasikci/go-image-merge v0.2.3-0.20200725062803-aedf4eb2eb2c
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
github.com/ozankasikci/go-image-merge v0.2.3-0.20210426105355-ce64427c0c12
github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4
github.com/rivo/uniseg v0.2.0 // indirect
github.com/russross/blackfriday v1.6.0
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
)
8 changes: 2 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,8 @@ github.com/mewkiz/flac v1.0.5/go.mod h1:EHZNU32dMF6alpurYyKHDLYpW1lYpBZ5WrXi/VuN
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
github.com/ozankasikci/go-image-merge v0.2.3-0.20200725062803-aedf4eb2eb2c h1:eBz0w4XGcUHRXsnVO8wrsRPaKeIHZuyJVCWl/HT7ukE=
github.com/ozankasikci/go-image-merge v0.2.3-0.20200725062803-aedf4eb2eb2c/go.mod h1:NQ2aN0b21buFx3p+5x4dZrKuPSLh2uBukK7F30BrYTo=
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 h1:49lOXmGaUpV9Fz3gd7TFZY106KVlPVa5jcYD1gaQf98=
github.com/ozankasikci/go-image-merge v0.2.3-0.20210426105355-ce64427c0c12 h1:LdAKX13BHUD2Ugj/PI7FjtUed9TksjhbtmkmorgOCEI=
github.com/ozankasikci/go-image-merge v0.2.3-0.20210426105355-ce64427c0c12/go.mod h1:NQ2aN0b21buFx3p+5x4dZrKuPSLh2uBukK7F30BrYTo=
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 h1:Qj1ukM4GlMWXNdMBuXcXfz/Kw9s1qm0CLY32QxuSImI=
github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ=
Expand All @@ -82,9 +81,6 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
github.com/pkg/profile v1.5.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY=
github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
Expand Down
5 changes: 1 addition & 4 deletions hswidget/dc6widget/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -372,10 +372,7 @@ func (p *widget) createImage(state *widgetState) {
grids := make([]*gim.Grid, 0)

for j := int32(0); j < state.height*state.width; j++ {
// https://github.com/ozankasikci/go-image-merge/pull/9
img := image.Image(state.rgb[firstFrame+j])

grids = append(grids, &gim.Grid{Image: &img})
grids = append(grids, &gim.Grid{Image: image.Image(state.rgb[firstFrame+j])})
}

newimg, err := gim.New(grids, int(state.width), int(state.height)).Merge()
Expand Down

0 comments on commit 042d075

Please sign in to comment.