diff options
| author | Robin Watts <robin.watts@artifex.com> | 2013-06-27 18:24:07 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-06-27 20:05:18 +0100 |
| commit | 9df3a0615a1fa7745160c099e1ac7cd4dfcbc86e (patch) | |
| tree | 3aac206ddce6e4c50229c9e4e79e3429118035aa /source/pdf/pdf-page.c | |
| parent | 260e54a956c54058051ce6ff31b36ad0ae1b60aa (diff) | |
| download | mupdf-9df3a0615a1fa7745160c099e1ac7cd4dfcbc86e.tar.xz | |
Move to using a flags bit rather than "Dirty" dict entries.
Correct the naming scheme for pdf_obj_xxx functions.
Diffstat (limited to 'source/pdf/pdf-page.c')
| -rw-r--r-- | source/pdf/pdf-page.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/pdf/pdf-page.c b/source/pdf/pdf-page.c index 82c7aa5c..2e14bf6c 100644 --- a/source/pdf/pdf-page.c +++ b/source/pdf/pdf-page.c @@ -33,7 +33,7 @@ pdf_load_page_tree_node(pdf_document *doc, pdf_obj *node, struct info info) { do { - if (!node || pdf_obj_mark(node)) + if (!node || pdf_mark_obj(node)) { /* NULL node, or we've been here before. * Nothing to do. */ @@ -91,7 +91,7 @@ pdf_load_page_tree_node(pdf_document *doc, pdf_obj *node, struct info info) doc->page_refs[doc->page_len] = pdf_keep_obj(node); doc->page_objs[doc->page_len] = pdf_keep_obj(dict); doc->page_len ++; - pdf_obj_unmark(node); + pdf_unmark_obj(node); } } /* Get the next node */ @@ -99,13 +99,13 @@ pdf_load_page_tree_node(pdf_document *doc, pdf_obj *node, struct info info) break; while (++stack[stacklen].pos == stack[stacklen].max) { - pdf_obj_unmark(stack[stacklen].node); + pdf_unmark_obj(stack[stacklen].node); stacklen--; if (stacklen < 0) /* No more to pop! */ break; node = stack[stacklen].node; info = stack[stacklen].info; - pdf_obj_unmark(node); /* Unmark it, cos we're about to mark it again */ + pdf_unmark_obj(node); /* Unmark it, cos we're about to mark it again */ } if (stacklen >= 0) node = pdf_array_get(stack[stacklen].kids, stack[stacklen].pos); @@ -115,7 +115,7 @@ pdf_load_page_tree_node(pdf_document *doc, pdf_obj *node, struct info info) fz_always(ctx) { while (stacklen >= 0) - pdf_obj_unmark(stack[stacklen--].node); + pdf_unmark_obj(stack[stacklen--].node); fz_free(ctx, stack); } fz_catch(ctx) @@ -218,12 +218,12 @@ pdf_resources_use_blending(pdf_document *doc, pdf_obj *rdb) if (!rdb) return 0; - /* Have we been here before and stashed an answer? */ - if (pdf_obj_stashed(rdb, &useBM)) + /* Have we been here before and remembered an answer? */ + if (pdf_obj_memo(rdb, &useBM)) return useBM; /* stop on cyclic resource dependencies */ - if (pdf_obj_mark(rdb)) + if (pdf_mark_obj(rdb)) return 0; fz_try(ctx) @@ -253,14 +253,14 @@ found: } fz_always(ctx) { - pdf_obj_unmark(rdb); + pdf_unmark_obj(rdb); } fz_catch(ctx) { fz_rethrow(ctx); } - pdf_obj_stash(rdb, useBM); + pdf_set_obj_memo(rdb, useBM); return useBM; } |