Split XPS header. Update Makefile dependencies. Add pixmap w/h accessors.

2 files changed, 22 insertions, 0 deletions

diff --git a/fitz/fitz.h b/fitz/fitz.h
index 8570f077..85e1feea 100644
--- a/fitz/fitz.h
+++ b/fitz/fitz.h
@@ -1126,6 +1126,16 @@ typedef struct fz_pixmap_s fz_pixmap;
 fz_bbox fz_bound_pixmap(fz_pixmap *pix);
 
 /*
+	fz_pixmap_width: Return the width of the pixmap in pixels.
+*/
+int fz_pixmap_width(fz_context *ctx, fz_pixmap *pix);
+
+/*
+	fz_pixmap_height: Return the height of the pixmap in pixels.
+*/
+int fz_pixmap_height(fz_context *ctx, fz_pixmap *pix);
+
+/*
 	fz_new_pixmap: Create a new pixmap, with it's origin at (0,0)
 
 	cs: The colorspace to use for the pixmap, or NULL for an alpha
diff --git a/fitz/res_pixmap.c b/fitz/res_pixmap.c
index fc40135e..7aaf8ce0 100644
--- a/fitz/res_pixmap.c
+++ b/fitz/res_pixmap.c
@@ -110,6 +110,18 @@ fz_bound_pixmap(fz_pixmap *pix)
 	return bbox;
 }
 
+int
+fz_pixmap_width(fz_context *ctx, fz_pixmap *pix)
+{
+	return pix->w;
+}
+
+int
+fz_pixmap_height(fz_context *ctx, fz_pixmap *pix)
+{
+	return pix->h;
+}
+
 void
 fz_clear_pixmap(fz_context *ctx, fz_pixmap *pix)
 {