]> Cypherpunks repositories - gostls13.git/commit
image: fix the overlap check in Rectangle.Intersect.
authorNigel Tao <nigeltao@golang.org>
Thu, 5 Jan 2017 06:37:54 +0000 (17:37 +1100)
committerRuss Cox <rsc@golang.org>
Tue, 7 Feb 2017 14:07:02 +0000 (14:07 +0000)
commita855da29dbd7a80c4d87a421c1f88a8603c020fa
tree327098015646a2cf9c78ad1ceaccf8c54a1d77dc
parentcbef450df797c473c9ca01f8d0c81ea26d106c24
image: fix the overlap check in Rectangle.Intersect.

The doc comment for Rectangle.Intersect clearly states, "If the two
rectangles do not overlap then the zero rectangle will be returned."
Prior to this fix, calling Intersect on adjacent but non-overlapping
rectangles would return an empty but non-zero rectangle.

The fix essentially changes
if r.Min.X > r.Max.X || r.Min.Y > r.Max.Y { etc }
to
if r.Min.X >= r.Max.X || r.Min.Y >= r.Max.Y { etc }
(note that the > signs have become >= signs), but changing that line to:
if r.Empty() { etc }
seems clearer (and equivalent).

Change-Id: Ia654e4b9dc805978db3e94d7a9718b6366005360
Reviewed-on: https://go-review.googlesource.com/34853
Reviewed-by: David Crawshaw <crawshaw@golang.org>
src/image/geom.go
src/image/geom_test.go