mstar/canvas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #22 from kanle-hotstar/bugfix/avoid-panic-when-loading-image-cache

Browse source 
Fix a panic issue of loading an image from cache
This commit is contained in:
Thomas Friedel 2019-12-18 16:57:50 +01:00 committed by GitHub
commit 79fde3ee1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
images.go
View file

@ -25,10 +25,11 @@ type Image struct {
func (cv *Canvas) LoadImage(src interface{}) (*Image, error) { func (cv *Canvas) LoadImage(src interface{}) (*Image, error) {
if img, ok := src.(*Image); ok { if img, ok := src.(*Image); ok {
return img, nil return img, nil
} else if img, ok := cv.images[src]; ok { } else if _, ok := src.([]byte); !ok {
if img, ok := cv.images[src]; ok {
return img, nil return img, nil
} }
}
var srcImg image.Image var srcImg image.Image
switch v := src.(type) { switch v := src.(type) {
case image.Image: case image.Image:
@ -59,7 +60,9 @@ func (cv *Canvas) LoadImage(src interface{}) (*Image, error) {
return nil, err return nil, err
} }
cvimg := &Image{cv: cv, img: backendImg} cvimg := &Image{cv: cv, img: backendImg}
if _, ok := src.([]byte); !ok {
cv.images[src] = cvimg cv.images[src] = cvimg
}
return cvimg, nil return cvimg, nil
} }