3 files changed, 13 insertions, 13 deletions
diff --git a/include/fitz/object.h b/include/fitz/object.h
index 2a9ab15f..c564b70b 100644
--- a/include/fitz/object.h
+++ b/include/fitz/object.h
@@ -92,8 +92,8 @@ float fz_toreal(fz_obj *obj);
 char *fz_toname(fz_obj *obj);
 char *fz_tostringbuf(fz_obj *obj);
 int fz_tostringlen(fz_obj *obj);
-int fz_toobjid(fz_obj *obj);
-int fz_togenid(fz_obj *obj);
+int fz_tonum(fz_obj *obj);
+int fz_togen(fz_obj *obj);
 void *fz_topointer(fz_obj *obj);
 
 int fz_arraylen(fz_obj *array);
diff --git a/include/fitz/pixmap.h b/include/fitz/pixmap.h
index 90071a30..f46c2c05 100644
--- a/include/fitz/pixmap.h
+++ b/include/fitz/pixmap.h
@@ -3,6 +3,7 @@ typedef struct fz_colorspace_s fz_colorspace;
 
 struct fz_pixmap_s
 {
+	int refcount;
 	int x, y, w, h;
 	int n, a;
 	int stride;
@@ -11,12 +12,10 @@ struct fz_pixmap_s
 };
 
 fz_error *fz_newpixmap(fz_pixmap **mapp, int x, int y, int w, int h, int n, int a);
+fz_pixmap *fz_keeppixmap(fz_pixmap *map);
+void fz_droppixmap(fz_pixmap *map);
 void fz_clearpixmap(fz_pixmap *map);
-void fz_freepixmap(fz_pixmap *map);
 
-void fz_blendover(short *C, short *A, short *B, int n);
-void fz_blendin(short *C, short *A, short *B, int n);
-void fz_blendout(short *C, short *A, short *B, int n);
-void fz_blendatop(short *C, short *A, short *B, int n);
-void fz_blendxor(short *C, short *A, short *B, int n);
+void fz_blendover(fz_pixmap *dst, fz_pixmap *fg, fz_pixmap *bg);
+void fz_blendmask(fz_pixmap *dst, fz_pixmap *color, fz_pixmap *shape);
 
diff --git a/include/fitz/render.h b/include/fitz/render.h
index 4024bfec..09c439c2 100644
--- a/include/fitz/render.h
+++ b/include/fitz/render.h
@@ -3,9 +3,10 @@ typedef struct fz_renderer_s fz_renderer;
 fz_error *fz_newrenderer(fz_renderer **gcp);
 void fz_freerenderer(fz_renderer *gc);
 
-fz_error *fz_renderover(fz_renderer *gc, fz_overnode *over, fz_matrix ctm, fz_pixmap *out);
-fz_error *fz_rendermask(fz_renderer *gc, fz_masknode *mask, fz_matrix ctm, fz_pixmap *out);
-fz_error *fz_rendertransform(fz_renderer *gc, fz_transformnode *xform, fz_matrix ctm, fz_pixmap *out);
-fz_error *fz_rendertext(fz_renderer *gc, fz_textnode *text, fz_matrix ctm, fz_pixmap *out);
-fz_error *fz_rendernode(fz_renderer *gc, fz_node *node, fz_matrix ctm, fz_pixmap *out);
+fz_error *fz_renderover(fz_renderer *gc, fz_overnode *over, fz_matrix ctm);
+fz_error *fz_rendermask(fz_renderer *gc, fz_masknode *mask, fz_matrix ctm);
+fz_error *fz_rendertransform(fz_renderer *gc, fz_transformnode *xform, fz_matrix ctm);
+fz_error *fz_rendertext(fz_renderer *gc, fz_textnode *text, fz_matrix ctm);
+fz_error *fz_rendernode(fz_renderer *gc, fz_node *node, fz_matrix ctm);
+fz_error *fz_rendertree(fz_pixmap **out, fz_renderer *gc, fz_tree *tree, fz_matrix ctm, fz_rect bbox);