diff options
Diffstat (limited to 'source/tools')
| -rw-r--r-- | source/tools/murun.c | 38 | ||||
| -rw-r--r-- | source/tools/pdfextract.c | 2 | ||||
| -rw-r--r-- | source/tools/pdfshow.c | 4 |
3 files changed, 17 insertions, 27 deletions
diff --git a/source/tools/murun.c b/source/tools/murun.c index 0d208cad..30e799e1 100644 --- a/source/tools/murun.c +++ b/source/tools/murun.c @@ -3366,15 +3366,22 @@ static void ffi_PDFObject_readStream(js_State *J) { fz_context *ctx = js_getcontext(J); pdf_obj *obj = js_touserdata(J, 0, "pdf_obj"); - pdf_document *pdf; fz_buffer *buf; + fz_try(ctx) + buf = pdf_load_stream(ctx, obj); + fz_catch(ctx) + rethrow(J); + ffi_pushbuffer(J, buf); +} - fz_try(ctx) { - if (!pdf_is_stream(ctx, obj)) - fz_throw(ctx, FZ_ERROR_GENERIC, "not a stream"); - pdf = pdf_get_indirect_document(ctx, obj); - buf = pdf_load_stream(ctx, pdf, pdf_to_num(ctx, obj)); - } fz_catch(ctx) +static void ffi_PDFObject_readRawStream(js_State *J) +{ + fz_context *ctx = js_getcontext(J); + pdf_obj *obj = js_touserdata(J, 0, "pdf_obj"); + fz_buffer *buf; + fz_try(ctx) + buf = pdf_load_raw_stream(ctx, obj); + fz_catch(ctx) rethrow(J); ffi_pushbuffer(J, buf); } @@ -3419,23 +3426,6 @@ static void ffi_PDFObject_writeRawStream(js_State *J) rethrow(J); } -static void ffi_PDFObject_readRawStream(js_State *J) -{ - fz_context *ctx = js_getcontext(J); - pdf_obj *obj = js_touserdata(J, 0, "pdf_obj"); - pdf_document *pdf; - fz_buffer *buf; - - fz_try(ctx) { - if (!pdf_is_stream(ctx, obj)) - fz_throw(ctx, FZ_ERROR_GENERIC, "not a stream"); - pdf = pdf_get_indirect_document(ctx, obj); - buf = pdf_load_raw_stream(ctx, pdf, pdf_to_num(ctx, obj)); - } fz_catch(ctx) - rethrow(J); - ffi_pushbuffer(J, buf); -} - static void ffi_PDFObject_forEach(js_State *J) { fz_context *ctx = js_getcontext(J); diff --git a/source/tools/pdfextract.c b/source/tools/pdfextract.c index bc80f0ac..a285c8a8 100644 --- a/source/tools/pdfextract.c +++ b/source/tools/pdfextract.c @@ -146,7 +146,7 @@ static void savefont(pdf_obj *dict, int num) return; } - buf = pdf_load_stream(ctx, doc, pdf_to_num(ctx, stream)); + buf = pdf_load_stream(ctx, stream); len = fz_buffer_storage(ctx, buf, &data); fz_try(ctx) { diff --git a/source/tools/pdfshow.c b/source/tools/pdfshow.c index bf83608b..a6f897ca 100644 --- a/source/tools/pdfshow.c +++ b/source/tools/pdfshow.c @@ -102,9 +102,9 @@ static void showstream(int num) showcolumn = 0; if (showdecode) - stm = pdf_open_stream(ctx, doc, num); + stm = pdf_open_stream_number(ctx, doc, num); else - stm = pdf_open_raw_stream(ctx, doc, num); + stm = pdf_open_raw_stream_number(ctx, doc, num); while (1) { |