Merge with 4e0f46f25a716ac65a4016bac6284685147b5ec9

(note: color.cc is still in the source tree and CMakeLists.txt)
This commit is contained in:
michael
2012-07-09 06:28:15 -04:00
parent 5a7efbbbbb
commit 6b842fd408
35 changed files with 270 additions and 185 deletions

View File

@@ -112,7 +112,7 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
if (params.dirpyrDenoise.enabled) {
ipf.RGB_denoise(baseImg, baseImg, params.dirpyrDenoise, params.defringe);
}
imgsrc->convertColorSpace(baseImg, params.icm);
imgsrc->convertColorSpace(baseImg, params.icm, params.raw);
// perform first analysis
LUTu hist16 (65536);