[gnome-settings-daemon/benzea/blackbody-color-stable: 2/2] color: Always use old blackbody calculation

[Benjamin Berg <bberg src gnome org>]

commit 9ed3a427e765fb30ec540c6df5057cb2958bc7a0
Author: Benjamin Berg <bberg redhat com>
Date:   Mon Jun 3 14:48:12 2019 +0200

    color: Always use old blackbody calculation
    
    We tried to switch to a better way of calculating the blackbody color,
    but unfortunately the switch was only partial and not used in most
    cases. Revert this to the old calculation for stable so that we can
    update the default values and configuration panel when moving to the
    better blackbody color calculation.
    
    Fixes #403

 plugins/color/gsd-color-state.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/plugins/color/gsd-color-state.c b/plugins/color/gsd-color-state.c
index f46d8cef..f30b69d0 100644
--- a/plugins/color/gsd-color-state.c
+++ b/plugins/color/gsd-color-state.c
@@ -415,7 +415,7 @@ gcm_session_generate_vcgt (CdProfile *profile, guint color_temperature, guint si
         /* get the color temperature */
         if (!cd_color_get_blackbody_rgb_full (color_temperature,
                                               &temp,
-                                              CD_COLOR_BLACKBODY_FLAG_USE_PLANCKIAN)) {
+                                              CD_COLOR_BLACKBODY_FLAG_NONE)) {
                 g_warning ("failed to get blackbody for %uK", color_temperature);
                 cd_color_rgb_set (&temp, 1.0, 1.0, 1.0);
         } else {
@@ -566,7 +566,9 @@ gcm_session_device_reset_gamma (GnomeRROutput *output,
         }
 
         /* get the color temperature */
-        if (!cd_color_get_blackbody_rgb (color_temperature, &temp)) {
+        if (!cd_color_get_blackbody_rgb_full (color_temperature,
+                                              &temp,
+                                              CD_COLOR_BLACKBODY_FLAG_NONE)) {
                 g_warning ("failed to get blackbody for %uK", color_temperature);
                 cd_color_rgb_set (&temp, 1.0, 1.0, 1.0);
         } else {