summaryrefslogtreecommitdiff
path: root/tree
diff options
context:
space:
mode:
Diffstat (limited to 'tree')
-rw-r--r--tree/debug.c3
-rw-r--r--tree/optimize.c6
-rw-r--r--tree/tree.c21
3 files changed, 5 insertions, 25 deletions
diff --git a/tree/debug.c b/tree/debug.c
index e468ef27..b03d4e28 100644
--- a/tree/debug.c
+++ b/tree/debug.c
@@ -141,8 +141,9 @@ static void lisptext(fz_textnode *node, int level)
static void lispimage(fz_imagenode *node, int level)
{
+ fz_image *image = node->image;
indent(level);
- printf("(image)\n");
+ printf("(image %dx%d %d+%d)\n", image->w, image->h, image->n, image->a);
}
static void lispshade(fz_shadenode *node, int level)
diff --git a/tree/optimize.c b/tree/optimize.c
index 9f85cdd7..629796e2 100644
--- a/tree/optimize.c
+++ b/tree/optimize.c
@@ -267,11 +267,11 @@ static fz_error *clean1x1(fz_node *node)
if (error)
return error;
- fz_insertnodeafter(mask, (fz_node*)rect);
- fz_insertnodeafter(mask, color);
fz_insertnodeafter(current, mask);
+ fz_insertnodelast(mask, (fz_node*)rect);
+ fz_insertnodelast(mask, color);
fz_removenode(current);
- current = color;
+ current = mask;
}
else
diff --git a/tree/tree.c b/tree/tree.c
index f667e39a..f6874711 100644
--- a/tree/tree.c
+++ b/tree/tree.c
@@ -45,12 +45,6 @@ fz_boundtree(fz_tree *tree, fz_matrix ctm)
void
fz_insertnodefirst(fz_node *parent, fz_node *child)
{
- assert(fz_istransformnode(parent) ||
- fz_isovernode(parent) ||
- fz_ismasknode(parent) ||
- fz_isblendnode(parent) ||
- fz_ismetanode(parent));
-
child->parent = parent;
child->next = parent->first;
parent->first = child;
@@ -61,12 +55,6 @@ fz_insertnodefirst(fz_node *parent, fz_node *child)
void
fz_insertnodelast(fz_node *parent, fz_node *child)
{
- assert(fz_istransformnode(parent) ||
- fz_isovernode(parent) ||
- fz_ismasknode(parent) ||
- fz_isblendnode(parent) ||
- fz_ismetanode(parent));
-
child->parent = parent;
if (!parent->first)
parent->first = child;
@@ -79,18 +67,9 @@ void
fz_insertnodeafter(fz_node *prev, fz_node *child)
{
fz_node *parent = prev->parent;
-
- assert(fz_istransformnode(parent) ||
- fz_isovernode(parent) ||
- fz_ismasknode(parent) ||
- fz_isblendnode(parent) ||
- fz_ismetanode(parent));
-
child->parent = parent;
-
if (parent->last == prev)
parent->last = child;
-
child->next = prev->next;
prev->next = child;
}