mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-10 04:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reland: graphics: Bug fix: a sub image's Size was wrong

Browse Source 
Size() usages are also fixed.

Fixes #732
This commit is contained in:
Hajime Hoshi 2018-11-08 04:22:19 +09:00
parent 27331024af
commit f54bdfa159
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
image.go
View File

@ -150,7 +150,8 @@ func (i *Image) copyCheck() {
// Size returns the size of the image. // Size returns the size of the image.
func (i *Image) Size() (width, height int) { func (i *Image) Size() (width, height int) {
return i.mipmap.original().Size() s := i.Bounds().Size()
return s.X, s.Y
} }
func (i *Image) isDisposed() bool { func (i *Image) isDisposed() bool {
@ -329,24 +330,23 @@ func (i *Image) drawImage(img *Image, options *DrawImageOptions) {
return return
} }
w, h := img.Size() // TODO: Add tests about #732
sx0, sy0, sx1, sy1 := 0, 0, w, h bounds := img.Bounds()
sx0, sy0, sx1, sy1 := bounds.Min.X, bounds.Min.Y, bounds.Max.X, bounds.Max.Y
// SourceRect is deprecated. This implementation is for backward compatibility. // SourceRect is deprecated. This implementation is for backward compatibility.
if img.bounds != nil || options.SourceRect != nil { if options.SourceRect != nil {
r := img.bounds r := bounds.Intersect(*options.SourceRect)
if r == nil {
r = options.SourceRect
} else if options.SourceRect != nil {
r2 := r.Intersect(*options.SourceRect)
r = &r2
}
if r.Empty() { if r.Empty() {
return return
} }
sx0 = r.Min.X if sx0 < r.Min.X {
sy0 = r.Min.Y sx0 = r.Min.X
}
if sy0 < r.Min.Y {
sy0 = r.Min.Y
}
if sx1 > r.Max.X { if sx1 > r.Max.X {
sx1 = r.Max.X sx1 = r.Max.X
} }
@ -569,7 +569,7 @@ func (i *Image) SubImage(r image.Rectangle) image.Image {
// Bounds returns the bounds of the image. // Bounds returns the bounds of the image.
func (i *Image) Bounds() image.Rectangle { func (i *Image) Bounds() image.Rectangle {
if i.bounds == nil { if i.bounds == nil {
w, h := i.Size() w, h := i.mipmap.original().Size()
return image.Rect(0, 0, w, h) return image.Rect(0, 0, w, h)
} }
return *i.bounds return *i.bounds

11
image_test.go
View File

@ -1034,3 +1034,14 @@ func TestImageSubImageAt(t *testing.T) {
t.Errorf("got: %v, want: %v", got, want) t.Errorf("got: %v, want: %v", got, want)
} }
} }
func TestImageSubImageSize(t *testing.T) {
img, _ := NewImage(16, 16, FilterDefault)
img.Fill(color.RGBA{0xff, 0, 0, 0xff})
got, _ := img.SubImage(image.Rect(1, 1, 16, 16)).(*Image).Size()
want := 15
if got != want {
t.Errorf("got: %v, want: %v", got, want)
}
}