diff options
| author | Sebastian Rasmussen <sebras@gmail.com> | 2016-11-05 13:19:05 +0800 |
|---|---|---|
| committer | Sebastian Rasmussen <sebras@gmail.com> | 2016-12-14 20:39:20 +0100 |
| commit | fc2e086c2c5795f0ab1e974b3cf3c7a53c8e6197 (patch) | |
| tree | b4cf4a0e5d43e12cf5d8359dab41748ec6a5648e /source/pdf/pdf-image.c | |
| parent | bcd2fbe6337eb4a3a32f5ebbe7cfabd87328f677 (diff) | |
| download | mupdf-fc2e086c2c5795f0ab1e974b3cf3c7a53c8e6197.tar.xz | |
jpx: Delay determining if colorspace is indexed.
Diffstat (limited to 'source/pdf/pdf-image.c')
| -rw-r--r-- | source/pdf/pdf-image.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/pdf/pdf-image.c b/source/pdf/pdf-image.c index 0617b496..daa93824 100644 --- a/source/pdf/pdf-image.c +++ b/source/pdf/pdf-image.c @@ -214,7 +214,6 @@ pdf_load_jpx(fz_context *ctx, pdf_document *doc, pdf_obj *dict, int forcemask) fz_colorspace *colorspace = NULL; fz_pixmap *pix = NULL; pdf_obj *obj; - int indexed = 0; fz_image *mask = NULL; fz_image *img = NULL; @@ -233,13 +232,10 @@ pdf_load_jpx(fz_context *ctx, pdf_document *doc, pdf_obj *dict, int forcemask) obj = pdf_dict_get(ctx, dict, PDF_NAME_ColorSpace); if (obj) - { colorspace = pdf_load_colorspace(ctx, doc, obj); - indexed = fz_colorspace_is_indexed(ctx, colorspace); - } len = fz_buffer_storage(ctx, buf, &data); - pix = fz_load_jpx(ctx, data, len, colorspace, indexed); + pix = fz_load_jpx(ctx, data, len, colorspace); obj = pdf_dict_geta(ctx, dict, PDF_NAME_SMask, PDF_NAME_Mask); if (pdf_is_dict(ctx, obj)) @@ -251,7 +247,7 @@ pdf_load_jpx(fz_context *ctx, pdf_document *doc, pdf_obj *dict, int forcemask) } obj = pdf_dict_geta(ctx, dict, PDF_NAME_Decode, PDF_NAME_D); - if (obj && !indexed) + if (obj && !fz_colorspace_is_indexed(ctx, colorspace)) { float decode[FZ_MAX_COLORS * 2]; int i; |