rename rect fields to x0 y0 x1 y1

21 files changed, 203 insertions, 203 deletions

diff --git a/apps/pdfrip.c b/apps/pdfrip.c
index d25e84b3..59d0fa48 100644
--- a/apps/pdfrip.c
+++ b/apps/pdfrip.c
@@ -58,8 +58,8 @@ void showpage(pdf_xref *xref, fz_obj *pageobj, int pagenum)
 
 		printf("page\n");
 		printf("  mediabox [ %g %g %g %g ]\n",
-			page->mediabox.min.x, page->mediabox.min.y,
-			page->mediabox.max.x, page->mediabox.max.y);
+			page->mediabox.x0, page->mediabox.y0,
+			page->mediabox.x1, page->mediabox.y1);
 		printf("  rotate %d\n", page->rotate);
 
 		printf("  resources\n");
@@ -71,7 +71,7 @@ void showpage(pdf_xref *xref, fz_obj *pageobj, int pagenum)
 		printf("endtree\n");
 	}
 
-	ctm = fz_concat(fz_translate(0, -page->mediabox.max.y),
+	ctm = fz_concat(fz_translate(0, -page->mediabox.y1),
 					fz_scale(zoom, -zoom));
 
 	if (textonly)
@@ -91,12 +91,12 @@ void showpage(pdf_xref *xref, fz_obj *pageobj, int pagenum)
 	}
 
 	bbox = fz_roundrect(page->mediabox);
-	bbox.min.x = bbox.min.x * zoom;
-	bbox.min.y = bbox.min.y * zoom;
-	bbox.max.x = bbox.max.x * zoom;
-	bbox.max.y = bbox.max.y * zoom;
-	w = bbox.max.x - bbox.min.x;
-	h = bbox.max.y - bbox.min.y;
+	bbox.x0 = bbox.x0 * zoom;
+	bbox.y0 = bbox.y0 * zoom;
+	bbox.x1 = bbox.x1 * zoom;
+	bbox.y1 = bbox.y1 * zoom;
+	w = bbox.x1 - bbox.x0;
+	h = bbox.y1 - bbox.y0;
 	bh = h / nbands;
 
 	fd = open(namebuf, O_BINARY|O_WRONLY|O_CREAT|O_TRUNC, 0666);
@@ -105,7 +105,7 @@ void showpage(pdf_xref *xref, fz_obj *pageobj, int pagenum)
 	sprintf(buf, "P6\n%d %d\n255\n", w, bh * nbands);
 	write(fd, buf, strlen(buf));
 
-	error = fz_newpixmap(&pix, bbox.min.x, bbox.min.y, w, bh, 4);
+	error = fz_newpixmap(&pix, bbox.x0, bbox.y0, w, bh, 4);
 	if (error)
 		fz_abort(error);
 
diff --git a/fitz/base_matrix.c b/fitz/base_matrix.c
index 7d7097c4..e24196f9 100644
--- a/fitz/base_matrix.c
+++ b/fitz/base_matrix.c
@@ -134,18 +134,18 @@ fz_transformaabb(fz_matrix m, fz_rect r)
 	if (fz_isinfiniterect(r))
 		return r;
 
-	s.x = r.min.x; s.y = r.min.y;
-	t.x = r.min.x; t.y = r.max.y;
-	u.x = r.max.x; u.y = r.max.y;
-	v.x = r.max.x; v.y = r.min.y;
+	s.x = r.x0; s.y = r.y0;
+	t.x = r.x0; t.y = r.y1;
+	u.x = r.x1; u.y = r.y1;
+	v.x = r.x1; v.y = r.y0;
 	s = fz_transformpoint(m, s);
 	t = fz_transformpoint(m, t);
 	u = fz_transformpoint(m, u);
 	v = fz_transformpoint(m, v);
-	r.min.x = MIN4(s.x, t.x, u.x, v.x);
-	r.min.y = MIN4(s.y, t.y, u.y, v.y);
-	r.max.x = MAX4(s.x, t.x, u.x, v.x);
-	r.max.y = MAX4(s.y, t.y, u.y, v.y);
+	r.x0 = MIN4(s.x, t.x, u.x, v.x);
+	r.y0 = MIN4(s.y, t.y, u.y, v.y);
+	r.x1 = MAX4(s.x, t.x, u.x, v.x);
+	r.y1 = MAX4(s.y, t.y, u.y, v.y);
 	return r;
 }
 
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;
 }
 
diff --git a/fitz/node_misc2.c b/fitz/node_misc2.c
index cd4595f4..5382273e 100644
--- a/fitz/node_misc2.c
+++ b/fitz/node_misc2.c
@@ -297,10 +297,10 @@ fz_rect
 fz_boundimagenode(fz_imagenode *node, fz_matrix ctm)
 {
 	fz_rect bbox;
-	bbox.min.x = 0;
-	bbox.min.y = 0;
-	bbox.max.x = 1;
-	bbox.max.y = 1;
+	bbox.x0 = 0;
+	bbox.y0 = 0;
+	bbox.x1 = 1;
+	bbox.y1 = 1;
 	return fz_transformaabb(ctm, bbox);
 }
 
