Fix conflict

[factor.git] / basis / math / rectangles / rectangles.factor

diff --git a/basis/math/rectangles/rectangles.factor b/basis/math/rectangles/rectangles.factor
index 1c30253d303c5b13f0906d9405f7a766b15c92de..d3ada2951c3ba4e4858e64e2e74a9eb64e3c6b18 100644 (file)
--- a/basis/math/rectangles/rectangles.factor
+++ b/basis/math/rectangles/rectangles.factor
@@ -44,3 +44,7 @@ M: rect contains-point?
 
 : rect-union ( rect1 rect2 -- newrect )
     (rect-union) <extent-rect> ;
+
+: rect-containing ( points -- rect )
+    [ vsupremum ] [ vinfimum ] bi
+    [ nip ] [ v- ] 2bi <rect> ;