diff options
Diffstat (limited to 'cmm_ctx_gone.patch')
| -rw-r--r-- | cmm_ctx_gone.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmm_ctx_gone.patch b/cmm_ctx_gone.patch index 208256dcac4e..55ce3c56dc77 100644 --- a/cmm_ctx_gone.patch +++ b/cmm_ctx_gone.patch @@ -60,7 +60,7 @@ diff -ur old/source/fitz/color-lcms.c new/source/fitz/color-lcms.c 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) | BYTES_SH(num_bytes) | EXTRA_SH(extras)); + 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)); /* dst */ - des_cs = cmsGetColorSpace(cmm_ctx, dst->cmm_handle); @@ -71,10 +71,10 @@ diff -ur old/source/fitz/color-lcms.c new/source/fitz/color-lcms.c 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) | BYTES_SH(num_bytes) | EXTRA_SH(extras)); + 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)); /* flags */ -@@ -252,17 +252,17 @@ +@@ -254,17 +254,17 @@ cmsUInt32Number prf_data_type; cmsHPROFILE hProfiles[3]; @@ -97,7 +97,7 @@ diff -ur old/source/fitz/color-lcms.c new/source/fitz/color-lcms.c if (!src_to_prf_profile) fz_throw(ctx, FZ_ERROR_GENERIC, "cmsTransform2DeviceLink failed"); -@@ -270,7 +270,7 @@ +@@ -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); @@ -106,7 +106,7 @@ diff -ur old/source/fitz/color-lcms.c new/source/fitz/color-lcms.c if (!link->cmm_handle) fz_throw(ctx, FZ_ERROR_GENERIC, "cmsCreateMultiprofileTransform failed"); } -@@ -285,7 +285,7 @@ +@@ -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) @@ -115,7 +115,7 @@ diff -ur old/source/fitz/color-lcms.c new/source/fitz/color-lcms.c link->cmm_handle = NULL; } -@@ -339,7 +339,7 @@ +@@ -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) |