Commit a20e65c6 authored by Guido van Rossum's avatar Guido van Rossum

Fix bug in rect.intersect(): empty rects beyond the first were

ignored instead of making the outcome empty...
parent 3f090080
......@@ -29,14 +29,15 @@ def intersect(list):
if is_empty(list[0]): return empty
(left, top), (right, bottom) = list[0]
for rect in list[1:]:
if not is_empty(rect):
(l, t), (r, b) = rect
if left < l: left = l
if top < t: top = t
if right > r: right = r
if bottom > b: bottom = b
if is_empty((left, top), (right, bottom)):
return empty
if is_empty(rect):
return empty
(l, t), (r, b) = rect
if left < l: left = l
if top < t: top = t
if right > r: right = r
if bottom > b: bottom = b
if is_empty((left, top), (right, bottom)):
return empty
return (left, top), (right, bottom)
......
......@@ -29,14 +29,15 @@ def intersect(list):
if is_empty(list[0]): return empty
(left, top), (right, bottom) = list[0]
for rect in list[1:]:
if not is_empty(rect):
(l, t), (r, b) = rect
if left < l: left = l
if top < t: top = t
if right > r: right = r
if bottom > b: bottom = b
if is_empty((left, top), (right, bottom)):
return empty
if is_empty(rect):
return empty
(l, t), (r, b) = rect
if left < l: left = l
if top < t: top = t
if right > r: right = r
if bottom > b: bottom = b
if is_empty((left, top), (right, bottom)):
return empty
return (left, top), (right, bottom)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment