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

ebiten: Remove the returning value from (*Image).ReplacePixels

Browse Source 
Updates #1380
This commit is contained in:
Hajime Hoshi 2020-10-06 00:16:13 +09:00
parent 525d16bec8
commit 04bbe1ebb6
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
image.go
View File

@ -701,13 +701,11 @@ func (i *Image) Dispose() {
// When len(pix) is not appropriate, ReplacePixels panics. // When len(pix) is not appropriate, ReplacePixels panics.
// //
// When the image is disposed, ReplacePixels does nothing. // When the image is disposed, ReplacePixels does nothing.
// func (i *Image) ReplacePixels(pixels []byte) {
// ReplacePixels always returns nil as of 1.5.0.
func (i *Image) ReplacePixels(pixels []byte) error {
i.copyCheck() i.copyCheck()
if i.isDisposed() { if i.isDisposed() {
return nil return
} }
r := i.Bounds() r := i.Bounds()
@ -717,7 +715,6 @@ func (i *Image) ReplacePixels(pixels []byte) error {
if err := i.mipmap.ReplacePixels(pixels, r.Min.X, r.Min.Y, r.Dx(), r.Dy()); err != nil { if err := i.mipmap.ReplacePixels(pixels, r.Min.X, r.Min.Y, r.Dx(), r.Dy()); err != nil {
theUIContext.setError(err) theUIContext.setError(err)
} }
return nil
} }
// NewImage returns an empty image. // NewImage returns an empty image.

10
image_test.go
View File

@ -323,10 +323,7 @@ func TestImageReplacePixels(t *testing.T) {
return return
} }
if err := img0.ReplacePixels(img.Pix); err != nil { img0.ReplacePixels(img.Pix)
t.Fatal(err)
return
}
for j := 0; j < img0.Bounds().Size().Y; j++ { for j := 0; j < img0.Bounds().Size().Y; j++ {
for i := 0; i < img0.Bounds().Size().X; i++ { for i := 0; i < img0.Bounds().Size().X; i++ {
got := img0.At(i, j) got := img0.At(i, j)
@ -341,10 +338,7 @@ func TestImageReplacePixels(t *testing.T) {
for i := range p { for i := range p {
p[i] = 0x80 p[i] = 0x80
} }
if err := img0.ReplacePixels(p); err != nil { img0.ReplacePixels(p)
t.Fatal(err)
return
}
// Even if p is changed after calling ReplacePixel, img0 uses the original values. // Even if p is changed after calling ReplacePixel, img0 uses the original values.
for i := range p { for i := range p {
p[i] = 0 p[i] = 0