Skip to content

C
cpython
Kaydet (Commit) 124eb942 authored tarafından Guido van Rossum's avatar Guido van Rossum
Dosyalara gözat
Seçenekler

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

ignored instead of making the outcome empty...
üst e1f069ec
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 16 deletions
Lib/lib-stdwin/rect.py
Dosyayı görüntüle @ 124eb942
...@@ -29,14 +29,15 @@ def intersect(list): ...@@ -29,14 +29,15 @@ def intersect(list):
if is_empty(list[0]): return empty if is_empty(list[0]): return empty
(left, top), (right, bottom) = list[0] (left, top), (right, bottom) = list[0]
for rect in list[1:]: for rect in list[1:]:
if not is_empty(rect): if is_empty(rect):
(l, t), (r, b) = rect return empty
if left < l: left = l (l, t), (r, b) = rect
if top < t: top = t if left < l: left = l
if right > r: right = r if top < t: top = t
if bottom > b: bottom = b if right > r: right = r
if is_empty((left, top), (right, bottom)): if bottom > b: bottom = b
return empty if is_empty((left, top), (right, bottom)):
return empty
return (left, top), (right, bottom) return (left, top), (right, bottom)
......
Lib/stdwin/rect.py
Dosyayı görüntüle @ 124eb942
...@@ -29,14 +29,15 @@ def intersect(list): ...@@ -29,14 +29,15 @@ def intersect(list):
if is_empty(list[0]): return empty if is_empty(list[0]): return empty
(left, top), (right, bottom) = list[0] (left, top), (right, bottom) = list[0]
for rect in list[1:]: for rect in list[1:]:
if not is_empty(rect): if is_empty(rect):
(l, t), (r, b) = rect return empty
if left < l: left = l (l, t), (r, b) = rect
if top < t: top = t if left < l: left = l
if right > r: right = r if top < t: top = t
if bottom > b: bottom = b if right > r: right = r
if is_empty((left, top), (right, bottom)): if bottom > b: bottom = b
return empty if is_empty((left, top), (right, bottom)):
return empty
return (left, top), (right, bottom) 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