Rename fz_irect to fz_bbox.

12 files changed, 42 insertions, 42 deletions

diff --git a/apps/mozilla/moz_main.c b/apps/mozilla/moz_main.c
index 90d69a67..551c34c1 100644
--- a/apps/mozilla/moz_main.c
+++ b/apps/mozilla/moz_main.c
@@ -72,7 +72,7 @@ void pdfmoz_open(pdfmoz_t *moz, char *filename)
     SCROLLINFO si;
     fz_error error;
     fz_obj *obj;
-    fz_irect bbox;
+    fz_bbox bbox;
     int rot;
     int i;
 
diff --git a/apps/pdfapp.c b/apps/pdfapp.c
index 893e6754..30c20fe3 100644
--- a/apps/pdfapp.c
+++ b/apps/pdfapp.c
@@ -224,7 +224,7 @@ static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage)
 	fz_device *idev, *tdev, *mdev;
 	fz_displaylist *list;
 	fz_matrix ctm;
-	fz_irect bbox;
+	fz_bbox bbox;
 	fz_obj *obj;
 
 	if (loadpage)
diff --git a/apps/pdfapp.h b/apps/pdfapp.h
index 9df3c46b..d243dea1 100644
--- a/apps/pdfapp.h
+++ b/apps/pdfapp.h
@@ -56,7 +56,7 @@ struct pdfapp_s
 
 	int iscopying;
 	int selx, sely;
-	fz_irect selr;
+	fz_bbox selr;
 
 	/* client context storage */
 	void *userdata;
