liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup for min/max functions. Committed on behalf of lebedev.ri (thanks!).

Browse Source
This commit is contained in:
Emil Martinec
2012-04-09 15:42:59 -05:00
parent 30681df133
commit 033755b6df
61 changed files with 767 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rtgui/navigator.cc
View File

@@ -21,6 +21,7 @@
#include "../rtengine/iccmatrices.h"
#include "../rtengine/iccstore.h"
#include "../rtengine/curves.h"
#include "../rtengine/rt_math.h"
#define D50x 0.96422
#define D50z 0.82521
@@ -109,8 +110,8 @@ void Navigator::rgb2hsv (int r, int g, int b, int &h, int &s, int &v) {
volatile double var_G = g / 255.0;
volatile double var_B = b / 255.0;
/*volatile double var_Min = MIN(MIN(var_R,var_G),var_B);
volatile double var_Max = MAX(MAX(var_R,var_G),var_B);
/*volatile double var_Min = min(var_R,var_G,var_B);
volatile double var_Max = max(var_R,var_G,var_B);
double del_Max = var_Max - var_Min;
double V = (var_Max + var_Min) / 2;
double H, S;
@@ -133,8 +134,8 @@ void Navigator::rgb2hsv (int r, int g, int b, int &h, int &s, int &v) {
if ( H > 1 ) H -= 1;
}*/
double var_Min = MIN(MIN(var_R,var_G),var_B);
double var_Max = MAX(MAX(var_R,var_G),var_B);
double var_Min = rtengine::min(var_R,var_G,var_B);
double var_Max = rtengine::max(var_R,var_G,var_B);
double del_Max = var_Max - var_Min;
double V = var_Max;
double H, S;