diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2013-06-28 16:29:33 +0200 |
---|---|---|
committer | Robin Watts <robin.watts@artifex.com> | 2013-06-28 19:39:12 +0100 |
commit | e16103ffd0db53a6d4aece9926279271d6b5a6a4 (patch) | |
tree | 475953fe4e1115001fe26dde8aac9eb064cd6ae9 /source/pdf | |
parent | b5db44461bd197f14d9f5b80a8c95557730de7e8 (diff) | |
download | mupdf-e16103ffd0db53a6d4aece9926279271d6b5a6a4.tar.xz |
Add array_insert_drop and array_delete functions.
Also add index argument to array_insert.
Diffstat (limited to 'source/pdf')
-rw-r--r-- | source/pdf/pdf-object.c | 42 | ||||
-rw-r--r-- | source/pdf/pdf-write.c | 4 |
2 files changed, 41 insertions, 5 deletions
diff --git a/source/pdf/pdf-object.c b/source/pdf/pdf-object.c index 88af2639..c4623f0a 100644 --- a/source/pdf/pdf-object.c +++ b/source/pdf/pdf-object.c @@ -608,7 +608,7 @@ pdf_array_push_drop(pdf_obj *obj, pdf_obj *item) } void -pdf_array_insert(pdf_obj *obj, pdf_obj *item) +pdf_array_insert(pdf_obj *obj, pdf_obj *item, int i) { RESOLVE(obj); @@ -618,16 +618,52 @@ pdf_array_insert(pdf_obj *obj, pdf_obj *item) fz_warn(obj->doc->ctx, "assert: not an array (%s)", pdf_objkindstr(obj)); else { + if (i < 0 || i > obj->u.a.len) + fz_throw(obj->doc->ctx, FZ_ERROR_GENERIC, "attempt to insert object %d in array of length %d", i, obj->u.a.len); if (obj->u.a.len + 1 > obj->u.a.cap) pdf_array_grow(obj); - memmove(obj->u.a.items + 1, obj->u.a.items, obj->u.a.len * sizeof(pdf_obj*)); - obj->u.a.items[0] = pdf_keep_obj(item); + memmove(obj->u.a.items + i + 1, obj->u.a.items + i, (obj->u.a.len - i) * sizeof(pdf_obj*)); + obj->u.a.items[i] = pdf_keep_obj(item); obj->u.a.len++; } object_altered(obj, item); } +void +pdf_array_insert_drop(pdf_obj *obj, pdf_obj *item, int i) +{ + fz_context *ctx = obj->doc->ctx; + fz_try(ctx) + { + pdf_array_insert(obj, item, i); + } + fz_always(ctx) + { + pdf_drop_obj(item); + } + fz_catch(ctx) + { + fz_rethrow(ctx); + } +} + +void +pdf_array_delete(pdf_obj *obj, int i) +{ + if (!obj) + return; /* Can't warn :( */ + if (obj->kind != PDF_ARRAY) + fz_warn(obj->doc->ctx, "assert: not an array (%s)", pdf_objkindstr(obj)); + else + { + pdf_drop_obj(obj->u.a.items[i]); + obj->u.a.items[i] = 0; + obj->u.a.len--; + memmove(obj->u.a.items + i, obj->u.a.items + i + 1, (obj->u.a.len - i) * sizeof(pdf_obj*)); + } +} + int pdf_array_contains(pdf_obj *arr, pdf_obj *obj) { diff --git a/source/pdf/pdf-write.c b/source/pdf/pdf-write.c index 9d768d0f..00718848 100644 --- a/source/pdf/pdf-write.c +++ b/source/pdf/pdf-write.c @@ -1506,9 +1506,9 @@ static void addhexfilter(pdf_document *doc, pdf_obj *dict) } else if (pdf_is_array(f)) { - pdf_array_insert(f, ahx); + pdf_array_insert(f, ahx, 0); if (pdf_is_array(dp)) - pdf_array_insert(dp, nullobj); + pdf_array_insert(dp, nullobj, 0); } else f = ahx; |