From cd0f5f39b7ae57d24b2e748d82ad667ce74fc190 Mon Sep 17 00:00:00 2001 From: Leon Klingele <git@leonklingele.de> Date: Fri, 24 May 2019 15:04:28 +0000 Subject: [PATCH] image/draw: change argument type to be consistent with other args Change-Id: Ic5b01c0a6912d87e812331d6525939df8f525cca GitHub-Last-Rev: b6ffefcf8f2ec1ed7ee13f36e8fef6af965ba332 GitHub-Pull-Request: golang/go#29993 Reviewed-on: https://go-review.googlesource.com/c/go/+/160417 Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org> Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org> --- src/image/draw/draw.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/image/draw/draw.go b/src/image/draw/draw.go index 3ff1828dc0..932a544483 100644 --- a/src/image/draw/draw.go +++ b/src/image/draw/draw.go @@ -90,8 +90,8 @@ func clip(dst Image, r *image.Rectangle, src image.Image, sp *image.Point, mask } } -func processBackward(dst Image, r image.Rectangle, src image.Image, sp image.Point) bool { - return image.Image(dst) == src && +func processBackward(dst image.Image, r image.Rectangle, src image.Image, sp image.Point) bool { + return dst == src && r.Overlaps(r.Add(sp.Sub(r.Min))) && (sp.Y < r.Min.Y || (sp.Y == r.Min.Y && sp.X < r.Min.X)) } -- 2.30.9