Skip to content

Commit 14347ee

Browse files
rscrsc
committed
Revert "image: fix the overlap check in Rectangle.Intersect."
This reverts commit a855da2. Change-Id: I23c0351b0708877e0b3d1b44a2bc2799cee52cd1 Reviewed-on: https://go-review.googlesource.com/36426 Reviewed-by: Russ Cox <[email protected]>
1 parent 50c7783 commit 14347ee

2 files changed

Lines changed: 4 additions & 9 deletions

File tree

‎src/image/geom.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,7 @@ func (r Rectangle) Intersect(s Rectangle) Rectangle {
161161
if r.Max.Y > s.Max.Y {
162162
r.Max.Y = s.Max.Y
163163
}
164-
// Letting r0 and s0 be the values of r and s at the time that the method
165-
// is called, this next line is equivalent to:
166-
//
167-
// if max(r0.Min.X, s0.Min.X) >= min(r0.Max.X, s0.Max.X) || likewiseForY { etc }
168-
if r.Empty() {
164+
if r.Min.X > r.Max.X || r.Min.Y > r.Max.Y {
169165
return ZR
170166
}
171167
return r

‎src/image/geom_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ func TestRectangle(t *testing.T) {
2828

2929
rects := []Rectangle{
3030
Rect(0, 0, 10, 10),
31-
Rect(10, 0, 20, 10),
3231
Rect(1, 2, 3, 4),
3332
Rect(4, 6, 10, 10),
3433
Rect(2, 3, 12, 5),
@@ -63,9 +62,9 @@ func TestRectangle(t *testing.T) {
6362
if err := in(a, s); err != nil {
6463
t.Errorf("Intersect: r=%s, s=%s, a=%s, a not in s: %v", r, s, a, err)
6564
}
66-
if isZero, overlaps := a == (Rectangle{}), r.Overlaps(s); isZero == overlaps {
67-
t.Errorf("Intersect: r=%s, s=%s, a=%s: isZero=%t same as overlaps=%t",
68-
r, s, a, isZero, overlaps)
65+
if a.Empty() == r.Overlaps(s) {
66+
t.Errorf("Intersect: r=%s, s=%s, a=%s: empty=%t same as overlaps=%t",
67+
r, s, a, a.Empty(), r.Overlaps(s))
6968
}
7069
largerThanA := [4]Rectangle{a, a, a, a}
7170
largerThanA[0].Min.X--

0 commit comments

Comments
 (0)