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

graphics: Bug fix: Always need to copy the source image

Browse Source
This commit is contained in:
Hajime Hoshi 2016-08-21 02:19:03 +09:00
parent c54dc8ee1c
commit e5c7de4939
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
imageimpl.go
View File

@ -61,13 +61,14 @@ func newImageImplFromImage(source image.Image, filter Filter) (*imageImpl, error
w, h := size.X, size.Y w, h := size.X, size.Y
// TODO: Return error when the image is too big! // TODO: Return error when the image is too big!
// Don't lock while manipulating an image.Image interface. // Don't lock while manipulating an image.Image interface.
rgbaImg, ok := source.(*image.RGBA)
if !ok || source.Bounds().Min != image.ZP { // It is necessary to copy the source image since the actual construction of
origImg := source // an image is delayed and we can't expect the source image is not modified
newImg := image.NewRGBA(image.Rect(0, 0, w, h)) // until the construction.
draw.Draw(newImg, newImg.Bounds(), origImg, origImg.Bounds().Min, draw.Src) origImg := source
rgbaImg = newImg newImg := image.NewRGBA(image.Rect(0, 0, w, h))
} draw.Draw(newImg, newImg.Bounds(), origImg, origImg.Bounds().Min, draw.Src)
rgbaImg := newImg
p := make([]uint8, 4*w*h) p := make([]uint8, 4*w*h)
for j := 0; j < h; j++ { for j := 0; j < h; j++ {
copy(p[j*w*4:(j+1)*w*4], rgbaImg.Pix[j*rgbaImg.Stride:]) copy(p[j*w*4:(j+1)*w*4], rgbaImg.Pix[j*rgbaImg.Stride:])
@ -218,6 +219,9 @@ func (i *imageImpl) resetPixelsIfDependingOn(target *imageImpl, context *opengl.
return nil return nil
} }
i.pixels.MakeStale() i.pixels.MakeStale()
/*if !i.volatile {
return errors.New("test")
}*/
return nil return nil
} }