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/diagonalcurveeditorsubgroup.cc
View File

@@ -254,7 +254,7 @@ void DiagonalCurveEditorSubGroup::switchGUI() {
removeEditor();
DiagonalCurveEditor* dCurve = (DiagonalCurveEditor*)(parent->displayedCurve);
DiagonalCurveEditor* dCurve = static_cast<DiagonalCurveEditor*>(parent->displayedCurve);
if (dCurve) {
@@ -501,19 +501,19 @@ void DiagonalCurveEditorSubGroup::restoreDisplayedHistogram() {
}
void DiagonalCurveEditorSubGroup::storeCurveValues (CurveEditor* ce, const std::vector<double>& p) {
if (p.size()) {
if (!p.empty()) {
DiagonalCurveType t = (DiagonalCurveType)p[0];
for (int i=0; i<(int)p.size(); i++)
switch (t) {
case (DCT_Spline):
((DiagonalCurveEditor*)ce)->customCurveEd = p;
(static_cast<DiagonalCurveEditor*>(ce))->customCurveEd = p;
break;
case (DCT_Parametric):
((DiagonalCurveEditor*)ce)->paramCurveEd = p;
(static_cast<DiagonalCurveEditor*>(ce))->paramCurveEd = p;
break;
case (DCT_NURBS):
((DiagonalCurveEditor*)ce)->NURBSCurveEd = p;
(static_cast<DiagonalCurveEditor*>(ce))->NURBSCurveEd = p;
break;
default:
break;