qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 00:54:42 -07:00
Code Releases Activity

image: fix the overlap check in Rectangle.Intersect.

Browse Source 
This is a re-roll of a previous commit,
a855da29db, which was rolled back in
14347ee480.

It was rolled back because it broke a unit test in image/gif. The
image/gif code was fixed by 9ef65dbe06
"image/gif: fix frame-inside-image bounds checking".

The original commit message:

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: I2e3af1f1686064a573b2e513b39246fe60c03631
Reviewed-on: https://go-review.googlesource.com/36734
Reviewed-by: Rob Pike <r@golang.org>
Run-TryBot: Nigel Tao <nigeltao@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Nigel Tao 2017-02-10 14:40:38 +11:00
parent 5faba3057d
commit 3a20928157
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/image/geom.go
View File

@ -161,7 +161,11 @@ func (r Rectangle) Intersect(s Rectangle) Rectangle {
if r.Max.Y > s.Max.Y {
r.Max.Y = s.Max.Y
}
if r.Min.X > r.Max.X || r.Min.Y > r.Max.Y {
// Letting r0 and s0 be the values of r and s at the time that the method
// is called, this next line is equivalent to:
//
// if max(r0.Min.X, s0.Min.X) >= min(r0.Max.X, s0.Max.X) || likewiseForY { etc }
if r.Empty() {
return ZR
}
return r

7
src/image/geom_test.go
View File

@ -28,6 +28,7 @@ func TestRectangle(t *testing.T) {
rects := []Rectangle{
Rect(0, 0, 10, 10),
Rect(10, 0, 20, 10),
Rect(1, 2, 3, 4),
Rect(4, 6, 10, 10),
Rect(2, 3, 12, 5),
@ -62,9 +63,9 @@ func TestRectangle(t *testing.T) {
if err := in(a, s); err != nil {
t.Errorf("Intersect: r=%s, s=%s, a=%s, a not in s: %v", r, s, a, err)
}
if a.Empty() == r.Overlaps(s) {
t.Errorf("Intersect: r=%s, s=%s, a=%s: empty=%t same as overlaps=%t",
r, s, a, a.Empty(), r.Overlaps(s))
if isZero, overlaps := a == (Rectangle{}), r.Overlaps(s); isZero == overlaps {
t.Errorf("Intersect: r=%s, s=%s, a=%s: isZero=%t same as overlaps=%t",
r, s, a, isZero, overlaps)
}
largerThanA := [4]Rectangle{a, a, a, a}
largerThanA[0].Min.X--