diff --git a/apps/pdfdraw.c b/apps/pdfdraw.c
index 6f658fa9..5774e5aa 100644
--- a/apps/pdfdraw.c
+++ b/apps/pdfdraw.c
@@ -168,7 +168,7 @@ static void drawpnm(int pagenum, struct benchmark *loadtimes, struct benchmark *
 {
 	fz_error error;
 	fz_matrix ctm;
-	fz_irect bbox;
+	fz_bbox bbox;
 	fz_pixmap *pix;
 	char name[256];
 	char pnmhdr[256];
diff --git a/draw/pathscan.c b/draw/pathscan.c
index 9369e0ff..90f888fb 100644
--- a/draw/pathscan.c
+++ b/draw/pathscan.c
@@ -36,7 +36,7 @@ fz_newgel(void)
 }
 
 void
-fz_resetgel(fz_gel *gel, fz_irect clip)
+fz_resetgel(fz_gel *gel, fz_bbox clip)
 {
 	if (fz_isinfiniterect(clip))
 	{
@@ -63,10 +63,10 @@ fz_freegel(fz_gel *gel)
 	fz_free(gel);
 }
 
-fz_irect
+fz_bbox
 fz_boundgel(fz_gel *gel)
 {
-	fz_irect bbox;
+	fz_bbox bbox;
 	bbox.x0 = fz_idiv(gel->bbox.x0, HSCALE);
 	bbox.y0 = fz_idiv(gel->bbox.y0, VSCALE);
 	bbox.x1 = fz_idiv(gel->bbox.x1, HSCALE) + 1;
@@ -433,7 +433,7 @@ static inline void blit(fz_pixmap *pix, int x, int y,
 }
 
 fz_error
-fz_scanconvert(fz_gel *gel, fz_ael *ael, int eofill, fz_irect clip,
+fz_scanconvert(fz_gel *gel, fz_ael *ael, int eofill, fz_bbox clip,
 	fz_pixmap *pix, unsigned char *argb, int over)
 {
 	fz_error error;
diff --git a/fitz/base_rect.c b/fitz/base_rect.c
index f8b8b643..d2ba5bd1 100644
--- a/fitz/base_rect.c
+++ b/fitz/base_rect.c
@@ -3,12 +3,12 @@
 fz_rect fz_infiniterect = { 1, 1, -1, -1 };
 fz_rect fz_emptyrect = { 0, 0, 0, 0 };
 
-static fz_irect empty = { 0, 0, 0, 0 };
+static fz_bbox empty = { 0, 0, 0, 0 };
 
-fz_irect
+fz_bbox
 fz_roundrect(fz_rect f)
 {
-	fz_irect i;
+	fz_bbox i;
 	i.x0 = floor(f.x0);
 	i.y0 = floor(f.y0);
 	i.x1 = ceil(f.x1);
@@ -16,10 +16,10 @@ fz_roundrect(fz_rect f)
 	return i;
 }
 
-fz_irect
-fz_intersectirects(fz_irect a, fz_irect b)
+fz_bbox
+fz_intersectirects(fz_bbox a, fz_bbox b)
 {
-	fz_irect r;
+	fz_bbox r;
 	if (fz_isinfiniterect(a)) return b;
 	if (fz_isinfiniterect(b)) return a;
 	r.x0 = MAX(a.x0, b.x0);
diff --git a/fitz/dev_draw.c b/fitz/dev_draw.c
index de1c17c7..456f61a0 100644
--- a/fitz/dev_draw.c
+++ b/fitz/dev_draw.c
@@ -27,7 +27,7 @@ static void
 blendover(fz_pixmap *src, fz_pixmap *dst)
 {
 	unsigned char *sp, *dp;
-	fz_irect sr, dr;
+	fz_bbox sr, dr;
 	int x, y, w, h;
 
 	sr.x0 = src->x;
@@ -63,7 +63,7 @@ static void
 blendmaskover(fz_pixmap *src, fz_pixmap *msk, fz_pixmap *dst)
 {
 	unsigned char *sp, *dp, *mp;
-	fz_irect sr, dr, mr;
+	fz_bbox sr, dr, mr;
 	int x, y, w, h;
 
 	sr.x0 = src->x;
@@ -111,8 +111,8 @@ fz_drawfillpath(void *user, fz_path *path, fz_matrix ctm,
 	fz_drawdevice *dev = user;
 	float expansion = fz_matrixexpansion(ctm);
 	float flatness = 0.3 / expansion;
-	fz_irect bbox;
-	fz_irect clip;
+	fz_bbox bbox;
+	fz_bbox clip;
 
 	clip.x0 = dev->dest->x;
 	clip.y0 = dev->dest->y;
@@ -156,8 +156,8 @@ fz_drawstrokepath(void *user, fz_path *path, fz_matrix ctm,
 	float expansion = fz_matrixexpansion(ctm);
 	float flatness = 0.3 / expansion;
 	float linewidth = path->linewidth;
-	fz_irect bbox;
-	fz_irect clip;
+	fz_bbox bbox;
+	fz_bbox clip;
 
 	if (linewidth * expansion < 0.1)
 		linewidth = 1.0 / expansion;
@@ -205,7 +205,7 @@ fz_drawclippath(void *user, fz_path *path, fz_matrix ctm)
 	fz_drawdevice *dev = user;
 	float expansion = fz_matrixexpansion(ctm);
 	float flatness = 0.3 / expansion;
-	fz_irect clip, bbox;
+	fz_bbox clip, bbox;
 	fz_pixmap *mask, *dest;
 
 	if (dev->cliptop == MAXCLIP)
@@ -286,7 +286,7 @@ fz_drawfilltext(void *user, fz_text *text, fz_matrix ctm,
 	fz_colorspace *colorspace, float *color, float alpha)
 {
 	fz_drawdevice *dev = user;
-	fz_irect clip;
+	fz_bbox clip;
 	fz_matrix tm, trm;
 	fz_glyph glyph;
 	int i, x, y, gid;
@@ -379,8 +379,8 @@ fz_drawfillshade(void *user, fz_shade *shade, fz_matrix ctm)
 {
 	fz_drawdevice *dev = user;
 	fz_rect bounds;
-	fz_irect bbox;
-	fz_irect clip;
+	fz_bbox bbox;
+	fz_bbox clip;
 	fz_pixmap *temp;
 	float rgb[3];
 	unsigned char argb[4];
@@ -456,8 +456,8 @@ fz_drawfillimage(void *user, fz_pixmap *image, fz_matrix ctm)
 {
 	fz_drawdevice *dev = user;
 	fz_rect bounds;
-	fz_irect bbox;
-	fz_irect clip;
+	fz_bbox bbox;
+	fz_bbox clip;
 	int dx, dy;
 	fz_pixmap *temp;
 	fz_matrix imgmat;
@@ -544,8 +544,8 @@ fz_drawfillimagemask(void *user, fz_pixmap *image, fz_matrix ctm,
 {
 	fz_drawdevice *dev = user;
 	fz_rect bounds;
-	fz_irect bbox;
-	fz_irect clip;
+	fz_bbox bbox;
+	fz_bbox clip;
 	int dx, dy;
 	fz_pixmap *temp;
 	fz_matrix imgmat;
@@ -632,7 +632,7 @@ fz_drawclipimagemask(void *user, fz_pixmap *image, fz_matrix ctm)
 {
 	fz_drawdevice *dev = user;
 	fz_rect bounds;
-	fz_irect clip, bbox;
+	fz_bbox clip, bbox;
 	fz_pixmap *mask, *dest;
 	int dx, dy;
 	fz_pixmap *temp;
diff --git a/fitz/fitz_base.h b/fitz/fitz_base.h
index 356a71c4..00e10b20 100644
--- a/fitz/fitz_base.h
+++ b/fitz/fitz_base.h
@@ -200,7 +200,7 @@ void *fz_hashgetval(fz_hashtable *table, int idx);
 typedef struct fz_matrix_s fz_matrix;
 typedef struct fz_point_s fz_point;
 typedef struct fz_rect_s fz_rect;
-typedef struct fz_irect_s fz_irect;
+typedef struct fz_bbox_s fz_bbox;
 
 extern fz_rect fz_emptyrect;
 extern fz_rect fz_infiniterect;
@@ -230,7 +230,7 @@ struct fz_rect_s
 	float x1, y1;
 };
 
-struct fz_irect_s
+struct fz_bbox_s
 {
 	int x0, y0;
 	int x1, y1;
@@ -247,8 +247,8 @@ fz_matrix fz_invertmatrix(fz_matrix m);
 int fz_isrectilinear(fz_matrix m);
 float fz_matrixexpansion(fz_matrix m);
 
-fz_irect fz_roundrect(fz_rect r);
-fz_irect fz_intersectirects(fz_irect a, fz_irect b);
+fz_bbox fz_roundrect(fz_rect r);
+fz_bbox fz_intersectirects(fz_bbox a, fz_bbox b);
 
 fz_point fz_transformpoint(fz_matrix m, fz_point p);
 fz_rect fz_transformaabb(fz_matrix m, fz_rect r);
diff --git a/fitz/fitz_draw.h b/fitz/fitz_draw.h
index 0bda294c..8076f0aa 100644
--- a/fitz/fitz_draw.h
+++ b/fitz/fitz_draw.h
@@ -33,8 +33,8 @@ struct fz_edge_s
 
 struct fz_gel_s
 {
-	fz_irect clip;
-	fz_irect bbox;
+	fz_bbox clip;
+	fz_bbox bbox;
 	int cap;
 	int len;
 	fz_edge *edges;
@@ -49,8 +49,8 @@ struct fz_ael_s
 
 fz_gel * fz_newgel(void);
 void fz_insertgel(fz_gel *gel, float x0, float y0, float x1, float y1);
-fz_irect fz_boundgel(fz_gel *gel);
-void fz_resetgel(fz_gel *gel, fz_irect clip);
+fz_bbox fz_boundgel(fz_gel *gel);
+void fz_resetgel(fz_gel *gel, fz_bbox clip);
 void fz_sortgel(fz_gel *gel);
 void fz_freegel(fz_gel *gel);
 
@@ -58,7 +58,7 @@ fz_ael * fz_newael(void);
 void fz_freeael(fz_ael *ael);
 
 fz_error fz_scanconvert(fz_gel *gel, fz_ael *ael, int eofill,
-	fz_irect clip, fz_pixmap *pix, unsigned char *argb, int over);
+	fz_bbox clip, fz_pixmap *pix, unsigned char *argb, int over);
 
 void fz_fillpath(fz_gel *gel, fz_path *path, fz_matrix ctm, float flatness);
 void fz_strokepath(fz_gel *gel, fz_path *path, fz_matrix ctm, float flatness, float linewidth);
diff --git a/fitz/fitz_res.h b/fitz/fitz_res.h
index 2faf883a..de30f601 100644
--- a/fitz/fitz_res.h
+++ b/fitz/fitz_res.h
@@ -54,7 +54,7 @@ struct fz_pixmap_s
 	unsigned char *samples;
 };
 
-fz_pixmap * fz_newpixmapwithrect(fz_colorspace *, fz_irect bbox);
+fz_pixmap * fz_newpixmapwithrect(fz_colorspace *, fz_bbox bbox);
 fz_pixmap * fz_newpixmap(fz_colorspace *, int x, int y, int w, int h);
 fz_pixmap *fz_keeppixmap(fz_pixmap *map);
 void fz_droppixmap(fz_pixmap *map);
diff --git a/fitz/res_pixmap.c b/fitz/res_pixmap.c
index dd42fb31..79900ed1 100644
--- a/fitz/res_pixmap.c
+++ b/fitz/res_pixmap.c
@@ -26,7 +26,7 @@ fz_newpixmap(fz_colorspace *colorspace, int x, int y, int w, int h)
 }
 
 fz_pixmap *
-fz_newpixmapwithrect(fz_colorspace *colorspace, fz_irect r)
+fz_newpixmapwithrect(fz_colorspace *colorspace, fz_bbox r)
 {
 	return fz_newpixmap(colorspace, r.x0, r.y0, r.x1 - r.x0, r.y1 - r.y0);
 }
diff --git a/mupdf/pdf_font.c b/mupdf/pdf_font.c
index f81b0a98..d7684924 100644
--- a/mupdf/pdf_font.c
+++ b/mupdf/pdf_font.c
@@ -242,7 +242,7 @@ loadsimplefont(pdf_fontdesc **fontdescp, pdf_xref *xref, fz_obj *dict)
 	fz_obj *widths;
 	unsigned short *etable = nil;
 	pdf_fontdesc *fontdesc;
-	fz_irect bbox;
+	fz_bbox bbox;
 	FT_Face face;
 	FT_CharMap cmap;
 	int kind;
@@ -558,7 +558,7 @@ loadcidfont(pdf_fontdesc **fontdescp, pdf_xref *xref, fz_obj *dict, fz_obj *enco
 	fz_obj *descriptor;
 	pdf_fontdesc *fontdesc;
 	FT_Face face;
-	fz_irect bbox;
+	fz_bbox bbox;
 	int kind;
 	char collection[256];
 	char *basefont;