diff options
Diffstat (limited to 'fitz/base_rect.c')
| -rw-r--r-- | fitz/base_rect.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/fitz/base_rect.c b/fitz/base_rect.c index 2efb11f7..18acb952 100644 --- a/fitz/base_rect.c +++ b/fitz/base_rect.c @@ -1,19 +1,19 @@ #include <fitz.h> -fz_rect fz_infiniterect = { { 1, 1}, {-1, -1} }; -fz_rect fz_emptyrect = { { 0, 0}, {0, 0} }; +fz_rect fz_infiniterect = { 1, 1, -1, -1 }; +fz_rect fz_emptyrect = { 0, 0, 0, 0 }; -static fz_irect infinite = { { 1, 1}, {-1, -1} }; -static fz_irect empty = { { 0, 0}, {0, 0} }; +static fz_irect infinite = { 1, 1, -1, -1 }; +static fz_irect empty = { 0, 0, 0, 0 }; 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); + i.x0 = fz_floor(f.x0); + i.y0 = fz_floor(f.y0); + i.x1 = fz_ceil(f.x1); + i.y1 = fz_ceil(f.y1); return i; } @@ -23,11 +23,11 @@ fz_intersectrects(fz_rect a, fz_rect b) fz_rect r; 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) ? fz_emptyrect : r; + r.x0 = MAX(a.x0, b.x0); + r.y0 = MAX(a.y0, b.y0); + r.x1 = MIN(a.x1, b.x1); + r.y1 = MIN(a.y1, b.y1); + return (r.x1 < r.x0 || r.y1 < r.y0) ? fz_emptyrect : r; } fz_rect @@ -38,10 +38,10 @@ fz_mergerects(fz_rect a, fz_rect 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); - r.max.y = MAX(a.max.y, b.max.y); + r.x0 = MIN(a.x0, b.x0); + r.y0 = MIN(a.y0, b.y0); + r.x1 = MAX(a.x1, b.x1); + r.y1 = MAX(a.y1, b.y1); return r; } @@ -51,11 +51,11 @@ fz_intersectirects(fz_irect a, fz_irect b) fz_irect r; 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) ? empty : r; + r.x0 = MAX(a.x0, b.x0); + r.y0 = MAX(a.y0, b.y0); + r.x1 = MIN(a.x1, b.x1); + r.y1 = MIN(a.y1, b.y1); + return (r.x1 < r.x0 || r.y1 < r.y0) ? empty : r; } fz_irect @@ -66,10 +66,10 @@ fz_mergeirects(fz_irect a, fz_irect 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); - r.max.y = MAX(a.max.y, b.max.y); + r.x0 = MIN(a.x0, b.x0); + r.y0 = MIN(a.y0, b.y0); + r.x1 = MAX(a.x1, b.x1); + r.y1 = MAX(a.y1, b.y1); return r; } |