mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-26 03:38:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

ebiten: Bug fix: Colorm.Concat crashed when the argument is an initial value

Browse Source 
Closes #1765
This commit is contained in:
Hajime Hoshi 2021-08-18 01:09:04 +09:00
parent 12350e2fee
commit 415ceded79
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
colorm.go
View File

@ -64,7 +64,11 @@ func (c *ColorM) Apply(clr color.Color) color.Color {
// Concat multiplies a color matrix with the other color matrix. // Concat multiplies a color matrix with the other color matrix.
// This is same as muptiplying the matrix other and the matrix c in this order. // This is same as muptiplying the matrix other and the matrix c in this order.
func (c *ColorM) Concat(other ColorM) { func (c *ColorM) Concat(other ColorM) {
c.impl = c.affineColorM().Concat(other.impl) o := other.impl
if o == nil {
o = affine.ColorMIdentity{}
}
c.impl = c.affineColorM().Concat(o)
} }
// Scale scales the matrix by (r, g, b, a). // Scale scales the matrix by (r, g, b, a).

10
image_test.go
View File

@ -2426,3 +2426,13 @@ func BenchmarkColorMScale(b *testing.B) {
dst.DrawImage(src, op) dst.DrawImage(src, op)
} }
} }
// #1765
func TestColorMConcat(t *testing.T) {
var a, b ColorM
a.SetElement(1, 2, -1)
a.Concat(b)
if got, want := a.Element(1, 2), -1.0; got != want {
t.Errorf("got: %f, want: %f", got, want)
}
}