From 01ffd294b20413120d8e095b2a4d2b07806e1850 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Thu, 13 Jul 2017 13:30:29 +0200 Subject: [PATCH] =?UTF-8?q?Use=20rtengine::min/max=20instead=20of=20std::m?= =?UTF-8?q?in/max(std::min/max(,=20patch=20by=20Fl=C3=B6ssie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rtengine/imageio.cc | 4 ++-- rtengine/lcp.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rtengine/imageio.cc b/rtengine/imageio.cc index d252b501f..01bbddf13 100644 --- a/rtengine/imageio.cc +++ b/rtengine/imageio.cc @@ -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); } diff --git a/rtengine/lcp.cc b/rtengine/lcp.cc index 554634e5f..c09d2d9be 100644 --- a/rtengine/lcp.cc +++ b/rtengine/lcp.cc @@ -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++; } }