summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/fitz/geometry.h8
-rw-r--r--include/fitz/pixmap.h5
-rw-r--r--include/fitz/render.h56
-rw-r--r--include/mupdf/rsrc.h1
4 files changed, 37 insertions, 33 deletions
diff --git a/include/fitz/geometry.h b/include/fitz/geometry.h
index 96977cc6..7d2adc98 100644
--- a/include/fitz/geometry.h
+++ b/include/fitz/geometry.h
@@ -4,6 +4,12 @@ typedef struct fz_rect_s fz_rect;
typedef struct fz_ipoint_s fz_ipoint;
typedef struct fz_irect_s fz_irect;
+extern fz_rect fz_emptyrect;
+extern fz_rect fz_infiniterect;
+
+#define fz_isemptyrect(r) ((r).min.x == (r).max.x)
+#define fz_isinfiniterect(r) ((r).min.x > (r).max.x)
+
/*
/ a b 0 \
| c d 0 |
@@ -38,8 +44,6 @@ struct fz_irect_s
void fz_invert3x3(float *dst, float *m);
-fz_rect fz_infiniterect(void);
-
fz_matrix fz_concat(fz_matrix one, fz_matrix two);
fz_matrix fz_identity(void);
fz_matrix fz_scale(float sx, float sy);
diff --git a/include/fitz/pixmap.h b/include/fitz/pixmap.h
index 6d0391fa..c369df84 100644
--- a/include/fitz/pixmap.h
+++ b/include/fitz/pixmap.h
@@ -15,12 +15,11 @@ struct fz_pixmap_s
fz_error *fz_newpixmapwithrect(fz_pixmap **mapp, fz_irect bbox, int n);
fz_error *fz_newpixmap(fz_pixmap **mapp, int x, int y, int w, int h, int n);
+fz_error *fz_newpixmapcopy(fz_pixmap **pixp, fz_pixmap *old);
+
void fz_debugpixmap(fz_pixmap *map);
void fz_clearpixmap(fz_pixmap *map);
void fz_droppixmap(fz_pixmap *map);
fz_error *fz_scalepixmap(fz_pixmap **dstp, fz_pixmap *src, int xdenom, int ydenom);
-void fz_blendover(fz_pixmap *src, fz_pixmap *dst);
-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 807b6227..e2435382 100644
--- a/include/fitz/render.h
+++ b/include/fitz/render.h
@@ -2,39 +2,42 @@ typedef struct fz_renderer_s fz_renderer;
typedef struct fz_rastfuncs_s fz_rastfuncs;
#define FZ_BYTE unsigned char
-#define FZ_PID \
- FZ_BYTE *src, int w, int h, int nx, int ny, \
- FZ_BYTE *dst0, int dstw, \
- int u0, int v0, int fa, int fb, int fc, int fd
-#define FZ_PIM \
- FZ_BYTE *src, int w, int h, int nx, int ny, \
- FZ_BYTE *dst0, int dstw, \
- FZ_BYTE *msk0, int mskw, \
- int u0, int v0, int fa, int fb, int fc, int fd
+
+#define FZ_PSRC \
+ unsigned char *src, int srcw, int srch
+#define FZ_PDST \
+ unsigned char *dst0, int dstw
+#define FZ_PCTM \
+ int u0, int v0, int fa, int fb, int fc, int fd, int w0, int h
struct fz_rastfuncs_s
{
- void (*mask_g)(int, FZ_BYTE*, FZ_BYTE*);
- void (*mask_i1)(int, FZ_BYTE*, FZ_BYTE*);
- void (*mask_o1)(int, FZ_BYTE*, FZ_BYTE*);
- void (*mask_i1o1)(int, FZ_BYTE*, FZ_BYTE*, FZ_BYTE*);
- void (*mask_o4w3)(int, FZ_BYTE*, FZ_BYTE*, FZ_BYTE*);
- void (*mask_i1o4w3)(int, FZ_BYTE*, FZ_BYTE*, FZ_BYTE*, FZ_BYTE*);
+ void (*duff_NoN)(FZ_BYTE*,int,int,FZ_BYTE*,int,int,int);
+ void (*duff_NiMcN)(FZ_BYTE*,int,int,FZ_BYTE*,int,int,FZ_BYTE*,int,int,int);
+ void (*duff_NiMoN)(FZ_BYTE*,int,int,FZ_BYTE*,int,int,FZ_BYTE*,int,int,int);
+ void (*duff_1o1)(FZ_BYTE*,int,FZ_BYTE*,int,int,int);
+ void (*duff_4o4)(FZ_BYTE*,int,FZ_BYTE*,int,int,int);
+ void (*duff_1i1c1)(FZ_BYTE*,int,FZ_BYTE*,int,FZ_BYTE*,int,int,int);
+ void (*duff_4i1c4)(FZ_BYTE*,int,FZ_BYTE*,int,FZ_BYTE*,int,int,int);
+ void (*duff_1i1o1)(FZ_BYTE*,int,FZ_BYTE*,int,FZ_BYTE*,int,int,int);
+ void (*duff_4i1o4)(FZ_BYTE*,int,FZ_BYTE*,int,FZ_BYTE*,int,int,int);
+
+ void (*msk_1c1)(FZ_BYTE*,FZ_BYTE*,int);
+ void (*msk_1o1)(FZ_BYTE*,FZ_BYTE*,int);
+ void (*msk_w3i1o4)(FZ_BYTE*,FZ_BYTE*,FZ_BYTE*,int);
- void (*img1_g)(FZ_PID);
- void (*img1_i1)(FZ_PID);
- void (*img1_o1)(FZ_PID);
- void (*img1_i1o1)(FZ_PIM);
- void (*img1_o4w3)(FZ_PID, FZ_BYTE*);
- void (*img1_i1o4w3)(FZ_PIM, FZ_BYTE*);
+ void (*glf_1c1)(FZ_BYTE*,int,FZ_BYTE*,int,int,int);
+ void (*glf_1o1)(FZ_BYTE*,int,FZ_BYTE*,int,int,int);
+ void (*glf_w3i1o4)(FZ_BYTE*,FZ_BYTE*,int,FZ_BYTE*,int,int,int);
- void (*img4_g)(FZ_PID);
- void (*img4_o4)(FZ_PID);
- void (*img4_i1o4)(FZ_PIM);
+ void (*img_NcN)(FZ_PSRC, int sn, FZ_PDST, FZ_PCTM);
+ void (*img_1c1)(FZ_PSRC, FZ_PDST, FZ_PCTM);
+ void (*img_4c4)(FZ_PSRC, FZ_PDST, FZ_PCTM);
+ void (*img_1o1)(FZ_PSRC, FZ_PDST, FZ_PCTM);
+ void (*img_4o4)(FZ_PSRC, FZ_PDST, FZ_PCTM);
+ void (*img_w3i1o4)(FZ_BYTE*,FZ_PSRC,FZ_PDST,FZ_PCTM);
};
-#undef FZ_PIM
-#undef FZ_PID
#undef FZ_BYTE
struct fz_renderer_s
@@ -50,7 +53,6 @@ struct fz_renderer_s
fz_irect clip;
fz_pixmap *dest;
fz_pixmap *over;
- fz_pixmap *mask;
unsigned char rgb[3];
int flag;
};
diff --git a/include/mupdf/rsrc.h b/include/mupdf/rsrc.h
index 9139a8e5..91deb38d 100644
--- a/include/mupdf/rsrc.h
+++ b/include/mupdf/rsrc.h
@@ -155,7 +155,6 @@ struct pdf_font_s
fz_buffer *fontdata;
/* Type3 data */
- fz_rect bbox;
fz_matrix matrix;
fz_tree *charprocs[256];
};