summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarti Maria <info@littlecms.com>2013-05-24 15:52:23 +0200
committerMarti Maria <info@littlecms.com>2013-05-24 15:52:23 +0200
commit118c6d9896bcc2dfa28c7df2079e815e97c64f84 (patch)
tree76adaaf6f5a81649899705011ca2eae0d3f37a93
parent6f15a9e7816c2b8b46c2d91ef269efd1e1878f0d (diff)
downloadlcms2-118c6d9896bcc2dfa28c7df2079e815e97c64f84.tar.gz
Fixed propagation of render intent
-rw-r--r--ChangeLog3
-rw-r--r--src/cmstypes.c3
-rw-r--r--src/cmsvirt.c3
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 66a8a07..4748d8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -108,4 +108,5 @@ Added some fixes from XhmikosR
Fixed a bug in parametric curves
Remove spurious tabs added by git merge of pull request
Added support for VS2012
-Added a simple project for cppcheck \ No newline at end of file
+Added a simple project for cppcheck
+Rendering intent used when creating the transform is now propagated to profile header in cmsTransform2Devicelink. This is because 7.2.15 in spec 4.3
diff --git a/src/cmstypes.c b/src/cmstypes.c
index c056a76..8209556 100644
--- a/src/cmstypes.c
+++ b/src/cmstypes.c
@@ -1360,6 +1360,9 @@ void *Type_Measurement_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER*
{
cmsICCMeasurementConditions mc;
+
+ memset(&mc, 0, sizeof(mc));
+
if (!_cmsReadUInt32Number(io, &mc.Observer)) return NULL;
if (!_cmsReadXYZNumber(io, &mc.Backing)) return NULL;
if (!_cmsReadUInt32Number(io, &mc.Geometry)) return NULL;
diff --git a/src/cmsvirt.c b/src/cmsvirt.c
index 262b9ea..87184f9 100644
--- a/src/cmsvirt.c
+++ b/src/cmsvirt.c
@@ -1170,6 +1170,9 @@ cmsHPROFILE CMSEXPORT cmsTransform2DeviceLink(cmsHTRANSFORM hTransform, cmsFloat
if (!_cmsWriteProfileSequence(hProfile, xform ->Sequence)) goto Error;
}
+ // Per 7.2.15 in spec 4.3
+ cmsSetHeaderRenderingIntent(hProfile, xform ->RenderingIntent);
+
cmsPipelineFree(LUT);
return hProfile;