diff -Naur old/source/fitz/color-lcms.c new/source/fitz/color-lcms.c --- old/source/fitz/color-lcms.c 2017-10-25 22:19:28.890575079 -1000 +++ new/source/fitz/color-lcms.c 2017-10-25 22:21:22.919919617 -1000 @@ -66,7 +66,7 @@ static int fz_lcms_num_devcomps(cmsContext cmm_ctx, fz_iccprofile *profile) { - return cmsChannelsOf(cmm_ctx, cmsGetColorSpace(cmm_ctx, profile->cmm_handle)); + return cmsChannelsOf(cmsGetColorSpace(profile->cmm_handle)); } static void @@ -132,8 +132,8 @@ DEBUG_LCMS_MEM(("@@@@@@@ Transform Pixmap Start:: mupdf ctx = %p lcms ctx = %p link = %p \n", (void*)ctx, (void*)cmm_ctx, (void*)link->cmm_handle)); /* check the channels. */ - src_format = cmsGetTransformInputFormat(cmm_ctx, hTransform); - dst_format = cmsGetTransformOutputFormat(cmm_ctx, hTransform); + src_format = cmsGetTransformInputFormat(hTransform); + dst_format = cmsGetTransformOutputFormat(hTransform); cmm_num_src = T_CHANNELS(src_format); cmm_num_des = T_CHANNELS(dst_format); cmm_extras = T_EXTRA(src_format); @@ -150,7 +150,7 @@ for (; h > 0; h--) { fz_lcms_unmultiply_row(ctx, sn, sc, sw, buffer, inputpos); - cmsDoTransform(cmm_ctx, hTransform, buffer, outputpos, sw); + cmsDoTransform(hTransform, buffer, outputpos, sw); fz_lcms_premultiply_row(ctx, dn, dc, dw, outputpos); inputpos += ss; outputpos += ds; @@ -161,7 +161,7 @@ { for (; h > 0; h--) { - cmsDoTransform(cmm_ctx, hTransform, inputpos, outputpos, sw); + cmsDoTransform(hTransform, inputpos, outputpos, sw); inputpos += ss; outputpos += ds; } @@ -176,7 +176,7 @@ cmsContext cmm_ctx = (cmsContext)instance; cmsHTRANSFORM hTransform = (cmsHTRANSFORM) link->cmm_handle; - cmsDoTransform(cmm_ctx, hTransform, src, dst, 1); + cmsDoTransform(hTransform, src, dst, 1); } void @@ -194,19 +194,19 @@ DEBUG_LCMS_MEM(("@@@@@@@ Create Link Start:: mupdf ctx = %p lcms ctx = %p src = %p des = %p \n", (void*)ctx, (void*)cmm_ctx, (void*)src->cmm_handle, (void*)dst->cmm_handle)); /* src */ - src_cs = cmsGetColorSpace(cmm_ctx, src->cmm_handle); - lcms_src_cs = _cmsLCMScolorSpace(cmm_ctx, src_cs); + src_cs = cmsGetColorSpace(src->cmm_handle); + lcms_src_cs = _cmsLCMScolorSpace(src_cs); if (lcms_src_cs < 0) lcms_src_cs = 0; - src_num_chan = cmsChannelsOf(cmm_ctx, src_cs); + src_num_chan = cmsChannelsOf(src_cs); 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); - lcms_des_cs = _cmsLCMScolorSpace(cmm_ctx, des_cs); + des_cs = cmsGetColorSpace(dst->cmm_handle); + lcms_des_cs = _cmsLCMScolorSpace(des_cs); if (lcms_des_cs < 0) lcms_des_cs = 0; - des_num_chan = cmsChannelsOf(cmm_ctx, des_cs); + des_num_chan = cmsChannelsOf(des_cs); 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 */ @@ -254,17 +254,17 @@ cmsUInt32Number prf_data_type; cmsHPROFILE hProfiles[3]; - prf_cs = cmsGetColorSpace(cmm_ctx, prf->cmm_handle); - lcms_prf_cs = _cmsLCMScolorSpace(cmm_ctx, prf_cs); + prf_cs = cmsGetColorSpace(prf->cmm_handle); + lcms_prf_cs = _cmsLCMScolorSpace(prf_cs); if (lcms_prf_cs < 0) lcms_prf_cs = 0; - prf_num_chan = cmsChannelsOf(cmm_ctx, prf_cs); + prf_num_chan = cmsChannelsOf(prf_cs); prf_data_type = (COLORSPACE_SH(lcms_prf_cs) | CHANNELS_SH(prf_num_chan) | BYTES_SH(num_bytes)); src_to_prf_link = cmsCreateTransformTHR(cmm_ctx, src->cmm_handle, src_data_type, prf->cmm_handle, prf_data_type, rend->ri, flag); if (!src_to_prf_link) fz_throw(ctx, FZ_ERROR_GENERIC, "cmsCreateTransform failed"); - src_to_prf_profile = cmsTransform2DeviceLink(cmm_ctx, src_to_prf_link, 3.4, flag); - cmsDeleteTransform(cmm_ctx, src_to_prf_link); + src_to_prf_profile = cmsTransform2DeviceLink(src_to_prf_link, 3.4, flag); + cmsDeleteTransform(src_to_prf_link); if (!src_to_prf_profile) fz_throw(ctx, FZ_ERROR_GENERIC, "cmsTransform2DeviceLink failed"); @@ -272,7 +272,7 @@ hProfiles[1] = prf->cmm_handle; hProfiles[2] = dst->cmm_handle; link->cmm_handle = cmsCreateMultiprofileTransformTHR(cmm_ctx, hProfiles, 3, src_data_type, des_data_type, INTENT_RELATIVE_COLORIMETRIC, flag); - cmsCloseProfile(cmm_ctx, src_to_prf_profile); + cmsCloseProfile(src_to_prf_profile); if (!link->cmm_handle) fz_throw(ctx, FZ_ERROR_GENERIC, "cmsCreateMultiprofileTransform failed"); } @@ -287,7 +287,7 @@ cmsContext cmm_ctx = (cmsContext)instance; DEBUG_LCMS_MEM(("Free Link:: link = %p \n", (void*)link->cmm_handle)); if (link->cmm_handle != NULL) - cmsDeleteTransform(cmm_ctx, link->cmm_handle); + cmsDeleteTransform(link->cmm_handle); link->cmm_handle = NULL; } @@ -341,7 +341,7 @@ cmsContext cmm_ctx = (cmsContext)instance; DEBUG_LCMS_MEM(("Free Profile:: profile = %p \n", (void*) profile->cmm_handle)); if (profile->cmm_handle != NULL) - cmsCloseProfile(cmm_ctx, profile->cmm_handle); + cmsCloseProfile(profile->cmm_handle); profile->cmm_handle = NULL; }