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

Merge from default branch

Browse Source
This commit is contained in:
ffsup2
2010-09-24 22:49:15 +02:00
parent 18d6799cbe
commit dc2350cee8
145 changed files with 23287 additions and 17316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/curveeditor.cc
View File

@@ -24,7 +24,7 @@
extern Glib::ustring argv0;
CurveEditor::CurveEditor () : cl(NULL), activeParamControl(-1), realized(false), curveTypeIx(Linear) {
CurveEditor::CurveEditor () : cl(NULL), realized(false), curveTypeIx(Linear), activeParamControl(-1) {
Gtk::HBox* tsbox = Gtk::manage (new Gtk::HBox ());
Gtk::Label* tslab = Gtk::manage (new Gtk::Label (M("CURVEEDITOR_TYPE")));
@@ -247,7 +247,7 @@ void CurveEditor::savePressed () {
else if (p[ix]==(double)(NURBS))
f << "NURBS\n";
ix++;
for (int i=0; i<p.size()/2; i++, ix+=2)
for (unsigned int i=0; i<p.size()/2; i++, ix+=2)
f << p[ix] << ' ' << p[ix+1] << std::endl;
f.close ();
}
@@ -384,7 +384,7 @@ std::vector<double> CurveEditor::getCurve () {
else if (curveTypeIx==Spline)
return customCurve->getPoints ();
// NURBS (control cage)
else if (curveTypeIx==NURBS)
else // Default solution, we return the NURBS curve (curveTypeIx==NURBS)
return NURBSCurve->getPoints ();
}