Rename functions fz_intersectirects and fz_transformaabb.

7 files changed, 22 insertions, 22 deletions

diff --git a/fitz/base_matrix.c b/fitz/base_matrix.c
index 8bdd6e6c..8735b1ad 100644
--- a/fitz/base_matrix.c
+++ b/fitz/base_matrix.c
@@ -159,7 +159,7 @@ fz_transformpoint(fz_matrix m, fz_point p)
 }
 
 fz_rect
-fz_transformaabb(fz_matrix m, fz_rect r)
+fz_transformrect(fz_matrix m, fz_rect r)
 {
 	fz_point s, t, u, v;
 
diff --git a/fitz/base_rect.c b/fitz/base_rect.c
index d2ba5bd1..bd5e2df8 100644
--- a/fitz/base_rect.c
+++ b/fitz/base_rect.c
@@ -17,7 +17,7 @@ fz_roundrect(fz_rect f)
 }
 
 fz_bbox
-fz_intersectirects(fz_bbox a, fz_bbox b)
+fz_intersectbbox(fz_bbox a, fz_bbox b)
 {
 	fz_bbox r;
 	if (fz_isinfiniterect(a)) return b;
diff --git a/fitz/dev_draw.c b/fitz/dev_draw.c
index 456f61a0..0b4bb970 100644
--- a/fitz/dev_draw.c
+++ b/fitz/dev_draw.c
@@ -40,7 +40,7 @@ blendover(fz_pixmap *src, fz_pixmap *dst)
 	dr.x1 = dst->x + dst->w;
 	dr.y1 = dst->y + dst->h;
 
-	dr = fz_intersectirects(sr, dr);
+	dr = fz_intersectbbox(sr, dr);
 	x = dr.x0;
 	y = dr.y0;
 	w = dr.x1 - dr.x0;
@@ -81,8 +81,8 @@ blendmaskover(fz_pixmap *src, fz_pixmap *msk, fz_pixmap *dst)
 	mr.x1 = msk->x + msk->w;
 	mr.y1 = msk->y + msk->h;
 
-	dr = fz_intersectirects(sr, dr);
-	dr = fz_intersectirects(dr, mr);
+	dr = fz_intersectbbox(sr, dr);
+	dr = fz_intersectbbox(dr, mr);
 	x = dr.x0;
 	y = dr.y0;
 	w = dr.x1 - dr.x0;
@@ -124,7 +124,7 @@ fz_drawfillpath(void *user, fz_path *path, fz_matrix ctm,
 	fz_sortgel(dev->gel);
 
 	bbox = fz_boundgel(dev->gel);
-	bbox = fz_intersectirects(bbox, clip);
+	bbox = fz_intersectbbox(bbox, clip);
 	if (fz_isemptyrect(bbox))
 		return;
 
@@ -175,7 +175,7 @@ fz_drawstrokepath(void *user, fz_path *path, fz_matrix ctm,
 	fz_sortgel(dev->gel);
 
 	bbox = fz_boundgel(dev->gel);
-	bbox = fz_intersectirects(bbox, clip);
+	bbox = fz_intersectbbox(bbox, clip);
 	if (fz_isemptyrect(bbox))
 		return;
 
@@ -224,7 +224,7 @@ fz_drawclippath(void *user, fz_path *path, fz_matrix ctm)
 	fz_sortgel(dev->gel);
 
 	bbox = fz_boundgel(dev->gel);
-	bbox = fz_intersectirects(bbox, clip);
+	bbox = fz_intersectbbox(bbox, clip);
 
 	mask = fz_newpixmapwithrect(nil, bbox);
 	dest = fz_newpixmapwithrect(dev->model, bbox);
@@ -387,14 +387,14 @@ fz_drawfillshade(void *user, fz_shade *shade, fz_matrix ctm)
 	unsigned char *s;
 	int n;
 
-	bounds = fz_transformaabb(fz_concat(shade->matrix, ctm), shade->bbox);
+	bounds = fz_transformrect(fz_concat(shade->matrix, ctm), shade->bbox);
 	bbox = fz_roundrect(bounds);
 
 	clip.x0 = dev->dest->x;
 	clip.y0 = dev->dest->y;
 	clip.x1 = dev->dest->x + dev->dest->w;
 	clip.y1 = dev->dest->y + dev->dest->h;
-	clip = fz_intersectirects(clip, bbox);
+	clip = fz_intersectbbox(clip, bbox);
 	if (fz_isemptyrect(clip))
 		return;
 
@@ -471,14 +471,14 @@ fz_drawfillimage(void *user, fz_pixmap *image, fz_matrix ctm)
 	bounds.y0 = 0;
 	bounds.x1 = 1;
 	bounds.y1 = 1;
-	bounds = fz_transformaabb(ctm, bounds);
+	bounds = fz_transformrect(ctm, bounds);
 	bbox = fz_roundrect(bounds);
 
 	clip.x0 = dev->dest->x;
 	clip.y0 = dev->dest->y;
 	clip.x1 = dev->dest->x + dev->dest->w;
 	clip.y1 = dev->dest->y + dev->dest->h;
-	clip = fz_intersectirects(clip, bbox);
+	clip = fz_intersectbbox(clip, bbox);
 
 	if (fz_isemptyrect(clip))
 		return;
@@ -559,14 +559,14 @@ fz_drawfillimagemask(void *user, fz_pixmap *image, fz_matrix ctm,
 	bounds.y0 = 0;
 	bounds.x1 = 1;
 	bounds.y1 = 1;
-	bounds = fz_transformaabb(ctm, bounds);
+	bounds = fz_transformrect(ctm, bounds);
 	bbox = fz_roundrect(bounds);
 
 	clip.x0 = dev->dest->x;
 	clip.y0 = dev->dest->y;
 	clip.x1 = dev->dest->x + dev->dest->w;
 	clip.y1 = dev->dest->y + dev->dest->h;
-	clip = fz_intersectirects(clip, bbox);
+	clip = fz_intersectbbox(clip, bbox);
 
 	if (fz_isemptyrect(clip))
 		return;
@@ -653,14 +653,14 @@ fz_drawclipimagemask(void *user, fz_pixmap *image, fz_matrix ctm)
 	bounds.y0 = 0;
 	bounds.x1 = 1;
 	bounds.y1 = 1;
-	bounds = fz_transformaabb(ctm, bounds);
+	bounds = fz_transformrect(ctm, bounds);
 	bbox = fz_roundrect(bounds);
 
 	clip.x0 = dev->dest->x;
 	clip.y0 = dev->dest->y;
 	clip.x1 = dev->dest->x + dev->dest->w;
 	clip.y1 = dev->dest->y + dev->dest->h;
-	clip = fz_intersectirects(clip, bbox);
+	clip = fz_intersectbbox(clip, bbox);
 
 	calcimagescale(ctm, image->w, image->h, &dx, &dy);
 
diff --git a/fitz/fitz_base.h b/fitz/fitz_base.h
index 00e10b20..ea6c9aa0 100644
--- a/fitz/fitz_base.h
+++ b/fitz/fitz_base.h
@@ -248,10 +248,10 @@ int fz_isrectilinear(fz_matrix m);
 float fz_matrixexpansion(fz_matrix m);
 
 fz_bbox fz_roundrect(fz_rect r);
-fz_bbox fz_intersectirects(fz_bbox a, fz_bbox b);
+fz_bbox fz_intersectbbox(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);
+fz_rect fz_transformrect(fz_matrix m, fz_rect r);
 
 #endif
 
diff --git a/fitz/res_font.c b/fitz/res_font.c
index f56a1ac8..b7cc6cda 100644
--- a/fitz/res_font.c
+++ b/fitz/res_font.c
@@ -384,7 +384,7 @@ fz_rendert3glyph(fz_glyph *glyph, fz_font *font, int gid, fz_matrix trm)
 		return;
 
 	ctm = fz_concat(font->t3matrix, trm);
-	bbox = fz_transformaabb(ctm, font->bbox);
+	bbox = fz_transformrect(ctm, font->bbox);
 	pixmap = fz_newpixmap(nil, bbox.x0, bbox.y0, bbox.x1 - bbox.x0, bbox.y1 - bbox.y0);
 	fz_clearpixmap(pixmap, 0x00);
 
diff --git a/fitz/res_shade.c b/fitz/res_shade.c
index d49f4121..7e554436 100644
--- a/fitz/res_shade.c
+++ b/fitz/res_shade.c
@@ -23,6 +23,6 @@ fz_rect
 fz_boundshade(fz_shade *shade, fz_matrix ctm)
 {
 	ctm = fz_concat(shade->matrix, ctm);
-	return fz_transformaabb(ctm, shade->bbox);
+	return fz_transformrect(ctm, shade->bbox);
 }
 
diff --git a/fitz/res_text.c b/fitz/res_text.c
index 798bd8a5..99fb37a5 100644
--- a/fitz/res_text.c
+++ b/fitz/res_text.c
@@ -63,7 +63,7 @@ fz_boundtext(fz_text *text, fz_matrix ctm)
 		bbox.y1 = MAX(bbox.y1, text->els[i].y);
 	}
 
-	bbox = fz_transformaabb(ctm, bbox);
+	bbox = fz_transformrect(ctm, bbox);
 
 	/* find bbox of font in trm * ctm space */
 
@@ -76,7 +76,7 @@ fz_boundtext(fz_text *text, fz_matrix ctm)
 	fbox.x1 = text->font->bbox.x1 * 0.001;
 	fbox.y1 = text->font->bbox.y1 * 0.001;
 
-	fbox = fz_transformaabb(trm, fbox);
+	fbox = fz_transformrect(trm, fbox);
 
 	/* expand glyph origin bbox by font bbox */