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

Try to solve conflit

Browse Source
This commit is contained in:
Desmis
2016-01-03 16:56:21 +01:00
parent 4e229fe928 4d6833c43c
commit edd88be82c
13 changed files with 67 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/simpleprocess.cc
View File

@@ -1159,7 +1159,6 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
// if(params.blackwhite.enabled) params.toneCurve.hrenabled=false;
readyImg = ipf.lab2rgb16b (labView, cx, cy, cw, ch, params.icm.output, params.icm.outputIntent, params.icm.working, params.icm.gamma, params.icm.freegamma, params.icm.gampos, params.icm.slpos, ga0, ga1, ga2, ga3, ga4, ga5, ga6, params.blackwhite.enabled );
customGamma = true;
customGamma = true;
//or selected Free gamma
useLCMS = false;
@@ -1167,6 +1166,7 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
Glib::ustring chpro, outProfile;
bool present_space[9] = {false, false, false, false, false, false, false, false, false};
std::vector<Glib::ustring> opnames = iccStore->getProfiles ();
//test if files are in system
for (int j = 0; j < 9; j++) {
// one can modify "option" [Color Management] to adapt the profile's name if they are different for windows, MacOS, Linux ??