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

Color Appearance Model 2002 added (see issue 1572). Credits: JDesmis for the core (and hard work!), Hombre for the GUI tuning

Browse Source
This commit is contained in:
natureh 510
2012-11-07 23:09:16 +01:00
parent 3be23be585
commit a91efaec78
83 changed files with 4783 additions and 880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtengine/improccoordinator.cc
View File

@@ -22,6 +22,7 @@
#include "refreshmap.h"
#include "simpleprocess.h"
#include "../rtgui/ppversion.h"
#include "colortemp.h"
namespace rtengine {
@@ -167,8 +168,11 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) {
params.wb.temperature = currWB.getTemp ();
params.wb.green = currWB.getGreen ();
imgsrc->demosaic( rp );
imgsrc->demosaic( rp );
//imgsrc->getImage (currWB, tr, orig_prev, pp, params.hlrecovery, params.icm, params.raw);
//imgsrc->convertColorSpace(orig_prev, params.icm, params.raw);
if (highDetailNeeded) {
highDetailRawComputed = true;
if (params.hlrecovery.enabled && params.hlrecovery.method=="Color") {
@@ -219,6 +223,7 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) {
PreviewProps pp (0, 0, fw, fh, scale);
setScale (scale);
imgsrc->getImage (currWB, tr, orig_prev, pp, params.hlrecovery, params.icm, params.raw);
//ColorTemp::CAT02 (orig_prev, &params) ;
//imgsrc->convertColorSpace(orig_prev, params.icm, params.raw);
@@ -339,6 +344,8 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) {
ipf.chromiLuminanceCurve (nprevl, nprevl, chroma_acurve, chroma_bcurve, satcurve,lhskcurve, lumacurve, utili, autili, butili, ccutili,cclutili);
//ipf.colorCurve (nprevl, nprevl);
ipf.vibrance(nprevl);
// ColorTemp::ciecam_02 (nprevl, &params);
readyphase++;
if (scale==1) {
progress ("Denoising luminance impulse...",100*readyphase/numofphases);
@@ -377,6 +384,7 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) {
readyphase++;
}
}
ColorTemp::ciecam_02 (nprevl, &params);
// process crop, if needed
for (size_t i=0; i<crops.size(); i++)