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

Add some omitted std:: prefixes in dcp.cc

Browse Source 
Those could hinder Marcin's SUSE builds.
This commit is contained in:
Flössie
2016-06-10 16:19:55 +02:00
parent c541d6e182
commit 49a6af275e
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rtengine/dcp.cc
View File

@@ -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]; 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 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); multiply3x3_v3(inv_m, neutral, next_xyz);
xyzToXy(next_xyz, next_xy); xyzToXy(next_xyz, next_xy);
if (fabs(next_xy[0] - last_xy[0]) + if (std::fabs(next_xy[0] - last_xy[0]) + std::fabs(next_xy[1] - last_xy[1]) < 0.0000001) {
fabs(next_xy[1] - last_xy[1]) < 0.0000001) {
xy[0] = next_xy[0]; xy[0] = next_xy[0];
xy[1] = next_xy[1]; xy[1] = next_xy[1];
return; return;
@@ -1677,7 +1676,7 @@ void DCPProfile::hsdApply(const HsdTableInfo& table_info, const std::vector<HsbM
const float h_scaled = h * table_info.pc.h_scale; const float h_scaled = h * table_info.pc.h_scale;
const float s_scaled = s * table_info.pc.s_scale; const float s_scaled = s * table_info.pc.s_scale;
int h_index0 = max<int>(h_scaled, 0); int h_index0 = std::max<int>(h_scaled, 0);
const int s_index0 = std::max(std::min<int>(s_scaled, table_info.pc.max_sat_index0), 0); const int s_index0 = std::max(std::min<int>(s_scaled, table_info.pc.max_sat_index0), 0);
int h_index1 = h_index0 + 1; int h_index1 = h_index0 + 1;
@@ -1720,7 +1719,7 @@ void DCPProfile::hsdApply(const HsdTableInfo& table_info, const std::vector<HsbM
const float v_scaled = v_encoded * table_info.pc.v_scale; const float v_scaled = v_encoded * table_info.pc.v_scale;
int h_index0 = (int) h_scaled; int h_index0 = static_cast<int>(h_scaled);
const int s_index0 = std::max(std::min<int>(s_scaled, table_info.pc.max_sat_index0), 0); const int s_index0 = std::max(std::min<int>(s_scaled, table_info.pc.max_sat_index0), 0);
const int v_index0 = std::max(std::min<int>(v_scaled, table_info.pc.max_val_index0), 0); const int v_index0 = std::max(std::min<int>(v_scaled, table_info.pc.max_val_index0), 0);