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

merge with dev

Browse Source
This commit is contained in:
Desmis
2017-10-14 08:34:38 +02:00
parent b19e12732a dfe40677e2
commit 74cc88ff2f
109 changed files with 3299 additions and 1084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rtengine/simpleprocess.cc
View File

@@ -2072,10 +2072,16 @@ 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 + -
int imgNum = 0;
if (imgsrc->getSensorType() == ST_BAYER) {
imgNum = params.raw.bayersensor.imageNum;
} else if (imgsrc->getSensorType() == ST_FUJI_XTRANS) {
//imgNum = params.raw.xtranssensor.imageNum;
}
float fnum = imgsrc->getMetaData()->getFNumber (imgNum); // F number
float fiso = imgsrc->getMetaData()->getISOSpeed (imgNum) ; // ISO
float fspeed = imgsrc->getMetaData()->getShutterSpeed (imgNum) ; //speed
float fcomp = imgsrc->getMetaData()->getExpComp (imgNum); //compensation + -
if (fnum < 0.3f || fiso < 5.f || fspeed < 0.00001f) {
adap = 2000.;
@@ -2248,9 +2254,12 @@ private:
}
if (tunnelMetaData) {
readyImg->setMetadata (ii->getMetaData()->getExifData ());
// 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 ());
} else {
readyImg->setMetadata (ii->getMetaData()->getExifData (), params.exif, params.iptc);
// 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);
}