diff options
author | Tor Andersson <tor@ghostscript.com> | 2008-04-25 23:03:48 +0200 |
---|---|---|
committer | Tor Andersson <tor@ghostscript.com> | 2008-04-25 23:03:48 +0200 |
commit | 060ca327ee21c1d22edcc595bc0ca2d989dc93c6 (patch) | |
tree | 2f74fd801bf891aa4b5b4aa7df81cdd5984e2c25 | |
parent | 3869cea2a783aeba69ad05e10ba5c99fb6337aa8 (diff) | |
download | mupdf-060ca327ee21c1d22edcc595bc0ca2d989dc93c6.tar.xz |
Remove unused meta node type.
-rw-r--r-- | include/fitz/wld_tree.h | 11 | ||||
-rw-r--r-- | raster/render.c | 2 | ||||
-rw-r--r-- | world/node_misc1.c | 13 | ||||
-rw-r--r-- | world/node_misc2.c | 36 | ||||
-rw-r--r-- | world/node_toxml.c | 15 |
5 files changed, 0 insertions, 77 deletions
diff --git a/include/fitz/wld_tree.h b/include/fitz/wld_tree.h index 87addcd6..3fa0a07b 100644 --- a/include/fitz/wld_tree.h +++ b/include/fitz/wld_tree.h @@ -40,7 +40,6 @@ typedef struct fz_solidnode_s fz_solidnode; typedef struct fz_imagenode_s fz_imagenode; typedef struct fz_shadenode_s fz_shadenode; typedef struct fz_linknode_s fz_linknode; -typedef struct fz_metanode_s fz_metanode; typedef enum fz_nodekind_e { @@ -54,7 +53,6 @@ typedef enum fz_nodekind_e FZ_NIMAGE, FZ_NSHADE, FZ_NLINK, - FZ_NMETA } fz_nodekind; typedef enum fz_blendkind_e @@ -132,13 +130,6 @@ struct fz_linknode_s fz_tree *tree; }; -struct fz_metanode_s -{ - fz_node super; - char *name; - void *dict; -}; - struct fz_imagenode_s { fz_node super; @@ -157,7 +148,6 @@ fz_rect fz_boundnode(fz_node *node, fz_matrix ctm); void fz_dropnode(fz_node *node); /* branch nodes */ -fz_error *fz_newmetanode(fz_node **nodep, char *name, void *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); @@ -167,7 +157,6 @@ int fz_istransformnode(fz_node *node); int fz_isovernode(fz_node *node); int fz_ismasknode(fz_node *node); int fz_isblendnode(fz_node *node); -int fz_ismetanode(fz_node *node); /* leaf nodes */ fz_error *fz_newlinknode(fz_node **nodep, fz_tree *subtree); diff --git a/raster/render.c b/raster/render.c index d83f72eb..94438327 100644 --- a/raster/render.c +++ b/raster/render.c @@ -876,8 +876,6 @@ rendernode(fz_renderer *gc, fz_node *node, fz_matrix ctm) return rendershade(gc, (fz_shadenode*)node, ctm); case FZ_NLINK: return rendernode(gc, ((fz_linknode*)node)->tree->root, ctm); - case FZ_NMETA: - return rendernode(gc, node->first, ctm); case FZ_NBLEND: return fz_okay; } diff --git a/world/node_misc1.c b/world/node_misc1.c index 53dfd873..fc8407d5 100644 --- a/world/node_misc1.c +++ b/world/node_misc1.c @@ -1,7 +1,6 @@ #include "fitz-base.h" #include "fitz-world.h" -void fz_dropmetanode(fz_metanode* node); void fz_droplinknode(fz_linknode* node); void fz_droppathnode(fz_pathnode* node); void fz_droptextnode(fz_textnode* node); @@ -18,7 +17,6 @@ fz_rect fz_boundtextnode(fz_textnode* node, fz_matrix ctm); fz_rect fz_boundimagenode(fz_imagenode* node, fz_matrix ctm); fz_rect fz_boundshadenode(fz_shadenode* node, fz_matrix ctm); fz_rect fz_boundlinknode(fz_linknode* node, fz_matrix ctm); -fz_rect fz_boundmetanode(fz_metanode* node, fz_matrix ctm); void fz_initnode(fz_node *node, fz_nodekind kind) @@ -61,9 +59,6 @@ fz_dropnode(fz_node *node) case FZ_NLINK: fz_droplinknode((fz_linknode *) node); break; - case FZ_NMETA: - fz_dropmetanode((fz_metanode *) node); - break; } fz_free(node); @@ -94,8 +89,6 @@ fz_boundnode(fz_node *node, fz_matrix ctm) return fz_boundshadenode((fz_shadenode *) node, ctm); case FZ_NLINK: return fz_boundlinknode((fz_linknode *) node, ctm); - case FZ_NMETA: - return fz_boundmetanode((fz_metanode *) node, ctm); } return fz_emptyrect; } @@ -160,9 +153,3 @@ fz_islinknode(fz_node *node) return node ? node->kind == FZ_NLINK : 0; } -int -fz_ismetanode(fz_node *node) -{ - return node ? node->kind == FZ_NMETA : 0; -} - diff --git a/world/node_misc2.c b/world/node_misc2.c index 807899e7..e251c5c6 100644 --- a/world/node_misc2.c +++ b/world/node_misc2.c @@ -158,42 +158,6 @@ fz_boundtransformnode(fz_transformnode *node, fz_matrix ctm) } /* - * Meta info - */ - -fz_error * -fz_newmetanode(fz_node **nodep, char *name, void *dict) -{ - fz_metanode *node; - - node = fz_malloc(sizeof (fz_metanode)); - if (!node) - return fz_outofmem; - *nodep = (fz_node*)node; - - fz_initnode((fz_node*)node, FZ_NMETA); - node->name = name; - node->dict = dict; - - return fz_okay; -} - -void -fz_dropmetanode(fz_metanode *node) -{ - if (node->dict) - fz_warn("leaking meta node '%s'", node->name); -} - -fz_rect -fz_boundmetanode(fz_metanode *node, fz_matrix ctm) -{ - if (!node->super.first) - return fz_emptyrect; - return fz_boundnode(node->super.first, ctm); -} - -/* * Link to tree */ diff --git a/world/node_toxml.c b/world/node_toxml.c index ad2143c4..4dff8dbf 100644 --- a/world/node_toxml.c +++ b/world/node_toxml.c @@ -9,20 +9,6 @@ static void indent(int level) static void xmlnode(fz_node *node, int level); -static void xmlmeta(fz_metanode *node, int level) -{ - fz_node *child; - - indent(level); - printf("<meta name=\"%s\">\n", node->name); - - for (child = node->super.first; child; child = child->next) - xmlnode(child, level + 1); - - indent(level); - printf("</meta>\n"); -} - static void xmlover(fz_overnode *node, int level) { fz_node *child; @@ -170,7 +156,6 @@ static void xmlnode(fz_node *node, int level) switch (node->kind) { - case FZ_NMETA: xmlmeta((fz_metanode*)node, level); break; case FZ_NOVER: xmlover((fz_overnode*)node, level); break; case FZ_NMASK: xmlmask((fz_masknode*)node, level); break; case FZ_NBLEND: xmlblend((fz_blendnode*)node, level); break; |