diff --git a/fitz/node_optimize.c b/fitz/node_optimize.c
index d92aa812..2cb97d85 100644
--- a/fitz/node_optimize.c
+++ b/fitz/node_optimize.c
@@ -143,10 +143,10 @@ static int getrect(fz_pathnode *path, fz_rect *bboxp)
 
 	if (path->els[12].k != FZ_CLOSEPATH) return 0;
 
-	bboxp->min.x = MIN(x, x + w);
-	bboxp->min.y = MIN(y, y + h);
-	bboxp->max.x = MAX(x, x + w);
-	bboxp->max.y = MAX(y, y + h);
+	bboxp->x0 = MIN(x, x + w);
+	bboxp->y0 = MIN(y, y + h);
+	bboxp->x1 = MAX(x, x + w);
+	bboxp->y1 = MAX(y, y + h);
 
 	return 1;
 }
@@ -157,10 +157,10 @@ static int fitsinside(fz_node *node, fz_rect clip)
 	bbox = fz_boundnode(node, fz_identity());
 	if (fz_isinfiniterect(bbox)) return 0;
 	if (fz_isemptyrect(bbox)) return 1;
-	if (bbox.min.x < clip.min.x) return 0;
-	if (bbox.max.x > clip.max.x) return 0;
-	if (bbox.min.y < clip.min.y) return 0;
-	if (bbox.max.y > clip.max.y) return 0;
+	if (bbox.x0 < clip.x0) return 0;
+	if (bbox.x1 > clip.x1) return 0;
+	if (bbox.y0 < clip.y0) return 0;
+	if (bbox.y1 > clip.y1) return 0;
 	return 1;
 }
 
diff --git a/fitz/node_path.c b/fitz/node_path.c
index 24b4dfc8..5f4b4425 100644
--- a/fitz/node_path.c
+++ b/fitz/node_path.c
@@ -171,10 +171,10 @@ fz_endpath(fz_pathnode *path, fz_pathkind paint, fz_stroke *stroke, fz_dash *das
 
 static inline fz_rect boundexpand(fz_rect r, fz_point p)
 {
-	if (p.x < r.min.x) r.min.x = p.x;
-	if (p.y < r.min.y) r.min.y = p.y;
-	if (p.x > r.max.x) r.max.x = p.x;
-	if (p.y > r.max.y) r.max.y = p.y;
+	if (p.x < r.x0) r.x0 = p.x;
+	if (p.y < r.y0) r.y0 = p.y;
+	if (p.x > r.x1) r.x1 = p.x;
+	if (p.y > r.y1) r.y1 = p.y;
 	return r;
 }
 
@@ -190,8 +190,8 @@ fz_boundpathnode(fz_pathnode *path, fz_matrix ctm)
 		p.x = path->els[1].v;
 		p.y = path->els[2].v;
 		p = fz_transformpoint(ctm, p);
-		r.min.x = r.max.x = p.x;
-		r.min.y = r.max.y = p.y;
+		r.x0 = r.x1 = p.x;
+		r.y0 = r.y1 = p.y;
 	}
 
 	while (i < path->len)
@@ -221,10 +221,10 @@ fz_boundpathnode(fz_pathnode *path, fz_matrix ctm)
 		float miterlength = sin(path->miterlimit / 2.0);
 		float linewidth = path->linewidth;
 		float expand = MAX(miterlength, linewidth) / 2.0;
-		r.min.x -= expand;
-		r.min.y -= expand;
-		r.max.x += expand;
-		r.max.y += expand;
+		r.x0 -= expand;
+		r.y0 -= expand;
+		r.x1 += expand;
+		r.y1 += expand;
 	}
 
 	return r;
diff --git a/fitz/node_text.c b/fitz/node_text.c
index d88e04ec..49cdb576 100644
--- a/fitz/node_text.c
+++ b/fitz/node_text.c
@@ -72,15 +72,15 @@ fz_boundtextnode(fz_textnode *text, fz_matrix ctm)
 
 	/* find bbox of glyph origins in ctm space */
 
