mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-13 04:22:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 76ac850f6b.

Reason: This breaks many examples
This commit is contained in:
Hajime Hoshi 2018-11-08 12:19:38 +09:00
parent 76ac850f6b
commit 27331024af
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
image.go
View File

@ -150,8 +150,7 @@ 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) {
s := i.Bounds().Size() return i.mipmap.original().Size()
return s.X, s.Y
} }
func (i *Image) isDisposed() bool { func (i *Image) isDisposed() bool {
@ -570,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.mipmap.original().Size() w, h := i.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,14 +1034,3 @@ 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)
}
}