Add pixmap struct accessors.

2 files changed, 40 insertions, 21 deletions

diff --git a/source/fitz/bitmap.c b/source/fitz/bitmap.c
index 2e6cdfcc..b6eba35f 100644
--- a/source/fitz/bitmap.c
+++ b/source/fitz/bitmap.c
@@ -78,27 +78,6 @@ fz_save_bitmap_as_pbm(fz_context *ctx, fz_bitmap *bitmap, char *filename)
 		fz_rethrow(ctx);
 }
 
-fz_colorspace *fz_pixmap_colorspace(fz_context *ctx, fz_pixmap *pix)
-{
-	if (!pix)
-		return NULL;
-	return pix->colorspace;
-}
-
-int fz_pixmap_components(fz_context *ctx, fz_pixmap *pix)
-{
-	if (!pix)
-		return 0;
-	return pix->n;
-}
-
-unsigned char *fz_pixmap_samples(fz_context *ctx, fz_pixmap *pix)
-{
-	if (!pix)
-		return NULL;
-	return pix->samples;
-}
-
 void fz_bitmap_details(fz_bitmap *bit, int *w, int *h, int *n, int *stride)
 {
 	if (!bit)
diff --git a/source/fitz/pixmap.c b/source/fitz/pixmap.c
index 3096b6b3..faabea2c 100644
--- a/source/fitz/pixmap.c
+++ b/source/fitz/pixmap.c
@@ -121,6 +121,26 @@ fz_pixmap_bbox_no_ctx(fz_pixmap *pix, fz_irect *bbox)
 	return bbox;
 }
 
+fz_colorspace *
+fz_pixmap_colorspace(fz_context *ctx, fz_pixmap *pix)
+{
+	if (!pix)
+		return NULL;
+	return pix->colorspace;
+}
+
+int
+fz_pixmap_x(fz_context *ctx, fz_pixmap *pix)
+{
+	return pix->x;
+}
+
+int
+fz_pixmap_y(fz_context *ctx, fz_pixmap *pix)
+{
+	return pix->y;
+}
+
 int
 fz_pixmap_width(fz_context *ctx, fz_pixmap *pix)
 {
@@ -133,6 +153,26 @@ fz_pixmap_height(fz_context *ctx, fz_pixmap *pix)
 	return pix->h;
 }
 
+int
+fz_pixmap_components(fz_context *ctx, fz_pixmap *pix)
+{
+	return pix->n;
+}
+
+int
+fz_pixmap_stride(fz_context *ctx, fz_pixmap *pix)
+{
+	return pix->w * pix->n;
+}
+
+unsigned char *
+fz_pixmap_samples(fz_context *ctx, fz_pixmap *pix)
+{
+	if (!pix)
+		return NULL;
+	return pix->samples;
+}
+
 void
 fz_clear_pixmap(fz_context *ctx, fz_pixmap *pix)
 {