-	bbox.min.x = bbox.max.x = text->els[0].x;
-	bbox.min.y = bbox.max.y = text->els[0].y;
+	bbox.x0 = bbox.x1 = text->els[0].x;
+	bbox.y0 = bbox.y1 = text->els[0].y;
 
 	for (i = 1; i < text->len; i++)
 	{
-		bbox.min.x = MIN(bbox.min.x, text->els[i].x);
-		bbox.min.y = MIN(bbox.min.y, text->els[i].y);
-		bbox.max.x = MAX(bbox.max.x, text->els[i].x);
-		bbox.max.y = MAX(bbox.max.y, text->els[i].y);
+		bbox.x0 = MIN(bbox.x0, text->els[i].x);
+		bbox.y0 = MIN(bbox.y0, text->els[i].y);
+		bbox.x1 = MAX(bbox.x1, text->els[i].x);
+		bbox.y1 = MAX(bbox.y1, text->els[i].y);
 	}
 
 	bbox = fz_transformaabb(ctm, bbox);
@@ -91,19 +91,19 @@ fz_boundtextnode(fz_textnode *text, fz_matrix ctm)
 	trm.e = 0;
 	trm.f = 0;
 
-	fbox.min.x = text->font->bbox.min.x * 0.001;
-	fbox.min.y = text->font->bbox.min.y * 0.001;
-	fbox.max.x = text->font->bbox.max.x * 0.001;
-	fbox.max.y = text->font->bbox.max.y * 0.001;
+	fbox.x0 = text->font->bbox.x0 * 0.001;
+	fbox.y0 = text->font->bbox.y0 * 0.001;
+	fbox.x1 = text->font->bbox.x1 * 0.001;
+	fbox.y1 = text->font->bbox.y1 * 0.001;
 
 	fbox = fz_transformaabb(trm, fbox);
 
 	/* expand glyph origin bbox by font bbox */
 
-	bbox.min.x += fbox.min.x;
-	bbox.min.y += fbox.min.y;
-	bbox.max.x += fbox.max.x;
-	bbox.max.y += fbox.max.y;
+	bbox.x0 += fbox.x0;
+	bbox.y0 += fbox.y0;
+	bbox.x1 += fbox.x1;
+	bbox.y1 += fbox.y1;
 
 	return bbox;
 }
diff --git a/fitz/res_font.c b/fitz/res_font.c
index b7367ce1..3875a0c7 100644
--- a/fitz/res_font.c
+++ b/fitz/res_font.c
@@ -8,10 +8,10 @@ fz_initfont(fz_font *font, char *name)
 
 	font->wmode = 0;
 
-	font->bbox.min.x = 0;
-	font->bbox.min.y = 0;
-	font->bbox.max.x = 1000;
-	font->bbox.max.y = 1000;
+	font->bbox.x0 = 0;
+	font->bbox.y0 = 0;
+	font->bbox.x1 = 1000;
+	font->bbox.y1 = 1000;
 
 	font->hmtxcap = 0;
 	font->vmtxcap = 0;
@@ -60,10 +60,10 @@ fz_setfontwmode(fz_font *font, int wmode)
 void
 fz_setfontbbox(fz_font *font, int xmin, int ymin, int xmax, int ymax)
 {
-	font->bbox.min.x = xmin;
-	font->bbox.min.y = ymin;
-	font->bbox.max.x = xmax;
-	font->bbox.max.y = ymax;
+	font->bbox.x0 = xmin;
+	font->bbox.y0 = ymin;
+	font->bbox.x1 = xmax;
+	font->bbox.y1 = ymax;
 }
 
 void
@@ -244,8 +244,8 @@ fz_debugfont(fz_font *font)
 	printf("font '%s' {\n", font->name);
 	printf("  wmode %d\n", font->wmode);
 	printf("  bbox [%d %d %d %d]\n",
-		font->bbox.min.x, font->bbox.min.y,
-		font->bbox.max.x, font->bbox.max.y);
+		font->bbox.x0, font->bbox.y0,
+		font->bbox.x1, font->bbox.y1);
 	printf("  DW %d\n", font->dhmtx.w);
 
 	printf("  W {\n");
diff --git a/include/fitz/geometry.h b/include/fitz/geometry.h
index 7d2adc98..13290007 100644
--- a/include/fitz/geometry.h
+++ b/include/fitz/geometry.h
@@ -7,8 +7,8 @@ typedef struct fz_irect_s fz_irect;
 extern fz_rect fz_emptyrect;
 extern fz_rect fz_infiniterect;
 
