diff options
| -rw-r--r-- | docs/mutool/run.html | 4 | ||||
| -rw-r--r-- | include/mupdf/pdf/xref.h | 2 | ||||
| -rw-r--r-- | platform/java/mupdf_native.c | 4 | ||||
| -rw-r--r-- | source/pdf/pdf-page.c | 2 | ||||
| -rw-r--r-- | source/pdf/pdf-xref.c | 8 | ||||
| -rw-r--r-- | source/tools/murun.c | 10 |
6 files changed, 18 insertions, 12 deletions
diff --git a/docs/mutool/run.html b/docs/mutool/run.html index 2081202a..bb726e2c 100644 --- a/docs/mutool/run.html +++ b/docs/mutool/run.html @@ -642,8 +642,8 @@ Do NOT mix and match objects from one document with another document! <dl> <dt>PDFDocument#addObject(obj) <dd>Add 'obj' to the PDF as a numbered object, and return an indirect reference to it. -<dt>PDFDocument#addStream(buffer) -<dd>Create a stream object with the contents of 'buffer', add it to the PDF, and return an indirect reference to it. +<dt>PDFDocument#addStream(buffer, object) +<dd>Create a stream object with the contents of 'buffer', add it to the PDF, and return an indirect reference to it. If object is defined, it will be used as the stream object dictionary. <dt>PDFDocument#newNull() <dt>PDFDocument#newBoolean(boolean) <dt>PDFDocument#newInteger(number) diff --git a/include/mupdf/pdf/xref.h b/include/mupdf/pdf/xref.h index 5d83f0dd..c97916f5 100644 --- a/include/mupdf/pdf/xref.h +++ b/include/mupdf/pdf/xref.h @@ -27,7 +27,7 @@ void pdf_update_stream(fz_context *ctx, pdf_document *doc, pdf_obj *ref, fz_buff pdf_obj *pdf_add_object(fz_context *ctx, pdf_document *doc, pdf_obj *obj); pdf_obj *pdf_add_object_drop(fz_context *ctx, pdf_document *doc, pdf_obj *obj); -pdf_obj *pdf_add_stream(fz_context *ctx, pdf_document *doc, fz_buffer *buf); +pdf_obj *pdf_add_stream(fz_context *ctx, pdf_document *doc, fz_buffer *buf, pdf_obj *obj); /* * xref and object / stream api diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c index 1704fd1d..537646a6 100644 --- a/platform/java/mupdf_native.c +++ b/platform/java/mupdf_native.c @@ -6057,7 +6057,7 @@ FUN(PDFDocument_addStreamBuffer)(JNIEnv *env, jobject self, jobject jbuf) if (!jbuf) { jni_throw_arg(env, "buffer must not be null"); return NULL; } fz_try(ctx) - ind = pdf_add_stream(ctx, pdf, buf); + ind = pdf_add_stream(ctx, pdf, buf, NULL); fz_catch(ctx) { jni_rethrow(env, ctx); @@ -6093,7 +6093,7 @@ FUN(PDFDocument_addStreamString)(JNIEnv *env, jobject self, jstring jbuf) memcpy(data, sbuf, len); buf = fz_new_buffer_from_data(ctx, data, len); data = NULL; - ind = pdf_add_stream(ctx, pdf, buf); + ind = pdf_add_stream(ctx, pdf, buf, NULL); } fz_always(ctx) { diff --git a/source/pdf/pdf-page.c b/source/pdf/pdf-page.c index 2667e184..e3c78877 100644 --- a/source/pdf/pdf-page.c +++ b/source/pdf/pdf-page.c @@ -668,7 +668,7 @@ pdf_add_page(fz_context *ctx, pdf_document *doc, const fz_rect *mediabox, int ro pdf_dict_put_drop(ctx, page_obj, PDF_NAME_MediaBox, pdf_new_rect(ctx, doc, mediabox)); pdf_dict_put_drop(ctx, page_obj, PDF_NAME_Rotate, pdf_new_int(ctx, doc, rotate)); pdf_dict_put_drop(ctx, page_obj, PDF_NAME_Resources, pdf_add_object(ctx, doc, resources)); - pdf_dict_put_drop(ctx, page_obj, PDF_NAME_Contents, pdf_add_stream(ctx, doc, contents)); + pdf_dict_put_drop(ctx, page_obj, PDF_NAME_Contents, pdf_add_stream(ctx, doc, contents, NULL)); } fz_catch(ctx) { diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c index 1af2d391..6280c2ff 100644 --- a/source/pdf/pdf-xref.c +++ b/source/pdf/pdf-xref.c @@ -2624,9 +2624,13 @@ pdf_add_object_drop(fz_context *ctx, pdf_document *doc, pdf_obj *obj) } pdf_obj * -pdf_add_stream(fz_context *ctx, pdf_document *doc, fz_buffer *buf) +pdf_add_stream(fz_context *ctx, pdf_document *doc, fz_buffer *buf, pdf_obj *obj) { - pdf_obj *ind = pdf_add_object_drop(ctx, doc, pdf_new_dict(ctx, doc, 4)); + pdf_obj *ind; + if (!obj) + ind = pdf_add_object_drop(ctx, doc, pdf_new_dict(ctx, doc, 4)); + else + ind = pdf_add_object(ctx, doc, obj); fz_try(ctx) pdf_update_stream(ctx, doc, ind, buf, 0); fz_catch(ctx) diff --git a/source/tools/murun.c b/source/tools/murun.c index 079a8c3c..b1f95d57 100644 --- a/source/tools/murun.c +++ b/source/tools/murun.c @@ -3055,14 +3055,16 @@ static void ffi_PDFDocument_addStream(js_State *J) { fz_context *ctx = js_getcontext(J); pdf_document *pdf = js_touserdata(J, 0, "pdf_document"); - fz_buffer *buf = ffi_tobuffer(J, 1); + fz_buffer *buf = ffi_tobuffer(J, 1); /* FIXME: leak if ffi_toobj throws */ + pdf_obj *obj = js_iscoercible(J, 2) ? ffi_toobj(J, pdf, 2) : NULL; pdf_obj *ind; fz_try(ctx) - ind = pdf_add_stream(ctx, pdf, buf); - fz_always(ctx) + ind = pdf_add_stream(ctx, pdf, buf, obj); + fz_always(ctx) { fz_drop_buffer(ctx, buf); - fz_catch(ctx) + pdf_drop_obj(ctx, obj); + } fz_catch(ctx) rethrow(J); ffi_pushobj(J, ind); |