diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2016-06-30 15:21:56 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2016-07-06 13:34:37 +0200 |
| commit | 255776a778b519183d6935ff0cb4b766644fa830 (patch) | |
| tree | 16c2d411870b31cc25a2941d90ca862c10083667 /source/pdf/pdf-function.c | |
| parent | b644ed1360d0e47c03a637bbc568000d57d0cdbf (diff) | |
| download | mupdf-255776a778b519183d6935ff0cb4b766644fa830.tar.xz | |
pdf: Drop generation number from public interfaces.
The generation number is only needed for decryption, and is assumed
to be zero or irrelevant for all other uses.
Store the original object number and generation in the xref slot, so
that we can decrypt them even when the objects have been renumbered,
without needing to pass the original object number around through
the stream loading APIs.
Diffstat (limited to 'source/pdf/pdf-function.c')
| -rw-r--r-- | source/pdf/pdf-function.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/pdf/pdf-function.c b/source/pdf/pdf-function.c index 979e9ec9..6de7bfc0 100644 --- a/source/pdf/pdf-function.c +++ b/source/pdf/pdf-function.c @@ -833,7 +833,7 @@ parse_code(fz_context *ctx, pdf_function *func, fz_stream *stream, int *codeptr, } static void -load_postscript_func(fz_context *ctx, pdf_document *doc, pdf_function *func, pdf_obj *dict, int num, int gen) +load_postscript_func(fz_context *ctx, pdf_document *doc, pdf_function *func, pdf_obj *dict, int num) { fz_stream *stream = NULL; int codeptr; @@ -848,7 +848,7 @@ load_postscript_func(fz_context *ctx, pdf_document *doc, pdf_function *func, pdf fz_try(ctx) { - stream = pdf_open_stream(ctx, doc, num, gen); + stream = pdf_open_stream(ctx, doc, num); tok = pdf_lex(ctx, stream, &buf); if (tok != PDF_TOK_OPEN_BRACE) @@ -906,7 +906,7 @@ eval_postscript_func(fz_context *ctx, pdf_function *func, const float *in, float #define MAX_SAMPLE_FUNCTION_SIZE (100 << 20) static void -load_sample_func(fz_context *ctx, pdf_document *doc, pdf_function *func, pdf_obj *dict, int num, int gen) +load_sample_func(fz_context *ctx, pdf_document *doc, pdf_function *func, pdf_obj *dict, int num) { fz_stream *stream; pdf_obj *obj; @@ -984,7 +984,7 @@ load_sample_func(fz_context *ctx, pdf_document *doc, pdf_function *func, pdf_obj func->u.sa.samples = fz_malloc_array(ctx, samplecount, sizeof(float)); func->base.size += samplecount * sizeof(float); - stream = pdf_open_stream(ctx, doc, num, gen); + stream = pdf_open_stream(ctx, doc, num); fz_try(ctx) { @@ -1661,7 +1661,7 @@ pdf_load_function(fz_context *ctx, pdf_document *doc, pdf_obj *dict, int in, int switch (func->type) { case SAMPLE: - load_sample_func(ctx, doc, func, dict, pdf_to_num(ctx, dict), pdf_to_gen(ctx, dict)); + load_sample_func(ctx, doc, func, dict, pdf_to_num(ctx, dict)); break; case EXPONENTIAL: @@ -1673,11 +1673,11 @@ pdf_load_function(fz_context *ctx, pdf_document *doc, pdf_obj *dict, int in, int break; case POSTSCRIPT: - load_postscript_func(ctx, doc, func, dict, pdf_to_num(ctx, dict), pdf_to_gen(ctx, dict)); + load_postscript_func(ctx, doc, func, dict, pdf_to_num(ctx, dict)); break; default: - fz_throw(ctx, FZ_ERROR_GENERIC, "unknown function type (%d %d R)", pdf_to_num(ctx, dict), pdf_to_gen(ctx, dict)); + fz_throw(ctx, FZ_ERROR_GENERIC, "unknown function type (%d 0 R)", pdf_to_num(ctx, dict)); } pdf_store_item(ctx, dict, func, func->base.size); |