summaryrefslogtreecommitdiff
path: root/fitz
diff options
context:
space:
mode:
authorSebastian Rasmussen <sebras@hotmail.com>2009-08-23 00:00:29 +0200
committerSebastian Rasmussen <sebras@hotmail.com>2009-08-23 00:00:29 +0200
commit9ffbf88b7bfb2197641f7269b49d36a3c62caf78 (patch)
tree7fde1d5abb152af36a53a2e2e0cc63bfc00e0e36 /fitz
parentfba53d30788b1daad3ddbb8ee8c8451ee7b2dd23 (diff)
downloadmupdf-9ffbf88b7bfb2197641f7269b49d36a3c62caf78.tar.xz
Do not confuse isolated xobject groups with knockout groups.
Diffstat (limited to 'fitz')
-rw-r--r--fitz/fitz_tree.h2
-rw-r--r--fitz/node_misc2.c4
-rw-r--r--fitz/node_toxml.c3
3 files changed, 5 insertions, 4 deletions
diff --git a/fitz/fitz_tree.h b/fitz/fitz_tree.h
index 4f5f8e99..b9d4e01a 100644
--- a/fitz/fitz_tree.h
+++ b/fitz/fitz_tree.h
@@ -155,7 +155,7 @@ void fz_dropnode(fz_node *node);
/* branch nodes */
fz_error fz_newovernode(fz_node **nodep);
fz_error fz_newmasknode(fz_node **nodep);
-fz_error fz_newblendnode(fz_node **nodep, fz_blendkind b, int k, int i);
+fz_error fz_newblendnode(fz_node **nodep, fz_blendkind b, int i, int k);
fz_error fz_newtransformnode(fz_node **nodep, fz_matrix m);
int fz_istransformnode(fz_node *node);
diff --git a/fitz/node_misc2.c b/fitz/node_misc2.c
index c26fc908..330c09de 100644
--- a/fitz/node_misc2.c
+++ b/fitz/node_misc2.c
@@ -81,7 +81,7 @@ fz_boundmasknode(fz_masknode *node, fz_matrix ctm)
*/
fz_error
-fz_newblendnode(fz_node **nodep, fz_blendkind b, int k, int i)
+fz_newblendnode(fz_node **nodep, fz_blendkind b, int i, int k)
{
fz_blendnode *node;
@@ -92,8 +92,8 @@ fz_newblendnode(fz_node **nodep, fz_blendkind b, int k, int i)
fz_initnode((fz_node*)node, FZ_NBLEND);
node->mode = b;
- node->knockout = k;
node->isolated = i;
+ node->knockout = k;
return fz_okay;
}
diff --git a/fitz/node_toxml.c b/fitz/node_toxml.c
index d2d71012..f5f1a81e 100644
--- a/fitz/node_toxml.c
+++ b/fitz/node_toxml.c
@@ -35,7 +35,8 @@ static void xmlblend(fz_blendnode *node, int level)
{
fz_node *child;
indent(level);
- printf("<blend mode=\"%d\">\n", node->mode);
+ printf("<blend mode=\"%d\" isolated=\"%d\" knockout=\"%d\">\n",
+ node->mode, node->isolated, node->knockout);
for (child = node->super.first; child; child = child->next)
xmlnode(child, level + 1);
indent(level);