summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/fitz/base.h2
-rw-r--r--include/fitz/cmap.h2
-rw-r--r--include/fitz/colorspace.h19
-rw-r--r--include/fitz/filter.h10
-rw-r--r--include/fitz/font.h6
-rw-r--r--include/fitz/hash.h2
-rw-r--r--include/fitz/image.h2
-rw-r--r--include/fitz/object.h2
-rw-r--r--include/fitz/path.h2
-rw-r--r--include/fitz/pixmap.h2
-rw-r--r--include/fitz/render.h2
-rw-r--r--include/fitz/scanconv.h4
-rw-r--r--include/fitz/tree.h2
-rw-r--r--include/mupdf/content.h2
-rw-r--r--include/mupdf/page.h8
-rw-r--r--include/mupdf/rsrc.h6
-rw-r--r--include/mupdf/syntax.h2
17 files changed, 44 insertions, 31 deletions
diff --git a/include/fitz/base.h b/include/fitz/base.h
index 06a644b3..9ead6c88 100644
--- a/include/fitz/base.h
+++ b/include/fitz/base.h
@@ -44,7 +44,7 @@ fz_error *fz_throw0(const char *func, const char *file, int line, char *fmt, ...
void fz_warn(char *fmt, ...);
void fz_abort(fz_error *eo);
-void fz_freeerror(fz_error *eo);
+void fz_droperror(fz_error *eo);
typedef struct fz_memorycontext_s fz_memorycontext;
diff --git a/include/fitz/cmap.h b/include/fitz/cmap.h
index ddd37149..b076d749 100644
--- a/include/fitz/cmap.h
+++ b/include/fitz/cmap.h
@@ -2,7 +2,7 @@ typedef struct fz_cmap_s fz_cmap;
fz_error *fz_newcmap(fz_cmap **cmapp);
void fz_debugcmap(fz_cmap *cmap);
-void fz_freecmap(fz_cmap *cmap);
+void fz_dropcmap(fz_cmap *cmap);
char *fz_getcmapname(fz_cmap *cmap);
void fz_setcmapname(fz_cmap *cmap, char *name);
diff --git a/include/fitz/colorspace.h b/include/fitz/colorspace.h
index 370c755f..9b5a5dbb 100644
--- a/include/fitz/colorspace.h
+++ b/include/fitz/colorspace.h
@@ -1,4 +1,8 @@
typedef struct fz_colorspace_s fz_colorspace;
+typedef struct fz_colorcube_s fz_colorcube;
+typedef struct fz_colorcube1_s fz_colorcube1;
+typedef struct fz_colorcube3_s fz_colorcube3;
+typedef struct fz_colorcube4_s fz_colorcube4;
struct fz_colorspace_s
{
@@ -7,9 +11,20 @@ struct fz_colorspace_s
int n;
void (*toxyz)(fz_colorspace *, float *src, float *xyz);
void (*fromxyz)(fz_colorspace *, float *xyz, float *dst);
- void (*free)(fz_colorspace *);
+ void (*drop)(fz_colorspace *);
};
-void fz_freecolorspace(fz_colorspace *cs);
+struct fz_colorcube1_s { unsigned char v[17]; };
+struct fz_colorcube3_s { unsigned char v[17][17][17]; };
+struct fz_colorcube4_s { unsigned char v[17][17][17][17]; };
+
+struct fz_colorcube_s
+{
+ fz_colorspace *src;
+ fz_colorspace *dst;
+ void **subcube; /* dst->n * colorcube(src->n) */
+};
+
+void fz_dropcolorspace(fz_colorspace *cs);
void fz_convertcolor(fz_colorspace *srcs, float *srcv, fz_colorspace *dsts, float *dstv);
diff --git a/include/fitz/filter.h b/include/fitz/filter.h
index f6a1603f..225cb172 100644
--- a/include/fitz/filter.h
+++ b/include/fitz/filter.h
@@ -13,12 +13,12 @@ extern fz_error fz_kiodone;
#define FZ_NEWFILTER(TYPE,VAR,NAME) \
fz_error * fz_process ## NAME (fz_filter*,fz_buffer*,fz_buffer*); \
- void fz_free ## NAME (fz_filter*); \
+ void fz_drop ## NAME (fz_filter*); \
TYPE *VAR; \
*fp = fz_malloc(sizeof(TYPE)); \
if (!*fp) return fz_outofmem; \
(*fp)->process = fz_process ## NAME ; \
- (*fp)->free = fz_free ## NAME ; \
+ (*fp)->drop = fz_drop ## NAME ; \
(*fp)->consumed = 0; \
(*fp)->produced = 0; \
(*fp)->count = 0; \
@@ -27,7 +27,7 @@ extern fz_error fz_kiodone;
struct fz_filter_s
{
fz_error* (*process)(fz_filter *filter, fz_buffer *in, fz_buffer *out);
- void (*free)(fz_filter *filter);
+ void (*drop)(fz_filter *filter);
int consumed;
int produced;
int count;
@@ -44,7 +44,7 @@ struct fz_buffer_s
};
fz_error *fz_process(fz_filter *f, fz_buffer *in, fz_buffer *out);
-void fz_freefilter(fz_filter *f);
+void fz_dropfilter(fz_filter *f);
fz_error *fz_newnullfilter(fz_filter **fp, int len);
fz_error *fz_newarc4filter(fz_filter **fp, unsigned char *key, unsigned keylen);
@@ -57,7 +57,7 @@ fz_error *fz_newbuffer(fz_buffer **bufp, int size);
fz_error *fz_newbufferwithdata(fz_buffer **bufp, unsigned char *data, int size);
fz_error *fz_rewindbuffer(fz_buffer *buf);
fz_error *fz_growbuffer(fz_buffer *buf);
-void fz_freebuffer(fz_buffer *buf);
+void fz_dropbuffer(fz_buffer *buf);
fz_error *fz_newa85d(fz_filter **filterp, fz_obj *param);
fz_error *fz_newa85e(fz_filter **filterp, fz_obj *param);
diff --git a/include/fitz/font.h b/include/fitz/font.h
index d64c1fc3..4d9fb5e8 100644
--- a/include/fitz/font.h
+++ b/include/fitz/font.h
@@ -25,7 +25,7 @@ struct fz_font_s
char name[32];
fz_error* (*render)(fz_glyph*, fz_font*, int, fz_matrix);
- void (*free)(fz_font *);
+ void (*drop)(fz_font *);
int wmode;
fz_irect bbox;
@@ -46,7 +46,7 @@ struct fz_glyph_s
};
void fz_initfont(fz_font *font, char *name);
-void fz_freefont(fz_font *font);
+void fz_dropfont(fz_font *font);
void fz_debugfont(fz_font *font);
void fz_setfontwmode(fz_font *font, int wmode);
void fz_setfontbbox(fz_font *font, int xmin, int ymin, int xmax, int ymax);
@@ -61,5 +61,5 @@ fz_vmtx fz_getvmtx(fz_font *font, int cid);
fz_error *fz_newglyphcache(fz_glyphcache **arenap, int slots, int size);
fz_error *fz_renderglyph(fz_glyphcache*, fz_glyph*, fz_font*, int, fz_matrix);
-void fz_freeglyphcache(fz_glyphcache *);
+void fz_dropglyphcache(fz_glyphcache *);
diff --git a/include/fitz/hash.h b/include/fitz/hash.h
index 731e5fab..c53056bc 100644
--- a/include/fitz/hash.h
+++ b/include/fitz/hash.h
@@ -3,7 +3,7 @@ typedef struct fz_hashtable_s fz_hashtable;
fz_error *fz_newhash(fz_hashtable **tablep, int initialsize, int keylen);
fz_error *fz_resizehash(fz_hashtable *table, int newsize);
void fz_debughash(fz_hashtable *table);
-void fz_freehash(fz_hashtable *table);
+void fz_drophash(fz_hashtable *table);
void *fz_hashfind(fz_hashtable *table, void *key);
fz_error *fz_hashinsert(fz_hashtable *table, void *key, void *val);
diff --git a/include/fitz/image.h b/include/fitz/image.h
index ea3ebaa9..13d4d096 100644
--- a/include/fitz/image.h
+++ b/include/fitz/image.h
@@ -5,7 +5,7 @@ typedef struct fz_image_s fz_image;
struct fz_image_s
{
fz_error* (*loadtile)(fz_image*,fz_pixmap*);
- void (*free)(fz_image*);
+ void (*drop)(fz_image*);
fz_colorspace *cs;
int w, h, n, a;
};
diff --git a/include/fitz/object.h b/include/fitz/object.h
index c564b70b..520fa27f 100644
--- a/include/fitz/object.h
+++ b/include/fitz/object.h
@@ -100,7 +100,6 @@ int fz_arraylen(fz_obj *array);
fz_obj *fz_arrayget(fz_obj *array, int i);
fz_error *fz_arrayput(fz_obj *array, int i, fz_obj *obj);
fz_error *fz_arraypush(fz_obj *array, fz_obj *obj);
-void fz_freearray(fz_obj *array);
int fz_dictlen(fz_obj *dict);
fz_obj *fz_dictgetkey(fz_obj *dict, int idx);
@@ -111,7 +110,6 @@ fz_error *fz_dictput(fz_obj *dict, fz_obj *key, fz_obj *val);
fz_error *fz_dictputs(fz_obj *dict, char *key, fz_obj *val);
fz_error *fz_dictdel(fz_obj *dict, fz_obj *key);
fz_error *fz_dictdels(fz_obj *dict, char *key);
-void fz_freedict(fz_obj *dict);
int fz_sprintobj(char *s, int n, fz_obj *obj, int tight);
void fz_debugobj(fz_obj *obj);
diff --git a/include/fitz/path.h b/include/fitz/path.h
index 1c8a05a8..f128d86e 100644
--- a/include/fitz/path.h
+++ b/include/fitz/path.h
@@ -55,5 +55,5 @@ fz_rect fz_boundpathnode(fz_pathnode *node, fz_matrix ctm);
void fz_debugpathnode(fz_pathnode *node);
fz_error *fz_newdash(fz_dash **dashp, float phase, int len, float *array);
-void fz_freedash(fz_dash *dash);
+void fz_dropdash(fz_dash *dash);
diff --git a/include/fitz/pixmap.h b/include/fitz/pixmap.h
index 508a304b..ea112405 100644
--- a/include/fitz/pixmap.h
+++ b/include/fitz/pixmap.h
@@ -16,7 +16,7 @@ struct fz_pixmap_s
fz_error *fz_newpixmap(fz_pixmap **mapp, int x, int y, int w, int h, int n);
void fz_debugpixmap(fz_pixmap *map);
void fz_clearpixmap(fz_pixmap *map);
-void fz_freepixmap(fz_pixmap *map);
+void fz_droppixmap(fz_pixmap *map);
fz_error *fz_convertpixmap(fz_pixmap **dstp, fz_pixmap *src, fz_colorspace *srcs, fz_colorspace *dsts);
fz_error *fz_scalepixmap(fz_pixmap **dstp, fz_pixmap *src, int xdenom, int ydenom);
diff --git a/include/fitz/render.h b/include/fitz/render.h
index dc2f116a..9ff4b3f7 100644
--- a/include/fitz/render.h
+++ b/include/fitz/render.h
@@ -16,7 +16,7 @@ struct fz_renderer_s
};
fz_error *fz_newrenderer(fz_renderer **gcp, fz_colorspace *pcm);
-void fz_freerenderer(fz_renderer *gc);
+void fz_droprenderer(fz_renderer *gc);
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);
diff --git a/include/fitz/scanconv.h b/include/fitz/scanconv.h
index 057153c4..8fefe271 100644
--- a/include/fitz/scanconv.h
+++ b/include/fitz/scanconv.h
@@ -31,12 +31,12 @@ fz_error *fz_newgel(fz_gel **gelp);
fz_error *fz_insertgel(fz_gel *gel, float x0, float y0, float x1, float y1);
void fz_resetgel(fz_gel *gel, int hs, int vs);
void fz_sortgel(fz_gel *gel);
-void fz_freegel(fz_gel *gel);
+void fz_dropgel(fz_gel *gel);
fz_error *fz_newael(fz_ael **aelp);
fz_error *fz_insertael(fz_ael *ael, fz_gel *gel, int y, int *e);
void fz_advanceael(fz_ael *ael);
-void fz_freeael(fz_ael *ael);
+void fz_dropael(fz_ael *ael);
fz_error *fz_scanconvert(fz_gel *gel, fz_ael *ael, int eofill, int y0, int y1,
void (*blitfunc)(int,int,int,unsigned char*,void*), void *blitdata);
diff --git a/include/fitz/tree.h b/include/fitz/tree.h
index 7181ac9b..a14de20d 100644
--- a/include/fitz/tree.h
+++ b/include/fitz/tree.h
@@ -138,7 +138,7 @@ struct fz_imagenode_s
/* common to all nodes */
void fz_initnode(fz_node *node, fz_nodekind kind);
fz_rect fz_boundnode(fz_node *node, fz_matrix ctm);
-void fz_freenode(fz_node *node);
+void fz_dropnode(fz_node *node);
/* branch nodes */
fz_error *fz_newmetanode(fz_node **nodep, fz_obj *name, fz_obj *dict);
diff --git a/include/mupdf/content.h b/include/mupdf/content.h
index a7bfac22..3f85fe06 100644
--- a/include/mupdf/content.h
+++ b/include/mupdf/content.h
@@ -101,5 +101,5 @@ fz_error *pdf_showimage(pdf_csi*, pdf_image *img);
/* interpret.c */
fz_error *pdf_newcsi(pdf_csi **csip);
fz_error *pdf_runcsi(pdf_csi *, pdf_xref *xref, fz_obj *rdb, fz_file *);
-void pdf_freecsi(pdf_csi *csi);
+void pdf_dropcsi(pdf_csi *csi);
diff --git a/include/mupdf/page.h b/include/mupdf/page.h
index d4b4bcb0..0dd1001b 100644
--- a/include/mupdf/page.h
+++ b/include/mupdf/page.h
@@ -53,11 +53,11 @@ struct pdf_page_s
/* outline.c */
fz_error *pdf_loadoutlinetree(pdf_outlinetree **oo, pdf_xref *xref);
void pdf_debugoutlinetree(pdf_outlinetree *outlinetree);
-void pdf_freeoutlinetree(pdf_outlinetree *outlinetree);
+void pdf_dropoutlinetree(pdf_outlinetree *outlinetree);
/* nametree.c */
fz_error *pdf_loadnametree(pdf_nametree **ntp, pdf_xref *xref, char *key);
-void pdf_freenametree(pdf_nametree *nt);
+void pdf_dropnametree(pdf_nametree *nt);
void pdf_debugnametree(pdf_nametree *nt);
fz_obj *pdf_lookupname(pdf_nametree *nt, fz_obj *name);
fz_obj *pdf_lookupnames(pdf_nametree *nt, char *name);
@@ -67,9 +67,9 @@ fz_error *pdf_loadpagetree(pdf_pagetree **pp, pdf_xref *xref);
int pdf_getpagecount(pdf_pagetree *pages);
fz_obj *pdf_getpageobject(pdf_pagetree *pages, int p);
void pdf_debugpagetree(pdf_pagetree *pages);
-void pdf_freepagetree(pdf_pagetree *pages);
+void pdf_droppagetree(pdf_pagetree *pages);
/* page.c */
fz_error *pdf_loadpage(pdf_page **pagep, pdf_xref *xref, fz_obj *ref);
-void pdf_freepage(pdf_page *page);
+void pdf_droppage(pdf_page *page);
diff --git a/include/mupdf/rsrc.h b/include/mupdf/rsrc.h
index 0fb28cf0..8277c5cc 100644
--- a/include/mupdf/rsrc.h
+++ b/include/mupdf/rsrc.h
@@ -22,7 +22,7 @@ typedef struct pdf_function_s pdf_function;
fz_error *pdf_loadfunction(pdf_function **func, pdf_xref *xref, fz_obj *obj);
fz_error *pdf_evalfunction(pdf_function *func, float *in, int inlen, float *out, int outlen);
-void pdf_freefunction(pdf_function *func);
+void pdf_dropfunction(pdf_function *func);
/*
* ColorSpace
@@ -59,7 +59,7 @@ struct pdf_xobject_s
};
fz_error *pdf_loadxobject(pdf_xobject **xobjp, pdf_xref *xref, fz_obj *obj);
-void pdf_freexobject(pdf_xobject *xobj);
+void pdf_dropxobject(pdf_xobject *xobj);
/*
* Image
@@ -136,5 +136,5 @@ fz_error *pdf_loadsubstitutefont(pdf_font *font, int fdflags, char *collection);
/* font.c */
fz_error *pdf_loadfontdescriptor(pdf_font *font, pdf_xref *xref, fz_obj *desc, char *collection);
fz_error *pdf_loadfont(pdf_font **fontp, pdf_xref *xref, fz_obj *font);
-void pdf_freefont(pdf_font *font);
+void pdf_dropfont(pdf_font *font);
diff --git a/include/mupdf/syntax.h b/include/mupdf/syntax.h
index 5d9b1ffb..0df89d65 100644
--- a/include/mupdf/syntax.h
+++ b/include/mupdf/syntax.h
@@ -52,5 +52,5 @@ fz_error *pdf_newencrypt(pdf_crypt **cp, char *userpw, char *ownerpw, int p, int
fz_error *pdf_setpassword(pdf_crypt *crypt, char *pw);
fz_error *pdf_cryptstm(fz_filter **fp, pdf_crypt *crypt, int oid, int gid);
void pdf_cryptobj(pdf_crypt *crypt, fz_obj *obj, int oid, int gid);
-void pdf_freecrypt(pdf_crypt *crypt);
+void pdf_dropcrypt(pdf_crypt *crypt);
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-25 05:18:25 +0000