diff options
Diffstat (limited to 'tree')
| -rw-r--r-- | tree/cmap.c | 4 | ||||
| -rw-r--r-- | tree/colorspace.c | 6 | ||||
| -rw-r--r-- | tree/font.c | 6 | ||||
| -rw-r--r-- | tree/image.c | 6 | ||||
| -rw-r--r-- | tree/node1.c | 28 | ||||
| -rw-r--r-- | tree/node2.c | 6 | ||||
| -rw-r--r-- | tree/path.c | 4 | ||||
| -rw-r--r-- | tree/text.c | 2 | ||||
| -rw-r--r-- | tree/tree.c | 2 |
9 files changed, 32 insertions, 32 deletions
diff --git a/tree/cmap.c b/tree/cmap.c index 21b08274..d44ac117 100644 --- a/tree/cmap.c +++ b/tree/cmap.c @@ -66,10 +66,10 @@ fz_newcmap(fz_cmap **cmapp) } void -fz_freecmap(fz_cmap *cmap) +fz_dropcmap(fz_cmap *cmap) { if (cmap->usecmap) - fz_freecmap(cmap->usecmap); + fz_dropcmap(cmap->usecmap); fz_free(cmap->ranges); fz_free(cmap->lookup); fz_free(cmap); diff --git a/tree/colorspace.c b/tree/colorspace.c index 6b4766c2..70456aae 100644 --- a/tree/colorspace.c +++ b/tree/colorspace.c @@ -1,12 +1,12 @@ #include <fitz.h> void -fz_freecolorspace(fz_colorspace *cs) +fz_dropcolorspace(fz_colorspace *cs) { if (cs->frozen) return; - if (cs->free) - cs->free(cs); + if (cs->drop) + cs->drop(cs); fz_free(cs); } diff --git a/tree/font.c b/tree/font.c index 58c194ae..28045f5d 100644 --- a/tree/font.c +++ b/tree/font.c @@ -217,10 +217,10 @@ notfound: } void -fz_freefont(fz_font *font) +fz_dropfont(fz_font *font) { - if (font->free) - font->free(font); + if (font->drop) + font->drop(font); fz_free(font->hmtx); fz_free(font->vmtx); fz_free(font); diff --git a/tree/image.c b/tree/image.c index dd4b030a..16a1c817 100644 --- a/tree/image.c +++ b/tree/image.c @@ -1,9 +1,9 @@ #include <fitz.h> -void fz_freeimage(fz_image *image) +void fz_dropimage(fz_image *image) { - if (image->free) - image->free(image); + if (image->drop) + image->drop(image); fz_free(image); } diff --git a/tree/node1.c b/tree/node1.c index 26ce614f..2d98d63d 100644 --- a/tree/node1.c +++ b/tree/node1.c @@ -1,10 +1,10 @@ #include <fitz.h> -void fz_freemetanode(fz_metanode* node); -void fz_freelinknode(fz_linknode* node); -void fz_freepathnode(fz_pathnode* node); -void fz_freetextnode(fz_textnode* node); -void fz_freeimagenode(fz_imagenode* node); +void fz_dropmetanode(fz_metanode* node); +void fz_droplinknode(fz_linknode* node); +void fz_droppathnode(fz_pathnode* node); +void fz_droptextnode(fz_textnode* node); +void fz_dropimagenode(fz_imagenode* node); fz_rect fz_boundtransformnode(fz_transformnode* node, fz_matrix ctm); fz_rect fz_boundovernode(fz_overnode* node, fz_matrix ctm); @@ -28,12 +28,12 @@ fz_initnode(fz_node *node, fz_nodekind kind) } void -fz_freenode(fz_node *node) +fz_dropnode(fz_node *node) { if (node->child) - fz_freenode(node->child); + fz_dropnode(node->child); if (node->next) - fz_freenode(node->next); + fz_dropnode(node->next); switch (node->kind) { @@ -44,22 +44,22 @@ fz_freenode(fz_node *node) case FZ_NCOLOR: break; case FZ_NPATH: - fz_freepathnode((fz_pathnode *) node); + fz_droppathnode((fz_pathnode *) node); break; case FZ_NTEXT: - fz_freetextnode((fz_textnode *) node); + fz_droptextnode((fz_textnode *) node); break; case FZ_NIMAGE: - fz_freeimagenode((fz_imagenode *) node); + fz_dropimagenode((fz_imagenode *) node); break; case FZ_NSHADE: - // XXX fz_freeshadenode((fz_shadenode *) node); + // XXX fz_dropshadenode((fz_shadenode *) node); break; case FZ_NLINK: - fz_freelinknode((fz_linknode *) node); + fz_droplinknode((fz_linknode *) node); break; case FZ_NMETA: - fz_freemetanode((fz_metanode *) node); + fz_dropmetanode((fz_metanode *) node); break; } diff --git a/tree/node2.c b/tree/node2.c index 6e28aaac..0af3ab7d 100644 --- a/tree/node2.c +++ b/tree/node2.c @@ -186,7 +186,7 @@ fz_newmetanode(fz_node **nodep, fz_obj *name, fz_obj *dict) } void -fz_freemetanode(fz_metanode *node) +fz_dropmetanode(fz_metanode *node) { if (node->name) fz_dropobj(node->name); @@ -223,7 +223,7 @@ fz_newlinknode(fz_node **nodep, fz_tree *subtree) } void -fz_freelinknode(fz_linknode *node) +fz_droplinknode(fz_linknode *node) { fz_droptree(node->tree); } @@ -285,7 +285,7 @@ fz_newimagenode(fz_node **nodep, fz_image *image) } void -fz_freeimagenode(fz_imagenode *node) +fz_dropimagenode(fz_imagenode *node) { // XXX fz_dropimage(node->image); } diff --git a/tree/path.c b/tree/path.c index 268e5dae..74e29a59 100644 --- a/tree/path.c +++ b/tree/path.c @@ -55,7 +55,7 @@ fz_clonepath(fz_pathnode **pathp, fz_pathnode *oldpath) } void -fz_freepathnode(fz_pathnode *node) +fz_droppathnode(fz_pathnode *node) { fz_free(node->dash); fz_free(node->els); @@ -294,7 +294,7 @@ fz_newdash(fz_dash **dashp, float phase, int len, float *array) } void -fz_freedash(fz_dash *dash) +fz_dropdash(fz_dash *dash) { fz_free(dash); } diff --git a/tree/text.c b/tree/text.c index 1832df9f..951fdada 100644 --- a/tree/text.c +++ b/tree/text.c @@ -21,7 +21,7 @@ fz_newtextnode(fz_textnode **textp, fz_font *font) } void -fz_freetextnode(fz_textnode *text) +fz_droptextnode(fz_textnode *text) { fz_free(text->els); } diff --git a/tree/tree.c b/tree/tree.c index 12bbc822..85521cdc 100644 --- a/tree/tree.c +++ b/tree/tree.c @@ -31,7 +31,7 @@ fz_droptree(fz_tree *tree) if (tree->refcount == 0) { if (tree->root) - fz_freenode(tree->root); + fz_dropnode(tree->root); fz_free(tree); } } |