diff options
| author | Paul Gardiner <paulg.artifex@glidos.net> | 2012-09-04 10:24:42 +0100 |
|---|---|---|
| committer | Paul Gardiner <paulg.artifex@glidos.net> | 2012-09-04 10:24:42 +0100 |
| commit | f28d53842ace3e81b0be1ab7320d0dd0ab342d17 (patch) | |
| tree | a8fb7083eb0dc82cbf224802d248f12d5018c193 /cbz | |
| parent | 6d085e4322770772f9cf4105954292438dfa0930 (diff) | |
| parent | d2aefcfff6ef57fadcce87e61f844efe85f73d58 (diff) | |
| download | mupdf-f28d53842ace3e81b0be1ab7320d0dd0ab342d17.tar.xz | |
Merge branch 'master' into forms
Conflicts:
pdf/pdf_xref_aux.c
Diffstat (limited to 'cbz')
| -rw-r--r-- | cbz/mucbz.c | 5 | ||||
| -rw-r--r-- | cbz/mucbz.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/cbz/mucbz.c b/cbz/mucbz.c index f557236f..83737833 100644 --- a/cbz/mucbz.c +++ b/cbz/mucbz.c @@ -285,9 +285,8 @@ cbz_read_zip_dir(cbz_document *doc) } cbz_document * -cbz_open_document_with_stream(fz_stream *file) +cbz_open_document_with_stream(fz_context *ctx, fz_stream *file) { - fz_context *ctx = file->ctx; cbz_document *doc; doc = fz_malloc_struct(ctx, cbz_document); @@ -323,7 +322,7 @@ cbz_open_document(fz_context *ctx, char *filename) fz_throw(ctx, "cannot open file '%s': %s", filename, strerror(errno)); fz_try(ctx) { - doc = cbz_open_document_with_stream(file); + doc = cbz_open_document_with_stream(ctx, file); } fz_always(ctx) { fz_close(file); } fz_catch(ctx) { diff --git a/cbz/mucbz.h b/cbz/mucbz.h index 080423bf..05288eb3 100644 --- a/cbz/mucbz.h +++ b/cbz/mucbz.h @@ -30,7 +30,7 @@ cbz_document *cbz_open_document(fz_context *ctx, char *filename); fz_open_file_w or fz_open_fd for opening a stream, and fz_close for closing an open stream. */ -cbz_document *cbz_open_document_with_stream(fz_stream *file); +cbz_document *cbz_open_document_with_stream(fz_context *ctx, fz_stream *file); /* cbz_close_document: Closes and frees an opened document. |