-#define fz_isemptyrect(r) ((r).min.x == (r).max.x)
-#define fz_isinfiniterect(r) ((r).min.x > (r).max.x)
+#define fz_isemptyrect(r) ((r).x0 == (r).x1)
+#define fz_isinfiniterect(r) ((r).x0 > (r).x1)
 
 /*
 	/ a b 0 \
@@ -27,8 +27,8 @@ struct fz_point_s
 
 struct fz_rect_s
 {
-	fz_point min;
-	fz_point max;
+	float x0, y0;
+	float x1, y1;
 };
 
 struct fz_ipoint_s
@@ -38,8 +38,8 @@ struct fz_ipoint_s
 
 struct fz_irect_s
 {
-	fz_ipoint min;
-	fz_ipoint max;
+	int x0, y0;
+	int x1, y1;
 };
 
 void fz_invert3x3(float *dst, float *m);
diff --git a/mupdf/pdf_annot.c b/mupdf/pdf_annot.c
index 055dae75..da4dbe80 100644
--- a/mupdf/pdf_annot.c
+++ b/mupdf/pdf_annot.c
@@ -90,8 +90,8 @@ pdf_loadlink(pdf_link **linkp, pdf_xref *xref, fz_obj *dict)
 	{
 		bbox = pdf_torect(obj);
 		pdf_logpage("rect [%g %g %g %g]\n",
-			bbox.min.x, bbox.min.y,
-			bbox.max.x, bbox.max.y);
+			bbox.x0, bbox.y0,
+			bbox.x1, bbox.y1);
 	}
 	else
 		bbox = fz_emptyrect;
diff --git a/mupdf/pdf_build.c b/mupdf/pdf_build.c
index 2c56e484..736b2de1 100644
--- a/mupdf/pdf_build.c
+++ b/mupdf/pdf_build.c
@@ -323,15 +323,15 @@ addpatternshape(pdf_gstate *gs, fz_node *shape,
 	bbox = fz_boundnode(shape, ptm);
 
 	/* expand bbox by pattern bbox */
