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

merged branch 'unbounded-processing' into 'dev'

Browse Source
This commit is contained in:
Alberto Griggio
2018-03-28 21:35:23 +02:00
parent 69c38b4518 0b6f483e4b
commit b42a45b481
17 changed files with 516 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rtengine/dcp.cc
View File

@@ -1190,13 +1190,17 @@ void DCPProfile::step2ApplyTile(float* rc, float* gc, float* bc, int width, int
}
// with looktable and tonecurve we need to clip
newr = FCLIP(newr);
newg = FCLIP(newg);
newb = FCLIP(newb);
// newr = FCLIP(newr);
// newg = FCLIP(newg);
// newb = FCLIP(newb);
if (as_in.data->apply_look_table) {
float cnewr = FCLIP(newr);
float cnewg = FCLIP(newg);
float cnewb = FCLIP(newb);
float h, s, v;
Color::rgb2hsvdcp(newr, newg, newb, h, s, v);
Color::rgb2hsvdcp(cnewr, cnewg, cnewb, h, s, v);
hsdApply(look_info, look_table, h, s, v);
s = CLIP01(s);
@@ -1209,7 +1213,11 @@ void DCPProfile::step2ApplyTile(float* rc, float* gc, float* bc, int width, int
h -= 6.0f;
}
Color::hsv2rgbdcp( h, s, v, newr, newg, newb);
Color::hsv2rgbdcp( h, s, v, cnewr, cnewg, cnewb);
setUnlessOOG(newr, cnewr);
setUnlessOOG(newg, cnewg);
setUnlessOOG(newb, cnewb);
}
if (as_in.data->use_tone_curve) {