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

Cleanups and a few fixes

Browse Source
This commit is contained in:
Flössie
2019-05-10 21:24:22 +02:00
parent c360fd7e2c
commit ba4de904cc
22 changed files with 582 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rtengine/simpleprocess.cc
View File

@@ -776,7 +776,7 @@ private:
params.toneCurve.brightness = 0;
params.toneCurve.contrast = 0;
params.toneCurve.black = 0;
}
}
// at this stage, we can flush the raw data to free up quite an important amount of memory
// commented out because it makes the application crash when batch processing...
@@ -1151,10 +1151,10 @@ private:
if (params.colorappearance.enabled) {
double adap;
float fnum = imgsrc->getMetaData()->getFNumber (); // F number
float fiso = imgsrc->getMetaData()->getISOSpeed () ; // ISO
float fspeed = imgsrc->getMetaData()->getShutterSpeed () ; //speed
float fcomp = imgsrc->getMetaData()->getExpComp (); //compensation + -
const float fnum = imgsrc->getMetaData()->getFNumber(); // F number
const float fiso = imgsrc->getMetaData()->getISOSpeed() ; // ISO
const float fspeed = imgsrc->getMetaData()->getShutterSpeed() ; // Speed
const float fcomp = imgsrc->getMetaData()->getExpComp(); // Compensation + -
if (fnum < 0.3f || fiso < 5.f || fspeed < 0.00001f) {
adap = 2000.;
@@ -1295,12 +1295,12 @@ private:
// Sending back the whole first root, which won't necessarily be the selected frame number
// and may contain subframe depending on initial raw's hierarchy
// readyImg->setMetadata (ii->getMetaData()->getRootExifData ());
readyImg->setMetadata(info);
readyImg->setMetadata(std::move(info));
break;
case MetaDataParams::EDIT:
info.setExif(params.exif);
info.setIptc(params.iptc);
readyImg->setMetadata(info);
readyImg->setMetadata(std::move(info));
// ask for the correct frame number, but may contain subframe depending on initial raw's hierarchy
// readyImg->setMetadata (ii->getMetaData()->getBestExifData(imgsrc, &params.raw), params.exif, params.iptc);
break;
@@ -1315,7 +1315,7 @@ private:
if (!useLCMS) {
// use corrected sRGB profile in order to apply a good TRC if present, otherwise use LCMS2 profile generated by lab2rgb16 w/ gamma
ProfileContent pc (jprof);
readyImg->setOutputProfile (pc.getData().c_str(), pc.getData().size());
readyImg->setOutputProfile (pc.getData());
}
} else {
// use the selected output profile if present, otherwise use LCMS2 profile generate by lab2rgb16 w/ gamma
@@ -1335,11 +1335,11 @@ private:
}
ProfileContent pc = ICCStore::getInstance()->getContent (params.icm.outputProfile);
readyImg->setOutputProfile (pc.getData().c_str(), pc.getData().size());
readyImg->setOutputProfile (pc.getData());
}
} else {
// No ICM
readyImg->setOutputProfile (nullptr, 0);
readyImg->setOutputProfile ({});
}
}