mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-12 20:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

graphics: Bug fix: disposing check must be done before any operations

Browse Source
This commit is contained in:
Hajime Hoshi 2017-05-03 03:03:13 +09:00
parent 955284394a
commit e8e502cc26
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
image.go
View File

@ -191,6 +191,9 @@ func (i *Image) Fill(clr color.Color) error {
// //
// DrawImage always returns nil as of 1.5.0-alpha. // DrawImage always returns nil as of 1.5.0-alpha.
func (i *Image) DrawImage(image *Image, options *DrawImageOptions) error { func (i *Image) DrawImage(image *Image, options *DrawImageOptions) error {
if i.restorable == nil {
return nil
}
theImagesForRestoring.resetPixelsIfDependingOn(i) theImagesForRestoring.resetPixelsIfDependingOn(i)
// Calculate vertices before locking because the user can do anything in // Calculate vertices before locking because the user can do anything in
// options.ImageParts interface without deadlock (e.g. Call Image functions). // options.ImageParts interface without deadlock (e.g. Call Image functions).
@ -216,9 +219,6 @@ func (i *Image) DrawImage(image *Image, options *DrawImageOptions) error {
if i == image { if i == image {
panic("ebiten: Image.DrawImage: image must be different from the receiver") panic("ebiten: Image.DrawImage: image must be different from the receiver")
} }
if i.restorable == nil {
return nil
}
mode := opengl.CompositeMode(options.CompositeMode) mode := opengl.CompositeMode(options.CompositeMode)
i.restorable.DrawImage(image.restorable, vs, options.ColorM.impl, mode) i.restorable.DrawImage(image.restorable, vs, options.ColorM.impl, mode)
return nil return nil
@ -283,14 +283,14 @@ func (i *Image) Dispose() error {
// //
// ReplacePixels always returns nil as of 1.5.0-alpha. // ReplacePixels always returns nil as of 1.5.0-alpha.
func (i *Image) ReplacePixels(p []uint8) error { func (i *Image) ReplacePixels(p []uint8) error {
if i.restorable == nil {
return nil
}
theImagesForRestoring.resetPixelsIfDependingOn(i) theImagesForRestoring.resetPixelsIfDependingOn(i)
w, h := i.restorable.Size() w, h := i.restorable.Size()
if l := 4 * w * h; len(p) != l { if l := 4 * w * h; len(p) != l {
panic(fmt.Sprintf("ebiten: len(p) was %d but must be %d", len(p), l)) panic(fmt.Sprintf("ebiten: len(p) was %d but must be %d", len(p), l))
} }
if i.restorable == nil {
return nil
}
w2, h2 := graphics.NextPowerOf2Int(w), graphics.NextPowerOf2Int(h) w2, h2 := graphics.NextPowerOf2Int(w), graphics.NextPowerOf2Int(h)
pix := make([]uint8, 4*w2*h2) pix := make([]uint8, 4*w2*h2)
for j := 0; j < h; j++ { for j := 0; j < h; j++ {