diff options
author | Sebastian Rasmussen <sebras@gmail.com> | 2012-07-19 00:50:57 +0200 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2012-07-23 18:07:04 +0200 |
commit | 5244fd433d7203a7db26835f738bae18c1bd3651 (patch) | |
tree | e982ce9e751b4c4bf1b2f2216c44410fe7020cc6 /pdf/pdf_function.c | |
parent | 2c2d3dc0ed0a72981a50d393d1450ab77e17c91c (diff) | |
download | mupdf-5244fd433d7203a7db26835f738bae18c1bd3651.tar.xz |
Handle pdf functions with malformed input/output mappings
After this pdf functions that have malformed Decode/Encode arrays with
too few/many entries compared to the number of inputs/outputs will be
handled more gracefully. Those missing mappings will be set to default
values.
Diffstat (limited to 'pdf/pdf_function.c')
-rw-r--r-- | pdf/pdf_function.c | 56 |
1 files changed, 31 insertions, 25 deletions
diff --git a/pdf/pdf_function.c b/pdf/pdf_function.c index 202ea822..9d0aabd5 100644 --- a/pdf/pdf_function.c +++ b/pdf/pdf_function.c @@ -937,45 +937,44 @@ load_sample_func(pdf_function *func, pdf_document *xref, pdf_obj *dict, int num, obj = pdf_dict_gets(dict, "BitsPerSample"); func->u.sa.bps = bps = pdf_to_int(obj); + for (i = 0; i < func->m; i++) + { + func->u.sa.encode[i][0] = 0; + func->u.sa.encode[i][1] = func->u.sa.size[i] - 1; + } obj = pdf_dict_gets(dict, "Encode"); if (pdf_is_array(obj)) { - if (pdf_array_len(obj) != func->m * 2) - fz_throw(ctx, "malformed /Encode"); - for (i = 0; i < func->m; i++) + int ranges = fz_mini(func->m, pdf_array_len(obj) / 2); + if (ranges != func->m) + fz_warn(ctx, "too few/many sample function input mappings"); + + for (i = 0; i < ranges; i++) { func->u.sa.encode[i][0] = pdf_to_real(pdf_array_get(obj, i * 2 + 0)); func->u.sa.encode[i][1] = pdf_to_real(pdf_array_get(obj, i * 2 + 1)); } } - else + + for (i = 0; i < func->n; i++) { - for (i = 0; i < func->m; i++) - { - func->u.sa.encode[i][0] = 0; - func->u.sa.encode[i][1] = func->u.sa.size[i] - 1; - } + func->u.sa.decode[i][0] = func->range[i][0]; + func->u.sa.decode[i][1] = func->range[i][1]; } obj = pdf_dict_gets(dict, "Decode"); if (pdf_is_array(obj)) { - if (pdf_array_len(obj) != func->n * 2) - fz_throw(ctx, "malformed /Decode"); - for (i = 0; i < func->n; i++) + int ranges = fz_mini(func->n, pdf_array_len(obj) / 2); + if (ranges != func->n) + fz_warn(ctx, "too few/many sample function output mappings"); + + for (i = 0; i < ranges; i++) { func->u.sa.decode[i][0] = pdf_to_real(pdf_array_get(obj, i * 2 + 0)); func->u.sa.decode[i][1] = pdf_to_real(pdf_array_get(obj, i * 2 + 1)); } } - else - { - for (i = 0; i < func->n; i++) - { - func->u.sa.decode[i][0] = func->range[i][0]; - func->u.sa.decode[i][1] = func->range[i][1]; - } - } for (i = 0, samplecount = func->n; i < func->m; i++) samplecount *= func->u.sa.size[i]; @@ -1265,13 +1264,20 @@ load_stitching_func(pdf_function *func, pdf_document *xref, pdf_obj *dict) fz_warn(ctx, "malformed shading function bounds (domain mismatch), proceeding anyway."); } + for (i = 0; i < k; i++) + { + func->u.st.encode[i * 2 + 0] = 0; + func->u.st.encode[i * 2 + 1] = 0; + } + obj = pdf_dict_gets(dict, "Encode"); - if (!pdf_is_array(obj)) - fz_throw(ctx, "stitching function is missing encoding"); + if (pdf_is_array(obj)) { - if (pdf_array_len(obj) != k * 2) - fz_throw(ctx, "malformed /Encode"); - for (i = 0; i < k; i++) + int ranges = fz_mini(k, pdf_array_len(obj) / 2); + if (ranges != k) + fz_warn(ctx, "too few/many stitching function input mappings"); + + for (i = 0; i < ranges; i++) { func->u.st.encode[i * 2 + 0] = pdf_to_real(pdf_array_get(obj, i * 2 + 0)); func->u.st.encode[i * 2 + 1] = pdf_to_real(pdf_array_get(obj, i * 2 + 1)); |