From 49a6af275e7365e17b29112885010be883cf2e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=B6ssie?= Date: Fri, 10 Jun 2016 16:19:55 +0200 Subject: [PATCH] Add some omitted `std::` prefixes in `dcp.cc` Those could hinder Marcin's SUSE builds. --- rtengine/dcp.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/rtengine/dcp.cc b/rtengine/dcp.cc index 775428a4e..e483a5248 100644 --- a/rtengine/dcp.cc +++ b/rtengine/dcp.cc @@ -79,7 +79,7 @@ void invert3x3(const DCPProfile::Matrix& a, DCPProfile::Matrix& b) const double det = a00 * temp[0][0] + a01 * temp[1][0] + a02 * temp[2][0]; - if (fabs(det) < 1.0e-10) { + if (std::fabs(det) < 1.0e-10) { abort(); // Can't be inverted, we shouldn't be dealing with such matrices } @@ -1357,8 +1357,7 @@ void DCPProfile::neutralToXy(const Triple& neutral, int preferred_illuminant, do multiply3x3_v3(inv_m, neutral, next_xyz); xyzToXy(next_xyz, next_xy); - if (fabs(next_xy[0] - last_xy[0]) + - fabs(next_xy[1] - last_xy[1]) < 0.0000001) { + if (std::fabs(next_xy[0] - last_xy[0]) + std::fabs(next_xy[1] - last_xy[1]) < 0.0000001) { xy[0] = next_xy[0]; xy[1] = next_xy[1]; return; @@ -1677,7 +1676,7 @@ void DCPProfile::hsdApply(const HsdTableInfo& table_info, const std::vector(h_scaled, 0); + int h_index0 = std::max(h_scaled, 0); const int s_index0 = std::max(std::min(s_scaled, table_info.pc.max_sat_index0), 0); int h_index1 = h_index0 + 1; @@ -1720,7 +1719,7 @@ void DCPProfile::hsdApply(const HsdTableInfo& table_info, const std::vector(h_scaled); const int s_index0 = std::max(std::min(s_scaled, table_info.pc.max_sat_index0), 0); const int v_index0 = std::max(std::min(v_scaled, table_info.pc.max_val_index0), 0);