Simplify arguments to fz_new_pixmap.

5 files changed, 25 insertions, 14 deletions

diff --git a/fitz/filt_jpxd.c b/fitz/filt_jpxd.c
index d43ee4c4..4fb8264d 100644
--- a/fitz/filt_jpxd.c
+++ b/fitz/filt_jpxd.c
@@ -108,7 +108,7 @@ fz_load_jpx_image(fz_pixmap **imgp, unsigned char *data, int size, fz_colorspace
 		}
 	}
 
-	img = fz_new_pixmap(colorspace, 0, 0, w, h);
+	img = fz_new_pixmap(colorspace, w, h);
 
 	p = img->samples;
 	for (y = 0; y < h; y++)
@@ -133,7 +133,7 @@ fz_load_jpx_image(fz_pixmap **imgp, unsigned char *data, int size, fz_colorspace
 	{
 		if (n == 4)
 		{
-			fz_pixmap *tmp = fz_new_pixmap(fz_device_rgb, 0, 0, w, h);
+			fz_pixmap *tmp = fz_new_pixmap(fz_device_rgb, w, h);
 			fz_convert_pixmap(img, tmp);
 			fz_drop_pixmap(img);
 			img = tmp;
diff --git a/fitz/fitz.h b/fitz/fitz.h
index 0ae31631..111df17e 100644
--- a/fitz/fitz.h
+++ b/fitz/fitz.h
@@ -680,9 +680,9 @@ struct fz_pixmap_s
 	int free_samples;
 };
 
-fz_pixmap *fz_new_pixmap_with_data(fz_colorspace *colorspace, int x, int y, int w, int h, unsigned char *samples);
+fz_pixmap *fz_new_pixmap_with_data(fz_colorspace *colorspace, int w, int h, unsigned char *samples);
 fz_pixmap *fz_new_pixmap_with_rect(fz_colorspace *, fz_bbox bbox);
-fz_pixmap *fz_new_pixmap(fz_colorspace *, int x, int y, int w, int h);
+fz_pixmap *fz_new_pixmap(fz_colorspace *, int w, int h);
 fz_pixmap *fz_keep_pixmap(fz_pixmap *pix);
 void fz_drop_pixmap(fz_pixmap *pix);
 void fz_clear_pixmap(fz_pixmap *pix);
diff --git a/fitz/res_font.c b/fitz/res_font.c
index 6aca0c44..e2542f9b 100644
--- a/fitz/res_font.c
+++ b/fitz/res_font.c
@@ -267,7 +267,9 @@ fz_copy_ft_bitmap(int left, int top, FT_Bitmap *bitmap)
 	fz_pixmap *pixmap;
 	int y;
 
-	pixmap = fz_new_pixmap(NULL, left, top - bitmap->rows, bitmap->width, bitmap->rows);
+	pixmap = fz_new_pixmap(NULL, bitmap->width, bitmap->rows);
+	pixmap->x = left;
+	pixmap->y = top - bitmap->rows;
 
 	if (bitmap->pixel_mode == FT_PIXEL_MODE_MONO)
 	{
@@ -517,7 +519,12 @@ fz_render_t3_glyph(fz_font *font, int gid, fz_matrix trm)
 		fz_catch(error, "cannot draw type3 glyph");
 	fz_free_device(dev);
 
-	glyph = fz_new_pixmap(fz_device_gray, bbox.x0-1, bbox.y0-1, bbox.x1 - bbox.x0 + 1, bbox.y1 - bbox.y0 + 1);
+	bbox.x0--;
+	bbox.y0--;
+	bbox.x1++;
+	bbox.y1++;
+
+	glyph = fz_new_pixmap_with_rect(fz_device_gray, bbox);
 	fz_clear_pixmap(glyph);
 
 	cache = fz_new_glyph_cache();
diff --git a/fitz/res_halftone.c b/fitz/res_halftone.c
index 139be112..6a7a8f42 100644
--- a/fitz/res_halftone.c
+++ b/fitz/res_halftone.c
@@ -67,7 +67,7 @@ fz_halftone *fz_get_default_halftone(int num_comps)
 	/* Only support 1 component for now */
 	assert(num_comps == 1);
 
-	ht->comp[0] = fz_new_pixmap_with_data(NULL, 0, 0, 16, 16, mono_ht);
+	ht->comp[0] = fz_new_pixmap_with_data(NULL, 16, 16, mono_ht);
 	if (ht->comp[0] == NULL)
 	{
 		fz_drop_halftone(ht);
diff --git a/fitz/res_pixmap.c b/fitz/res_pixmap.c
index 7e689e07..c6410a80 100644
--- a/fitz/res_pixmap.c
+++ b/fitz/res_pixmap.c
@@ -1,14 +1,14 @@
 #include "fitz.h"
 
 fz_pixmap *
-fz_new_pixmap_with_data(fz_colorspace *colorspace, int x, int y, int w, int h, unsigned char *samples)
+fz_new_pixmap_with_data(fz_colorspace *colorspace, int w, int h, unsigned char *samples)
 {
 	fz_pixmap *pix;
 
 	pix = fz_malloc(sizeof(fz_pixmap));
 	pix->refs = 1;
-	pix->x = x;
-	pix->y = y;
+	pix->x = 0;
+	pix->y = 0;
 	pix->w = w;
 	pix->h = h;
 	pix->mask = NULL;
@@ -39,15 +39,19 @@ fz_new_pixmap_with_data(fz_colorspace *colorspace, int x, int y, int w, int h, u
 }
 
 fz_pixmap *
-fz_new_pixmap(fz_colorspace *colorspace, int x, int y, int w, int h)
+fz_new_pixmap(fz_colorspace *colorspace, int w, int h)
 {
-	return fz_new_pixmap_with_data(colorspace, x, y, w, h, NULL);
+	return fz_new_pixmap_with_data(colorspace, w, h, NULL);
 }
 
 fz_pixmap *
 fz_new_pixmap_with_rect(fz_colorspace *colorspace, fz_bbox r)
 {
-	return fz_new_pixmap(colorspace, r.x0, r.y0, r.x1 - r.x0, r.y1 - r.y0);
+	fz_pixmap *pixmap;
+	pixmap = fz_new_pixmap(colorspace, r.x1 - r.x0, r.y1 - r.y0);
+	pixmap->x = r.x0;
+	pixmap->y = r.y0;
+	return pixmap;
 }
 
 fz_pixmap *
@@ -138,7 +142,7 @@ fz_alpha_from_gray(fz_pixmap *gray, int luminosity)
 
 	assert(gray->n == 2);
 
-	alpha = fz_new_pixmap(NULL, gray->x, gray->y, gray->w, gray->h);
+	alpha = fz_new_pixmap_with_rect(NULL, fz_bound_pixmap(gray));
 	dp = alpha->samples;
 	sp = gray->samples;
 	if (!luminosity)