-	bbox.min.x += pat->bbox.min.x;
-	bbox.min.y += pat->bbox.min.y;
-	bbox.max.x += pat->bbox.max.x;
-	bbox.max.y += pat->bbox.max.y;
-
-	x0 = fz_floor(bbox.min.x / pat->xstep);
-	y0 = fz_floor(bbox.min.y / pat->ystep);
-	x1 = fz_ceil(bbox.max.x / pat->xstep);
-	y1 = fz_ceil(bbox.max.y / pat->ystep);
+	bbox.x0 += pat->bbox.x0;
+	bbox.y0 += pat->bbox.y0;
+	bbox.x1 += pat->bbox.x1;
+	bbox.y1 += pat->bbox.y1;
+
+	x0 = fz_floor(bbox.x0 / pat->xstep);
+	y0 = fz_floor(bbox.y0 / pat->ystep);
+	x1 = fz_ceil(bbox.x1 / pat->xstep);
+	y1 = fz_ceil(bbox.y1 / pat->ystep);
 
 	for (y = y0; y <= y1; y++)
 	{
diff --git a/mupdf/pdf_font.c b/mupdf/pdf_font.c
index d92ffe50..df92eff8 100644
--- a/mupdf/pdf_font.c
+++ b/mupdf/pdf_font.c
@@ -331,17 +331,17 @@ loadsimplefont(pdf_font **fontp, pdf_xref *xref, fz_obj *dict, fz_obj *ref)
 
 	pdf_logfont("ft name '%s' '%s'\n", face->family_name, face->style_name);
 
-	bbox.min.x = (face->bbox.xMin * 1000) / face->units_per_EM;
-	bbox.min.y = (face->bbox.yMin * 1000) / face->units_per_EM;
-	bbox.max.x = (face->bbox.xMax * 1000) / face->units_per_EM;
-	bbox.max.y = (face->bbox.yMax * 1000) / face->units_per_EM;
+	bbox.x0 = (face->bbox.xMin * 1000) / face->units_per_EM;
+	bbox.y0 = (face->bbox.yMin * 1000) / face->units_per_EM;
+	bbox.x1 = (face->bbox.xMax * 1000) / face->units_per_EM;
+	bbox.y1 = (face->bbox.yMax * 1000) / face->units_per_EM;
 
-	pdf_logfont("ft bbox [%d %d %d %d]\n", bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y);
+	pdf_logfont("ft bbox [%d %d %d %d]\n", bbox.x0, bbox.y0, bbox.x1, bbox.y1);
 
-	if (bbox.min.x == bbox.max.x)
+	if (bbox.x0 == bbox.x1)
 		fz_setfontbbox((fz_font*)font, -1000, -1000, 2000, 2000);
 	else
-		fz_setfontbbox((fz_font*)font, bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y);
+		fz_setfontbbox((fz_font*)font, bbox.x0, bbox.y0, bbox.x1, bbox.y1);
 
 	/*
 	 * Encoding
@@ -643,17 +643,17 @@ loadcidfont(pdf_font **fontp, pdf_xref *xref, fz_obj *dict, fz_obj *ref, fz_obj
 	face = font->ftface;
 	kind = ftkind(face);
 
-	bbox.min.x = (face->bbox.xMin * 1000) / face->units_per_EM;
-	bbox.min.y = (face->bbox.yMin * 1000) / face->units_per_EM;
-	bbox.max.x = (face->bbox.xMax * 1000) / face->units_per_EM;
-	bbox.max.y = (face->bbox.yMax * 1000) / face->units_per_EM;
+	bbox.x0 = (face->bbox.xMin * 1000) / face->units_per_EM;
+	bbox.y0 = (face->bbox.yMin * 1000) / face->units_per_EM;
+	bbox.x1 = (face->bbox.xMax * 1000) / face->units_per_EM;
+	bbox.y1 = (face->bbox.yMax * 1000) / face->units_per_EM;
 
-	pdf_logfont("ft bbox [%d %d %d %d]\n", bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y);
+	pdf_logfont("ft bbox [%d %d %d %d]\n", bbox.x0, bbox.y0, bbox.x1, bbox.y1);
 
-	if (bbox.min.x == bbox.max.x)
+	if (bbox.x0 == bbox.x1)
 		fz_setfontbbox((fz_font*)font, -1000, -1000, 2000, 2000);
 	else
-		fz_setfontbbox((fz_font*)font, bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y);
+		fz_setfontbbox((fz_font*)font, bbox.x0, bbox.y0, bbox.x1, bbox.y1);
 
 	/*
 	 * Encoding
@@ -953,8 +953,8 @@ pdf_loadfontdescriptor(pdf_font *font, pdf_xref *xref, fz_obj *desc, char *colle
 
 	bbox = pdf_torect(fz_dictgets(desc, "FontBBox"));
 	pdf_logfont("bbox [%g %g %g %g]\n",
-		bbox.min.x, bbox.min.y,
-		bbox.max.x, bbox.max.y);
+		bbox.x0, bbox.y0,
+		bbox.x1, bbox.y1);
 
 	pdf_logfont("flags %d\n", font->flags);
 
diff --git a/mupdf/pdf_page.c b/mupdf/pdf_page.c
index 9597a9d8..b230c871 100644
--- a/mupdf/pdf_page.c
+++ b/mupdf/pdf_page.c
@@ -164,7 +164,7 @@ pdf_loadpage(pdf_page **pagep, pdf_xref *xref, fz_obj *dict)
 	bbox = pdf_torect(obj);
 
 	pdf_logpage("bbox [%g %g %g %g]\n",
-		bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y);
+		bbox.x0, bbox.y0, bbox.x1, bbox.y1);
 
 	obj = fz_dictgets(dict, "Rotate");
 	if (fz_isint(obj))
@@ -235,10 +235,10 @@ pdf_loadpage(pdf_page **pagep, pdf_xref *xref, fz_obj *dict)
 		return fz_outofmem;
 	}
 
-	page->mediabox.min.x = MIN(bbox.min.x, bbox.max.x);
-	page->mediabox.min.y = MIN(bbox.min.y, bbox.max.y);
-	page->mediabox.max.x = MAX(bbox.min.x, bbox.max.x);
-	page->mediabox.max.y = MAX(bbox.min.y, bbox.max.y);
+	page->mediabox.x0 = MIN(bbox.x0, bbox.x1);
+	page->mediabox.y0 = MIN(bbox.y0, bbox.y1);
+	page->mediabox.x1 = MAX(bbox.x0, bbox.x1);
+	page->mediabox.y1 = MAX(bbox.y0, bbox.y1);
 	page->rotate = rotate;
 	page->resources = rdb;
 	page->tree = tree;
diff --git a/mupdf/pdf_parse.c b/mupdf/pdf_parse.c
index 9217f0af..1bdd057e 100644
--- a/mupdf/pdf_parse.c
+++ b/mupdf/pdf_parse.c
@@ -8,10 +8,10 @@ fz_rect pdf_torect(fz_obj *array)
 	float b = fz_toreal(fz_arrayget(array, 1));
 	float c = fz_toreal(fz_arrayget(array, 2));
 	float d = fz_toreal(fz_arrayget(array, 3));
-	r.min.x = MIN(a, c);
-	r.min.y = MIN(b, d);
-	r.max.x = MAX(a, c);
-	r.max.y = MAX(b, d);
+	r.x0 = MIN(a, c);
+	r.y0 = MIN(b, d);
+	r.x1 = MAX(a, c);
+	r.y1 = MAX(b, d);
 	return r;
 }
 
diff --git a/mupdf/pdf_pattern.c b/mupdf/pdf_pattern.c
index 76b52034..d4e99c48 100644
--- a/mupdf/pdf_pattern.c
+++ b/mupdf/pdf_pattern.c
@@ -53,8 +53,8 @@ pdf_loadpattern(pdf_pattern **patp, pdf_xref *xref, fz_obj *dict, fz_obj *stmref
 	pat->bbox = pdf_torect(obj);
 
 	pdf_logrsrc("bbox [%g %g %g %g]\n",
-		pat->bbox.min.x, pat->bbox.min.y,
-		pat->bbox.max.x, pat->bbox.max.y);
+		pat->bbox.x0, pat->bbox.y0,
+		pat->bbox.x1, pat->bbox.y1);
 
 	obj = fz_dictgets(dict, "Matrix");
 	if (obj)
diff --git a/mupdf/pdf_shade.c b/mupdf/pdf_shade.c
index 9c31c599..b356ce33 100644
--- a/mupdf/pdf_shade.c
+++ b/mupdf/pdf_shade.c
@@ -107,8 +107,8 @@ loadshadedict(fz_shade **shadep, pdf_xref *xref, fz_obj *dict, fz_obj *ref, fz_m
 	{
 		shade->bbox = pdf_torect(obj);
 		pdf_logshade("bbox [%g %g %g %g]\n",
-			shade->bbox.min.x, shade->bbox.min.y,
-			shade->bbox.max.x, shade->bbox.max.y);
+			shade->bbox.x0, shade->bbox.y0,
+			shade->bbox.x1, shade->bbox.y1);
 	}
 
 	switch(type)
diff --git a/mupdf/pdf_type3.c b/mupdf/pdf_type3.c
index 5927b8ba..b1da3380 100644
--- a/mupdf/pdf_type3.c
+++ b/mupdf/pdf_type3.c
@@ -129,15 +129,15 @@ pdf_loadtype3font(pdf_font **fontp, pdf_xref *xref, fz_obj *dict, fz_obj *ref)
 	bbox = pdf_torect(obj);
 
 	pdf_logfont("bbox [%g %g %g %g]\n",
-		bbox.min.x, bbox.min.y,
-		bbox.max.x, bbox.max.y);
+		bbox.x0, bbox.y0,
+		bbox.x1, bbox.y1);
 
 	bbox = fz_transformaabb(font->matrix, bbox);
-	bbox.min.x = fz_floor(bbox.min.x * 1000);
-	bbox.min.y = fz_floor(bbox.min.y * 1000);
-	bbox.max.x = fz_ceil(bbox.max.x * 1000);
-	bbox.max.y = fz_ceil(bbox.max.y * 1000);
-	fz_setfontbbox((fz_font*)font, bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y);
+	bbox.x0 = fz_floor(bbox.x0 * 1000);
+	bbox.y0 = fz_floor(bbox.y0 * 1000);
+	bbox.x1 = fz_ceil(bbox.x1 * 1000);
+	bbox.y1 = fz_ceil(bbox.y1 * 1000);
+	fz_setfontbbox((fz_font*)font, bbox.x0, bbox.y0, bbox.x1, bbox.y1);
 
 	/*
 	 * Encoding
diff --git a/mupdf/pdf_xobject.c b/mupdf/pdf_xobject.c
index 473a1485..0819f04b 100644
--- a/mupdf/pdf_xobject.c
+++ b/mupdf/pdf_xobject.c
@@ -28,8 +28,8 @@ pdf_loadxobject(pdf_xobject **formp, pdf_xref *xref, fz_obj *dict, fz_obj *ref)
 	form->bbox = pdf_torect(obj);
 
 	pdf_logrsrc("bbox [%g %g %g %g]\n",
-		form->bbox.min.x, form->bbox.min.y,
-		form->bbox.max.x, form->bbox.max.y);
+		form->bbox.x0, form->bbox.y0,
+		form->bbox.x1, form->bbox.y1);
 
 	obj = fz_dictgets(dict, "Matrix");
 	if (obj)
diff --git a/render/pathscan.c b/render/pathscan.c
index 472b7de1..cea3a849 100644
--- a/render/pathscan.c
+++ b/render/pathscan.c
@@ -56,10 +56,10 @@ fz_irect
 fz_boundgel(fz_gel *gel)
 {
 	fz_irect bbox;
-	bbox.min.x = fz_idiv(gel->xmin, gel->hs);
-	bbox.min.y = fz_idiv(gel->ymin, gel->vs);
-	bbox.max.x = fz_idiv(gel->xmax, gel->hs) + 1;
-	bbox.max.y = fz_idiv(gel->ymax, gel->vs) + 1;
+	bbox.x0 = fz_idiv(gel->xmin, gel->hs);
+	bbox.y0 = fz_idiv(gel->ymin, gel->vs);
+	bbox.x1 = fz_idiv(gel->xmax, gel->hs) + 1;
+	bbox.y1 = fz_idiv(gel->ymax, gel->vs) + 1;
 	return bbox;
 }
 
@@ -418,11 +418,11 @@ fz_scanconvert(fz_gel *gel, fz_ael *ael, int eofill, fz_irect clip,
 	int hs = gel->hs;
 	int vs = gel->vs;
 
-	int skipx = clip.min.x - xmin;
-	int clipn = clip.max.x - clip.min.x;
+	int skipx = clip.x0 - xmin;
+	int clipn = clip.x1 - clip.x0;
 
-	assert(clip.min.x >= xmin);
-	assert(clip.max.x <= xmax);
+	assert(clip.x0 >= xmin);
+	assert(clip.x1 <= xmax);
 
 	if (gel->len == 0)
 		return nil;
@@ -443,7 +443,7 @@ fz_scanconvert(fz_gel *gel, fz_ael *ael, int eofill, fz_irect clip,
 		yc = fz_idiv(y, vs);
 		if (yc != yd)
 		{
-			if (yd >= clip.min.y && yd < clip.max.y)
+			if (yd >= clip.y0 && yd < clip.y1)
 			{
 				blit(pix, xmin + skipx, yd, deltas, skipx, clipn, rgb, over);
 			}
@@ -456,7 +456,7 @@ fz_scanconvert(fz_gel *gel, fz_ael *ael, int eofill, fz_irect clip,
 			return error;
 		}
 
-		if (yd >= clip.min.y && yd < clip.max.y)
+		if (yd >= clip.y0 && yd < clip.y1)
 		{
 			if (eofill)
 				evenodd(ael, deltas, xofs, hs);
@@ -472,7 +472,7 @@ fz_scanconvert(fz_gel *gel, fz_ael *ael, int eofill, fz_irect clip,
 			y = gel->edges[e].y;
 	}
 
-	if (yd >= clip.min.y && yd < clip.max.y)
+	if (yd >= clip.y0 && yd < clip.y1)
 	{
 		blit(pix, xmin + skipx, yd, deltas, skipx, clipn, rgb, over);
 	}
diff --git a/render/pixmap.c b/render/pixmap.c
index 4e6823d9..8f34ebcd 100644
--- a/render/pixmap.c
+++ b/render/pixmap.c
@@ -28,9 +28,9 @@ fz_error *
 fz_newpixmapwithrect(fz_pixmap **pixp, fz_irect r, int n)
 {
 	return fz_newpixmap(pixp,
-				r.min.x, r.min.y,
-				r.max.x - r.min.x,
-				r.max.y - r.min.y, n);
+				r.x0, r.y0,
+				r.x1 - r.x0,
+				r.y1 - r.y0, n);
 }
 
 fz_error *
diff --git a/render/render.c b/render/render.c
index a754f6ca..454536d0 100644
--- a/render/render.c
+++ b/render/render.c
@@ -409,10 +409,10 @@ DEBUG("  convert from %s to %s\n", image->cs->name, gc->model->name);
 	imgmat.f = 1.0;
 	invmat = fz_invertmatrix(fz_concat(imgmat, ctm));
 
-	w = clip.max.x - clip.min.x;
-	h = clip.max.y - clip.min.y;
-	x0 = clip.min.x;
-	y0 = clip.min.y;
+	w = clip.x1 - clip.x0;
+	h = clip.y1 - clip.y0;
+	x0 = clip.x0;
+	y0 = clip.y0;
 	u0 = (invmat.a * (x0+0.5) + invmat.c * (y0+0.5) + invmat.e) * 65536;
 	v0 = (invmat.b * (x0+0.5) + invmat.d * (y0+0.5) + invmat.f) * 65536;
 	fa = invmat.a * 65536;
@@ -507,21 +507,21 @@ blendover(fz_renderer *gc, fz_pixmap *src, fz_pixmap *dst)
 	fz_irect sr, dr;
 	int x, y, w, h;
 
-	sr.min.x = src->x;
-	sr.min.y = src->y;
-	sr.max.x = src->x + src->w;
-	sr.max.y = src->y + src->h;
+	sr.x0 = src->x;
+	sr.y0 = src->y;
+	sr.x1 = src->x + src->w;
+	sr.y1 = src->y + src->h;
 
-	dr.min.x = dst->x;
-	dr.min.y = dst->y;
-	dr.max.x = dst->x + dst->w;
-	dr.max.y = dst->y + dst->h;
+	dr.x0 = dst->x;
+	dr.y0 = dst->y;
+	dr.x1 = dst->x + dst->w;
+	dr.y1 = dst->y + dst->h;
 
 	dr = fz_intersectirects(sr, dr);
-	x = dr.min.x;
-	y = dr.min.y;
-	w = dr.max.x - dr.min.x;
-	h = dr.max.y - dr.min.y;
+	x = dr.x0;
+	y = dr.y0;
+	w = dr.x1 - dr.x0;
+	h = dr.y1 - dr.y0;
 
 	sp = src->samples + ((y - src->y) * src->w + (x - src->x)) * src->n;
 	dp = dst->samples + ((y - dst->y) * dst->w + (x - dst->x)) * dst->n;
@@ -543,27 +543,27 @@ blendmask(fz_renderer *gc, fz_pixmap *src, fz_pixmap *msk, fz_pixmap *dst, int o
 	fz_irect sr, dr, mr;
 	int x, y, w, h;
 
-	sr.min.x = src->x;
-	sr.min.y = src->y;
-	sr.max.x = src->x + src->w;
-	sr.max.y = src->y + src->h;
+	sr.x0 = src->x;
+	sr.y0 = src->y;
+	sr.x1 = src->x + src->w;
+	sr.y1 = src->y + src->h;
 
-	dr.min.x = dst->x;
-	dr.min.y = dst->y;
-	dr.max.x = dst->x + dst->w;
-	dr.max.y = dst->y + dst->h;
+	dr.x0 = dst->x;
+	dr.y0 = dst->y;
+	dr.x1 = dst->x + dst->w;
+	dr.y1 = dst->y + dst->h;
 
-	mr.min.x = msk->x;
-	mr.min.y = msk->y;
-	mr.max.x = msk->x + msk->w;
-	mr.max.y = msk->y + msk->h;
+	mr.x0 = msk->x;
+	mr.y0 = msk->y;
+	mr.x1 = msk->x + msk->w;
+	mr.y1 = msk->y + msk->h;
 
 	dr = fz_intersectirects(sr, dr);
 	dr = fz_intersectirects(dr, mr);
-	x = dr.min.x;
-	y = dr.min.y;
-	w = dr.max.x - dr.min.x;
-	h = dr.max.y - dr.min.y;
+	x = dr.x0;
+	y = dr.y0;
+	w = dr.x1 - dr.x0;
+	h = dr.y1 - dr.y0;
 
 	sp = src->samples + ((y - src->y) * src->w + (x - src->x)) * src->n;
 	mp = msk->samples + ((y - msk->y) * msk->w + (x - msk->x)) * msk->n;
@@ -690,13 +690,13 @@ rendermask(fz_renderer *gc, fz_masknode *mask, fz_matrix ctm)
 	if (fz_isemptyrect(clip))
 		return nil;
 
-DEBUG("mask [%d %d %d %d]\n{\n", clip.min.x, clip.min.y, clip.max.x, clip.max.y);
+DEBUG("mask [%d %d %d %d]\n{\n", clip.x0, clip.y0, clip.x1, clip.y1);
 
 {
 fz_irect sbox = fz_roundrect(fz_boundnode(shape, ctm));
 fz_irect cbox = fz_roundrect(fz_boundnode(color, ctm));
-if (cbox.min.x >= sbox.min.x && cbox.max.x <= sbox.max.x)
-if (cbox.min.y >= sbox.min.y && cbox.max.y <= sbox.max.y)
+if (cbox.x0 >= sbox.x0 && cbox.x1 <= sbox.x1)
+if (cbox.y0 >= sbox.y0 && cbox.y1 <= sbox.y1)
 DEBUG("potentially useless mask\n");
 }
 
@@ -731,10 +731,10 @@ DEBUG("potentially useless mask\n");
 		}
 		else
 		{
-			clip.min.x = MAX(colorpix->x, shapepix->x);
-			clip.min.y = MAX(colorpix->y, shapepix->y);
-			clip.max.x = MIN(colorpix->x+colorpix->w, shapepix->x+shapepix->w);
-			clip.max.y = MIN(colorpix->y+colorpix->h, shapepix->y+shapepix->h);
+			clip.x0 = MAX(colorpix->x, shapepix->x);
+			clip.y0 = MAX(colorpix->y, shapepix->y);
+			clip.x1 = MIN(colorpix->x+colorpix->w, shapepix->x+shapepix->w);
+			clip.y1 = MIN(colorpix->y+colorpix->h, shapepix->y+shapepix->h);
 			error = fz_newpixmapwithrect(&gc->dest, clip, colorpix->n);
 			if (error)
 				goto cleanup;
@@ -819,7 +819,7 @@ fz_rendertree(fz_pixmap **outp,
 
 DEBUG("tree %d [%d %d %d %d]\n{\n",
 gc->maskonly ? 1 : 4,
-bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y);
+bbox.x0, bbox.y0, bbox.x1, bbox.y1);
 
 	error = rendernode(gc, tree->root, ctm);
 	if (error)
@@ -848,10 +848,10 @@ fz_rendertreeover(fz_renderer *gc, fz_pixmap *dest, fz_tree *tree, fz_matrix ctm
 	assert(!gc->maskonly);
 	assert(dest->n == 4);
 
-	gc->clip.min.x = dest->x;
-	gc->clip.min.y = dest->y;
-	gc->clip.max.x = dest->x + dest->w;
-	gc->clip.max.y = dest->y + dest->h;
+	gc->clip.x0 = dest->x;
+	gc->clip.y0 = dest->y;
+	gc->clip.x1 = dest->x + dest->w;
+	gc->clip.y1 = dest->y + dest->h;
 
 	gc->over = dest;