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

Use rtengine::min/max instead of std::min/max(std::min/max(, patch by Flössie

Browse Source
This commit is contained in:
heckflosse
2017-07-13 13:30:29 +02:00
parent 14f5d52304
commit 01ffd294b2
2 changed files with 3 additions and 3 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 #endif
float minVal = min( min( minValue[0], minValue[1] ), minValue[2] ); float minVal = rtengine::min(minValue[0], minValue[1], minValue[2]);
float maxVal = max( max( maxValue[0], maxValue[1] ), maxValue[2] ); float maxVal = rtengine::max(maxValue[0], maxValue[1], maxValue[2]);
normalizeFloat(minVal, maxVal); 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)) { 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++; chromCount++;
} }
} }