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-07-17 09:58:06 +02:00
parent 4ec4dfe1ca 9a13e4b360
commit 2f90675ba1
17 changed files with 256 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/imageio.cc
View File

@@ -867,8 +867,8 @@ int ImageIO::loadTIFF (Glib::ustring fname)
);
#endif
float minVal = min( min( minValue[0], minValue[1] ), minValue[2] );
float maxVal = max( max( maxValue[0], maxValue[1] ), maxValue[2] );
float minVal = rtengine::min(minValue[0], minValue[1], minValue[2]);
float maxVal = rtengine::max(maxValue[0], maxValue[1], maxValue[2]);
normalizeFloat(minVal, maxVal);
}

2
rtengine/lcp.cc
View File

@@ -447,7 +447,7 @@ int LCPProfile::filterBadFrames(double maxAvgDevFac, int minFramesLeft)
}
if (aPersModel[pm]->hasModeData(2)) {
errChrom += std::max(std::max(aPersModel[pm]->chromRG.mean_error, aPersModel[pm]->chromG.mean_error), aPersModel[pm]->chromBG.mean_error);
errChrom += rtengine::max(aPersModel[pm]->chromRG.mean_error, aPersModel[pm]->chromG.mean_error, aPersModel[pm]->chromBG.mean_error);
chromCount++;
}
}