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

Merge from default. Hope I did it right...

Browse Source
This commit is contained in:
Emil Martinec
2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/curveeditorgroup.cc
View File

@@ -66,14 +66,14 @@ CurveEditor* CurveEditorGroup::addCurve(CurveType cType, Glib::ustring curveLabe
if (!diagonalSubGroup) {
diagonalSubGroup = new DiagonalCurveEditorSubGroup(this);
}
return (CurveEditor*)diagonalSubGroup->addCurve(curveLabel);
return (static_cast<CurveEditor*>(diagonalSubGroup->addCurve(curveLabel)));
case (CT_Flat):
if (!flatSubGroup) {
flatSubGroup = new FlatCurveEditorSubGroup(this);
}
return (CurveEditor*)flatSubGroup->addCurve(curveLabel, periodic);
return (static_cast<CurveEditor*>(flatSubGroup->addCurve(curveLabel, periodic)));
default:
return (CurveEditor*)NULL;
return (static_cast<CurveEditor*>(NULL));
break;
}
}
@@ -234,11 +234,11 @@ void CurveEditorGroup::updateGUI (CurveEditor* ce) {
* Called from the outside to set the curve type & values
*/
void CurveEditorGroup::setCurveExternal (CurveEditor* ce, const std::vector<double>& c) {
if (c.size()) {
if (!c.empty()) {
ce->subGroup->storeCurveValues(ce, c); // The new curve is saved in the CurveEditor
(ce)->selected = c[0]; // We set the selected curve type in the CurveEditor to the one of the specified curve
}
updateGUI((CurveEditor*)ce); // And we update the GUI if necessary
updateGUI(static_cast<CurveEditor*>(ce)); // And we update the GUI if necessary
}
/*