From d9821b6d06bb8cd29f559859fa4de6d005e0ba41 Mon Sep 17 00:00:00 2001
From: michael <michael@michaelezra.com>
Date: Fri, 20 Dec 2013 12:00:16 -0500
Subject: [PATCH] Contrast by detail levels - fixes to UI and precision in
 engine .

---
 rtengine/dirpyr_equalizer.cc | 6 +++---
 rtgui/dirpyrequalizer.cc     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rtengine/dirpyr_equalizer.cc b/rtengine/dirpyr_equalizer.cc
index 157220164..0b26723f8 100644
--- a/rtengine/dirpyr_equalizer.cc
+++ b/rtengine/dirpyr_equalizer.cc
@@ -102,7 +102,7 @@ namespace rtengine {
 		
 		for (int i=0; i<srcheight; i++) 
 			for (int j=0; j<srcwidth; j++) {
-				dst[i][j] = CLIP((int)(  buffer[i][j]  ));  // TODO: Really a clip necessary?		
+				dst[i][j] = CLIP(  buffer[i][j] );  // TODO: Really a clip necessary?
 								
 			}
 		//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -170,14 +170,14 @@ namespace rtengine {
 			for (int i=0; i<srcheight; i++) 
 				for (int j=0; j<srcwidth; j++) {
 					if(ncie->J_p[i][j] > 8.f && ncie->J_p[i][j] < 92.f)
-						dst[i][j] = CLIP((int)(  buffer[i][j]  ));  // TODO: Really a clip necessary?
+						dst[i][j] = CLIP( buffer[i][j] );  // TODO: Really a clip necessary?
 					else
 						dst[i][j]=src[i][j];
 				}
 		else
 			for (int i=0; i<srcheight; i++) 
 				for (int j=0; j<srcwidth; j++) {
-					dst[i][j] = CLIP((int)(  buffer[i][j]  ));  // TODO: Really a clip necessary?		
+					dst[i][j] = CLIP( buffer[i][j] );  // TODO: Really a clip necessary?
 				}
 		//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	}
diff --git a/rtgui/dirpyrequalizer.cc b/rtgui/dirpyrequalizer.cc
index 36a7e18c9..80942bf95 100644
--- a/rtgui/dirpyrequalizer.cc
+++ b/rtgui/dirpyrequalizer.cc
@@ -218,7 +218,7 @@ void DirPyrEqualizer::lumaneutralPressed () {
 void DirPyrEqualizer::lumacontrastPlusPressed () {
 
     for (int i = 0; i < 5; i++) {
-        float inc = 0.05 * (4 - i);
+        float inc = 0.05 * (5 - i);
         multiplier[i]->setValue(multiplier[i]->getValue() + inc);
         adjusterChanged(multiplier[i], multiplier[i]->getValue());
     }
@@ -228,7 +228,7 @@ void DirPyrEqualizer::lumacontrastPlusPressed () {
 void DirPyrEqualizer::lumacontrastMinusPressed () {
 
     for (int i = 0; i < 5; i++) {
-        float inc = -0.05 * (4 - i);
+        float inc = -0.05 * (5 - i);
         multiplier[i]->setValue(multiplier[i]->getValue() + inc);
         adjusterChanged(multiplier[i], multiplier[i]->getValue());
     }