[Bf-blender-cvs] [3c21885] master: Change coefficients to 4 digit precision only.

Antony Riakiotakis noreply at git.blender.org
Mon Mar 23 12:18:48 CET 2015


Commit: 3c21885ec4ee2c06e24f43a87ed11a36b0fb7fe7
Author: Antony Riakiotakis
Date:   Mon Mar 23 12:18:42 2015 +0100
Branches: master
https://developer.blender.org/rB3c21885ec4ee2c06e24f43a87ed11a36b0fb7fe7

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.

===================================================================

M	intern/opencolorio/fallback_impl.cc
M	release/datafiles/colormanagement/config.ocio
M	source/blender/imbuf/intern/colormanagement.c

===================================================================

diff --git a/intern/opencolorio/fallback_impl.cc b/intern/opencolorio/fallback_impl.cc
index 136f427..7ba540a 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 7ecc976..1cf9a3b 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 a1b7a14..20baa16 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




More information about the Bf-blender-cvs mailing list