diff options
| author | Paul Gardiner <paulg.artifex@glidos.net> | 2012-08-08 14:03:34 +0100 |
|---|---|---|
| committer | Paul Gardiner <paulg.artifex@glidos.net> | 2012-08-08 14:03:34 +0100 |
| commit | 274ab2d66943bb891976ef712a816e7d128eff22 (patch) | |
| tree | bee912b4426f3dfe4acc176a57fd5b55db58d53c /xps/xps_zip.c | |
| parent | 51661f29a5f229f30ae16e16bd0ef6396cd001af (diff) | |
| parent | 511ea75a53db6e72334438bcda2ce774c7d72d1e (diff) | |
| download | mupdf-274ab2d66943bb891976ef712a816e7d128eff22.tar.xz | |
Merge branch 'master' into forms
Conflicts:
Makefile
apps/mudraw.c
pdf/pdf_write.c
win32/libmupdf-v8.vcproj
Diffstat (limited to 'xps/xps_zip.c')
| -rw-r--r-- | xps/xps_zip.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xps/xps_zip.c b/xps/xps_zip.c index 58f04009..e36f9c0f 100644 --- a/xps/xps_zip.c +++ b/xps/xps_zip.c @@ -626,12 +626,14 @@ xps_open_document(fz_context *ctx, char *filename) { doc = xps_open_document_with_stream(file); } - fz_catch(ctx) + fz_always(ctx) { fz_close(file); + } + fz_catch(ctx) + { fz_throw(ctx, "cannot load document '%s'", filename); } - fz_close(file); return doc; } |