Reorganize pixmap blending functions.

1 files changed, 7 insertions, 5 deletions

diff --git a/fitz/fitz.h b/fitz/fitz.h
index fb3de145..c21b2f74 100644
--- a/fitz/fitz.h
+++ b/fitz/fitz.h
@@ -1136,12 +1136,14 @@ void fz_acceleratearch(void);
 
 void fz_decodetile(fz_pixmap *pix, float *decode);
 void fz_unpacktile(fz_pixmap *dst, unsigned char * restrict src, int n, int depth, int stride, int scale);
-void fz_blendpixmaps(fz_pixmap *src, fz_pixmap *dst, fz_blendmode blendmode);
 
-extern void (*fz_duff_ni1on)(unsigned char*restrict,int,int,unsigned char*restrict,int,unsigned char*restrict,int,int,int);
-extern void (*fz_duff_1i1o1)(unsigned char*restrict,int,unsigned char*restrict,int,unsigned char*restrict,int,int,int);
-extern void (*fz_duff_2i1o2)(unsigned char*restrict,int,unsigned char*restrict,int,unsigned char*restrict,int,int,int);
-extern void (*fz_duff_4i1o4)(unsigned char*restrict,int,unsigned char*restrict,int,unsigned char*restrict,int,int,int);
+void fz_blendpixmapswithmode(fz_pixmap *dst, fz_pixmap *src, fz_blendmode blendmode);
+void fz_blendpixmapswithmask(fz_pixmap *dst, fz_pixmap *src, fz_pixmap *msk);
+void fz_blendpixmapswithalpha(fz_pixmap *dst, fz_pixmap *src, float alpha);
+void fz_blendpixmaps(fz_pixmap *dst, fz_pixmap *src);
+
+void fz_blendnormal(unsigned char * restrict dp, unsigned char * restrict sp, int n, int w);
+void fz_blendwithmask(unsigned char * restrict dp, unsigned char * restrict sp, unsigned char * restrict mp, int n, int w);
 
 extern void (*fz_path_1o1)(unsigned char*restrict,unsigned char,int,unsigned char*restrict);
 extern void (*fz_path_w2i1o2)(unsigned char*,unsigned char*restrict,unsigned char,int,unsigned char*restrict);