From a824b718081eadb8cdc76c45a533109604c2f478 Mon Sep 17 00:00:00 2001 From: Beep6581 Date: Thu, 9 Jun 2016 23:17:34 +0200 Subject: [PATCH 1/4] Minor changes to docs, testing something. --- AUTHORS.txt | 2 +- RELEASE_NOTES.txt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index 37ac98993..6aebfcf6e 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -33,7 +33,7 @@ Developement contributors, in last name alphabetical order: Ingo Weyrich Makoto Yoshida -Other contributors (profiles, ideas, mockups, testing, forum activity, translations, etc.), in last name/nickname alphabetical order: +Other contributors (profiles, ideas, mockups, testing, forum activity, translations, etc.), in last name alphabetical order: Marcin Bajor Thorsten Bartolomäus diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index c057d41a7..1c78bcd39 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -32,7 +32,8 @@ LIVE CHAT WITH USERS AND DEVELOPERS Network: freenode Server: chat.freenode.net Channel #rawtherapee -Or use freenode webchat to chat without installing anything: + +You can use freenode webchat to communicate without installing anything: http://webchat.freenode.net/?randomnick=1&channels=rawtherapee&prompt=1 More information here: http://rawpedia.rawtherapee.com/IRC @@ -44,5 +45,5 @@ http://plus.google.com/106783532637761598368 REVISION HISTORY ---------------- The complete changelog is available at: -https://github.com/Beep6581/RawTherapee/commits/master +https://github.com/Beep6581/RawTherapee/commits/ From a889396e44be0e8cfc5c41675ef40da59cb341d3 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Fri, 10 Jun 2016 01:38:24 +0200 Subject: [PATCH 2/4] Fix compile bug, fixes #3340 --- rtengine/iccmatrices.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtengine/iccmatrices.h b/rtengine/iccmatrices.h index 292f45612..1b17cbaf6 100644 --- a/rtengine/iccmatrices.h +++ b/rtengine/iccmatrices.h @@ -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 -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.0139322, 0.0971045, 0.7141733} }; From c541d6e182666b875fab3603782f8376dc99bcd6 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Fri, 10 Jun 2016 14:03:11 +0200 Subject: [PATCH 3/4] astyle - indent switch blocks. --- rawtherapee.astylerc | 1 + 1 file changed, 1 insertion(+) diff --git a/rawtherapee.astylerc b/rawtherapee.astylerc index 9c10d81cb..3a0b1ea2f 100644 --- a/rawtherapee.astylerc +++ b/rawtherapee.astylerc @@ -1,5 +1,6 @@ style=1tbs indent=spaces=4 +indent-switches break-blocks pad-oper convert-tabs 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 4/4] 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);