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

Merged master into gtk3, fixed three conflicts.

Browse Source
This commit is contained in:
Beep6581
2016-06-09 22:36:59 +02:00
parent 7040b6e5b1
commit c857bba95e
50 changed files with 6109 additions and 6009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
rtengine/flatcurves.cc
View File

@@ -16,21 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#include <glib.h>
#include <glib/gstdio.h>
#include "curves.h"
#include <cmath>
#include <vector>
#include "mytime.h"
#include <cstring>
#include <gtkmm.h>
#include <fstream>
namespace rtengine
{
FlatCurve::FlatCurve (const std::vector<double>& p, bool isPeriodic, int poly_pn) : kind(FCT_Empty), leftTangent(NULL), rightTangent(NULL), identityValue(0.5), periodic(isPeriodic)
FlatCurve::FlatCurve (const std::vector<double>& p, bool isPeriodic, int poly_pn) : kind(FCT_Empty), leftTangent(nullptr), rightTangent(nullptr), identityValue(0.5), periodic(isPeriodic)
{
ppn = poly_pn > 65500 ? 65500 : poly_pn;
@@ -341,17 +334,7 @@ void FlatCurve::CtrlPoints_set ()
poly_x.push_back(3.0); // 3.0 is a hack for optimization purpose of the getVal method (the last value has to be beyond the normal range)
poly_y.push_back(sc_y[j - 1]);
/*
// Checking the values
Glib::ustring fname = "Curve.xyz"; // TopSolid'Design "plot" file format
std::ofstream f (fname.c_str());
f << "$" << std::endl;;
for (unsigned int iter = 0; iter < poly_x.size(); iter++) {
f << poly_x[iter] << ", " << poly_y[iter] << ", 0." << std::endl;;
}
f << "$" << std::endl;;
f.close ();
*/
fillDyByDx();
}
double FlatCurve::getVal (double t) const
@@ -367,10 +350,10 @@ double FlatCurve::getVal (double t) const
}
// do a binary search for the right interval:
int k_lo = 0, k_hi = poly_x.size() - 1;
unsigned int k_lo = 0, k_hi = poly_x.size() - 1;
while (k_hi - k_lo > 1) {
int k = (k_hi + k_lo) / 2;
while (k_hi > 1 + k_lo) {
unsigned int k = (k_hi + k_lo) / 2;
if (poly_x[k] > t) {
k_hi = k;
@@ -379,9 +362,7 @@ double FlatCurve::getVal (double t) const
}
}
double dx = poly_x[k_hi] - poly_x[k_lo];
double dy = poly_y[k_hi] - poly_y[k_lo];
return poly_y[k_lo] + (t - poly_x[k_lo]) * dy / dx;
return poly_y[k_lo] + (t - poly_x[k_lo]) * dyByDx[k_lo];
break;
}