• Nigel Tao's avatar
    image: fix the overlap check in Rectangle.Intersect. · 3a209281
    Nigel Tao authored
    This is a re-roll of a previous commit,
    a855da29, which was rolled back in
    14347ee4.
    
    It was rolled back because it broke a unit test in image/gif. The
    image/gif code was fixed by 9ef65dbe
    "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/36734Reviewed-by: 's avatarRob Pike <r@golang.org>
    Run-TryBot: Nigel Tao <nigeltao@golang.org>
    TryBot-Result: Gobot Gobot <gobot@golang.org>
    3a209281
Name
Last commit
Last update
..
color Loading commit data...
draw Loading commit data...
gif Loading commit data...
internal/imageutil Loading commit data...
jpeg Loading commit data...
png Loading commit data...
testdata Loading commit data...
decode_example_test.go Loading commit data...
decode_test.go Loading commit data...
format.go Loading commit data...
geom.go Loading commit data...
geom_test.go Loading commit data...
image.go Loading commit data...
image_test.go Loading commit data...
names.go Loading commit data...
ycbcr.go Loading commit data...
ycbcr_test.go Loading commit data...