From 147acd711a717c850d165f6b9ae21dffc9f5b5a4 Mon Sep 17 00:00:00 2001
From: jdc <jdesmis@gmail.com>
Date: Mon, 2 Dec 2013 17:52:46 +0100
Subject: [PATCH] Fixed Black and White Total in absolute mode  issue 2010

---
 rtengine/color.cc   | 5 +++++
 rtgui/blackwhite.cc | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/rtengine/color.cc b/rtengine/color.cc
index 70cb1ba24..d51108679 100644
--- a/rtengine/color.cc
+++ b/rtengine/color.cc
@@ -563,6 +563,11 @@ namespace rtengine {
         mixerRed   = mixerRed   / (mixerRed + mixerGreen + mixerBlue);
         mixerGreen = mixerGreen / (mixerRed + mixerGreen + mixerBlue);
         mixerBlue  = mixerBlue  / (mixerRed + mixerGreen + mixerBlue);
+		if(filter!="None") {
+			som = mixerRed+mixerGreen+mixerBlue;
+			if(setting=="RGB-Abs" || setting=="ROYGCBPM-Abs") kcorec = kcorec*som;
+			}		
+		
     }
 
     void Color::calcGamma (double pwr, double ts, int mode, int imax, double &gamma0, double &gamma1, double &gamma2, double &gamma3, double &gamma4, double &gamma5) {
diff --git a/rtgui/blackwhite.cc b/rtgui/blackwhite.cc
index d40440fe6..a9587c0b5 100644
--- a/rtgui/blackwhite.cc
+++ b/rtgui/blackwhite.cc
@@ -1051,8 +1051,8 @@ void BlackWhite::updateRGBLabel () {
 				Glib::ustring::format(std::fixed, std::setprecision(1), r*100.),
 				Glib::ustring::format(std::fixed, std::setprecision(1), g*100.),
 				Glib::ustring::format(std::fixed, std::setprecision(1), b*100.),
-				Glib::ustring::format(std::fixed, std::setprecision(0), (r+g+b)*100.))
-		);
+				Glib::ustring::format(std::fixed, std::setprecision(0), ceil(kcorrec*100./*(r+g+b)*100.)*/)))
+				);
 		// We have to update the RGB sliders too if preset values has been chosen
 		if (sSetting != "RGB-Abs" && sSetting != "RGB-Rel" && sSetting != "ROYGCBPM-Abs" && sSetting != "ROYGCBPM-Rel") {
 			mixerRed->setValue(mixR);