From 3c21885ec4ee2c06e24f43a87ed11a36b0fb7fe7 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Mon, 23 Mar 2015 12:18:42 +0100 Subject: Change coefficients to 4 digit precision only. Need to match convention and sum up to 1.0 (previous set had a minor 10^(-10) overflow) Thanks to Campbell for taking notice. --- intern/opencolorio/fallback_impl.cc | 6 +++--- release/datafiles/colormanagement/config.ocio | 2 +- source/blender/imbuf/intern/colormanagement.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/intern/opencolorio/fallback_impl.cc b/intern/opencolorio/fallback_impl.cc index 136f427ee0e..7ba540a7d77 100644 --- a/intern/opencolorio/fallback_impl.cc +++ b/intern/opencolorio/fallback_impl.cc @@ -170,9 +170,9 @@ void FallbackImpl::configGetDefaultLumaCoefs(OCIO_ConstConfigRcPtr * /*config*/, * system in place. */ - rgb[0] = 0.2126729f; - rgb[1] = 0.7151522f; - rgb[2] = 0.0721750f; + rgb[0] = 0.2126f; + rgb[1] = 0.7152f; + rgb[2] = 0.0722f; } int FallbackImpl::configGetNumLooks(OCIO_ConstConfigRcPtr * /*config*/) diff --git a/release/datafiles/colormanagement/config.ocio b/release/datafiles/colormanagement/config.ocio index 7ecc9768d57..1cf9a3bb36e 100644 --- a/release/datafiles/colormanagement/config.ocio +++ b/release/datafiles/colormanagement/config.ocio @@ -6,7 +6,7 @@ ocio_profile_version: 1 search_path: luts strictparsing: true -luma: [0.2126729, 0.7151522, 0.0721750] +luma: [0.2126, 0.7152, 0.0722] description: RRT version ut33 diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index a1b7a14c9fe..20baa1614c9 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -93,7 +93,7 @@ static int global_tot_looks = 0; /* Set to ITU-BT.709 / sRGB primaries weight. Brute force stupid, but only * option with no colormanagement in place. */ -static float luma_coefficients[3] = { 0.2126729f, 0.7151522f, 0.0721750f }; +static float luma_coefficients[3] = { 0.2126f, 0.7152f, 0.0722f }; /* lock used by pre-cached processors getters, so processor wouldn't * be created several times -- cgit v1.2.3