diff options
| author | Tor Andersson <tor@ghostscript.com> | 2004-10-21 10:51:08 +0200 |
|---|---|---|
| committer | Tor Andersson <tor@ghostscript.com> | 2004-10-21 10:51:08 +0200 |
| commit | ded124f1cc463bac9e076146a4ffb77b8a370e0c (patch) | |
| tree | c1b35fe12bd14ed507294b185587b428a92bcbef /include/fitz | |
| parent | 730cf84f6323b977bf7bcde1557d1803a16ad855 (diff) | |
| download | mupdf-ded124f1cc463bac9e076146a4ffb77b8a370e0c.tar.xz | |
rewrote resource dict handling
Diffstat (limited to 'include/fitz')
| -rw-r--r-- | include/fitz/image.h | 10 | ||||
| -rw-r--r-- | include/fitz/scanconv.h | 2 | ||||
| -rw-r--r-- | include/fitz/tree.h | 11 |
3 files changed, 16 insertions, 7 deletions
diff --git a/include/fitz/image.h b/include/fitz/image.h new file mode 100644 index 00000000..0ff954c5 --- /dev/null +++ b/include/fitz/image.h @@ -0,0 +1,10 @@ +typedef struct fz_image_s fz_image; + +struct fz_image_s +{ + fz_error* (*loadtile)(fz_image*,fz_pixmap*); + void (*free)(fz_image*); + fz_colorspace *cs; + int w, h, n, a; +}; + diff --git a/include/fitz/scanconv.h b/include/fitz/scanconv.h index 794b9ba2..057153c4 100644 --- a/include/fitz/scanconv.h +++ b/include/fitz/scanconv.h @@ -39,7 +39,7 @@ void fz_advanceael(fz_ael *ael); void fz_freeael(fz_ael *ael); fz_error *fz_scanconvert(fz_gel *gel, fz_ael *ael, int eofill, int y0, int y1, - void (*blitfunc)(int,int,int,short*,void*), void *blitdata); + void (*blitfunc)(int,int,int,unsigned char*,void*), void *blitdata); fz_error *fz_fillpath(fz_gel *gel, fz_pathnode *path, fz_matrix ctm, float flatness); fz_error *fz_strokepath(fz_gel *gel, fz_pathnode *path, fz_matrix ctm, float flatness); diff --git a/include/fitz/tree.h b/include/fitz/tree.h index 6578ab51..7181ac9b 100644 --- a/include/fitz/tree.h +++ b/include/fitz/tree.h @@ -125,15 +125,14 @@ struct fz_linknode_s struct fz_metanode_s { fz_node super; - fz_obj *info; + fz_obj *name; + fz_obj *dict; }; struct fz_imagenode_s { fz_node super; - fz_colorspace *cs; - int w, h, n, a; - // XXX fz_image *image; + fz_image *image; }; /* common to all nodes */ @@ -142,7 +141,7 @@ fz_rect fz_boundnode(fz_node *node, fz_matrix ctm); void fz_freenode(fz_node *node); /* branch nodes */ -fz_error *fz_newmetanode(fz_node **nodep, fz_obj *info); +fz_error *fz_newmetanode(fz_node **nodep, fz_obj *name, fz_obj *dict); fz_error *fz_newovernode(fz_node **nodep); fz_error *fz_newmasknode(fz_node **nodep); fz_error *fz_newblendnode(fz_node **nodep, fz_colorspace *cs, fz_blendkind b, int k, int i); @@ -157,7 +156,7 @@ int fz_ismetanode(fz_node *node); /* leaf nodes */ fz_error *fz_newlinknode(fz_node **nodep, fz_tree *subtree); fz_error *fz_newcolornode(fz_node **nodep, fz_colorspace *cs, int n, float *v); -fz_error *fz_newimagenode(fz_node **nodep, fz_colorspace *cs, int w, int h, int n, int a); +fz_error *fz_newimagenode(fz_node **nodep, fz_image *image); int fz_islinknode(fz_node *node); int fz_iscolornode(fz_node *node); |