diff options
| author | Tor Andersson <tor@ghostscript.com> | 2009-11-30 18:15:54 +0100 |
|---|---|---|
| committer | Tor Andersson <tor@ghostscript.com> | 2009-11-30 18:15:54 +0100 |
| commit | 5b5a4d7f45481892a8e547dd3ea07881ff900587 (patch) | |
| tree | 8def59fcc432c0bd3730d7db07916ffbf0f23bba | |
| parent | 12ddfc8eca5323feb758a7966ca51a3b52279316 (diff) | |
| download | mupdf-5b5a4d7f45481892a8e547dd3ea07881ff900587.tar.xz | |
Resolve conflict.
| -rw-r--r-- | mupdf/pdf_store.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mupdf/pdf_store.c b/mupdf/pdf_store.c index 96d96705..e87611ad 100644 --- a/mupdf/pdf_store.c +++ b/mupdf/pdf_store.c @@ -290,10 +290,11 @@ pdf_removeitem(pdf_store *store, pdf_itemkind kind, fz_obj *key) item = fz_hashfind(store->hash, &refkey); if (!item) - return fz_throw("cannot remove non-existent item from store"); - error = fz_hashremove(store->hash, &refkey); - if (error) - return fz_rethrow(error, "cannot remove item from store"); + return; + fz_hashremove(store->hash, &refkey); + + pdf_logrsrc("remove item %s (%d %d R) ptr=%p\n", kindstr(kind), fz_tonum(key), fz_togen(key), item->val); + dropitem(kind, item->val); fz_dropobj(item->key); fz_free(item); |