1 files changed, 27 insertions, 31 deletions

diff --git a/base/rect.c b/base/rect.c
index 6df6749a..2efb11f7 100644
--- a/base/rect.c
+++ b/base/rect.c
@@ -1,38 +1,43 @@
 #include <fitz.h>
 
-static fz_rect none = { { 0, 0}, {0, 0} };
-static fz_irect inone = { { 0, 0}, {0, 0} };
+fz_rect fz_infiniterect = { { 1, 1}, {-1, -1} };
+fz_rect fz_emptyrect = { { 0, 0}, {0, 0} };
 
-fz_rect
-fz_infiniterect(void)
+static fz_irect infinite = { { 1, 1}, {-1, -1} };
+static fz_irect empty = { { 0, 0}, {0, 0} };
+
+fz_irect
+fz_roundrect(fz_rect f)
 {
-	fz_rect r;
-	r.min.x = 1;
-	r.min.y = 1;
-	r.max.x = -1;
-	r.max.y = -1;
-	return r;
+	fz_irect i;
+	i.min.x = fz_floor(f.min.x);
+	i.min.y = fz_floor(f.min.y);
+	i.max.x = fz_ceil(f.max.x);
+	i.max.y = fz_ceil(f.max.y);
+	return i;
 }
 
 fz_rect
 fz_intersectrects(fz_rect a, fz_rect b)
 {
 	fz_rect r;
-	if (a.max.x < a.min.x)
-		return (b.max.x < b.min.x) ? none : b;
+	if (fz_isinfiniterect(a)) return b;
+	if (fz_isinfiniterect(b)) return a;
 	r.min.x = MAX(a.min.x, b.min.x);
 	r.min.y = MAX(a.min.y, b.min.y);
 	r.max.x = MIN(a.max.x, b.max.x);
 	r.max.y = MIN(a.max.y, b.max.y);
-	return (r.max.x < r.min.x || r.max.y < r.min.y) ? none : r;
+	return (r.max.x < r.min.x || r.max.y < r.min.y) ? fz_emptyrect : r;
 }
 
 fz_rect
 fz_mergerects(fz_rect a, fz_rect b)
 {
 	fz_rect r;
-	if (a.max.x < a.min.x)
-		return (b.max.x < b.min.x) ? none : b;
+	if (fz_isinfiniterect(a) || fz_isinfiniterect(b))
+		return fz_infiniterect;
+	if (fz_isemptyrect(a)) return b;
+	if (fz_isemptyrect(b)) return a;
 	r.min.x = MIN(a.min.x, b.min.x);
 	r.min.y = MIN(a.min.y, b.min.y);
 	r.max.x = MAX(a.max.x, b.max.x);
@@ -41,35 +46,26 @@ fz_mergerects(fz_rect a, fz_rect b)
 }
 
 fz_irect
-fz_roundrect(fz_rect f)
-{
-	fz_irect i;
-	i.min.x = fz_floor(f.min.x);
-	i.min.y = fz_floor(f.min.y);
-	i.max.x = fz_ceil(f.max.x);
-	i.max.y = fz_ceil(f.max.y);
-	return i;
-}
-
-fz_irect
 fz_intersectirects(fz_irect a, fz_irect b)
 {
 	fz_irect r;
-	if (a.max.x < a.min.x)
-		return (b.max.x < b.min.x) ? inone : b;
+	if (fz_isinfiniterect(a)) return b;
+	if (fz_isinfiniterect(b)) return a;
 	r.min.x = MAX(a.min.x, b.min.x);
 	r.min.y = MAX(a.min.y, b.min.y);
 	r.max.x = MIN(a.max.x, b.max.x);
 	r.max.y = MIN(a.max.y, b.max.y);
-	return (r.max.x < r.min.x || r.max.y < r.min.y) ? inone : r;
+	return (r.max.x < r.min.x || r.max.y < r.min.y) ? empty : r;
 }
 
 fz_irect
 fz_mergeirects(fz_irect a, fz_irect b)
 {
 	fz_irect r;
-	if (a.max.x < a.min.x)
-		return (b.max.x < b.min.x) ? inone : b;
+	if (fz_isinfiniterect(a) || fz_isinfiniterect(b))
+		return infinite;
+	if (fz_isemptyrect(a)) return b;
+	if (fz_isemptyrect(b)) return a;
 	r.min.x = MIN(a.min.x, b.min.x);
 	r.min.y = MIN(a.min.y, b.min.y);
 	r.max.x = MAX(a.max.x, b.max.x);