diff options
| author | Michael Vrhel <michael.vrhel@artifex.com> | 2017-10-10 17:29:49 -0700 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2017-10-24 15:16:37 +0100 |
| commit | e0f01fa992514c44d08338ea95c0ba01663d0bcc (patch) | |
| tree | 87530a29c4a6020aeaa53b5af2ef553dd645fd42 | |
| parent | 3194c4192f65ec3e5bf3e3d2f9bc639e6a776307 (diff) | |
| download | mupdf-e0f01fa992514c44d08338ea95c0ba01663d0bcc.tar.xz | |
Minor fix for bgr handling with lcms2
| -rw-r--r-- | source/fitz/color-lcms.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/fitz/color-lcms.c b/source/fitz/color-lcms.c index 033391a6..604573cb 100644 --- a/source/fitz/color-lcms.c +++ b/source/fitz/color-lcms.c @@ -199,7 +199,7 @@ fz_lcms_init_link(fz_cmm_instance *instance, fz_icclink *link, const fz_iccprofi if (lcms_src_cs < 0) lcms_src_cs = 0; src_num_chan = cmsChannelsOf(cmm_ctx, src_cs); - src_data_type = (COLORSPACE_SH(lcms_src_cs) | CHANNELS_SH(src_num_chan) | DOSWAP_SH(src->bgr) | BYTES_SH(num_bytes) | EXTRA_SH(src_extras)); + src_data_type = (COLORSPACE_SH(lcms_src_cs) | CHANNELS_SH(src_num_chan) | DOSWAP_SH(src->bgr) | SWAPFIRST_SH(src->bgr && (src_extras != 0)) | BYTES_SH(num_bytes) | EXTRA_SH(src_extras)); /* dst */ des_cs = cmsGetColorSpace(cmm_ctx, dst->cmm_handle); @@ -207,7 +207,7 @@ fz_lcms_init_link(fz_cmm_instance *instance, fz_icclink *link, const fz_iccprofi if (lcms_des_cs < 0) lcms_des_cs = 0; des_num_chan = cmsChannelsOf(cmm_ctx, des_cs); - des_data_type = (COLORSPACE_SH(lcms_des_cs) | CHANNELS_SH(des_num_chan) | DOSWAP_SH(dst->bgr) | BYTES_SH(num_bytes) | EXTRA_SH(dst_extras)); + des_data_type = (COLORSPACE_SH(lcms_des_cs) | CHANNELS_SH(des_num_chan) | DOSWAP_SH(dst->bgr) | SWAPFIRST_SH(dst->bgr && (dst_extras != 0)) | BYTES_SH(num_bytes) | EXTRA_SH(dst_extras)); /* flags */ if (rend->bp) |