From 5b5a4d7f45481892a8e547dd3ea07881ff900587 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Mon, 30 Nov 2009 18:15:54 +0100 Subject: Resolve conflict. --- mupdf/pdf_store.c | 9 +++++---- 1 file 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); -- cgit v1.2.3