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

Remove some duplication w.r.t. the ICC store from the lab2rgb function.

Browse Source
This commit is contained in:
Adam Reichold
2016-02-07 14:04:16 +01:00
parent 171674a3e8
commit 2636d3e386
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rtengine/iplab2rgb.cc
View File

@@ -30,15 +30,8 @@
namespace rtengine namespace rtengine
{ {
#define CLIP01(a) ((a)>0?((a)<1?(a):1):0)
extern const Settings* settings; extern const Settings* settings;
const double (*wprof[])[3] = {xyz_sRGB, xyz_adobe, xyz_prophoto, xyz_widegamut, xyz_bruce, xyz_beta, xyz_best};
const double (*iwprof[])[3] = {sRGB_xyz, adobe_xyz, prophoto_xyz, widegamut_xyz, bruce_xyz, beta_xyz, best_xyz};
const char* wprofnames[] = {"sRGB", "Adobe RGB", "ProPhoto", "WideGamut", "BruceRGB", "Beta RGB", "BestRGB"};
const int numprof = 7;
void ImProcFunctions::lab2monitorRgb (LabImage* lab, Image8* image) void ImProcFunctions::lab2monitorRgb (LabImage* lab, Image8* image)
{ {
if (monitorTransform) { if (monitorTransform) {
@@ -209,18 +202,7 @@ Image8* ImProcFunctions::lab2rgb (LabImage* lab, int cx, int cy, int cw, int ch,
} }
} else { } else {
double rgb_xyz[3][3]; const auto rgb_xyz = iccStore->workingSpaceMatrix (profile);
for (int i = 0; i < numprof; i++) {
if (profile == wprofnames[i]) {
for (int m = 0; m < 3; m++)
for (int n = 0; n < 3; n++) {
rgb_xyz[m][n] = iwprof[i][m][n];
}
break;
}
}
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for schedule(dynamic,16) if (multiThread) #pragma omp parallel for schedule(dynamic,16) if (multiThread)