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

Merge branch 'master' into gtk3

Browse Source
This commit is contained in:
Morgan Hardwood
2016-06-11 16:55:53 +02:00
parent ca71a0b7d2 49a6af275e
commit 038f53aded
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rawtherapee.astylerc
View File

@@ -1,5 +1,6 @@
style=1tbs style=1tbs
indent=spaces=4 indent=spaces=4
indent-switches
break-blocks break-blocks
pad-oper pad-oper
convert-tabs convert-tabs

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);

2
rtengine/iccmatrices.h
View File

@@ -54,7 +54,7 @@ const double sRGB_xyz[3][3] = {{3.13593293538656, -1.61878246026431,
// Color space conversion to/from XYZ; color spaces adapted to D50 using Bradford transform // Color space conversion to/from XYZ; color spaces adapted to D50 using Bradford transform
const double xyz_sRGB[3][3] = {{0.4360747, 0.3850649, 0.1430804}, constexpr double xyz_sRGB[3][3] = {{0.4360747, 0.3850649, 0.1430804},
{0.2225045, 0.7168786, 0.0606169}, {0.2225045, 0.7168786, 0.0606169},
{0.0139322, 0.0971045, 0.7141733} {0.0139322, 0.0971045, 0.7141733}
}; };