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

8
rtgui/flatcurveeditorsubgroup.cc
View File

@@ -90,7 +90,7 @@ void FlatCurveEditorSubGroup::switchGUI() {
removeEditor();
FlatCurveEditor* dCurve = (FlatCurveEditor*)(parent->displayedCurve);
FlatCurveEditor* dCurve = static_cast<FlatCurveEditor*>(parent->displayedCurve);
if (dCurve) {
@@ -201,13 +201,13 @@ void FlatCurveEditorSubGroup::restoreDisplayedHistogram() {
}
void FlatCurveEditorSubGroup::storeCurveValues (CurveEditor* ce, const std::vector<double>& p) {
if (p.size()) {
FlatCurveType t = (FlatCurveType)p[0];
if (!p.empty()) {
FlatCurveType t = static_cast<FlatCurveType>(p[0]);
for (int i=0; i<(int)p.size(); i++)
switch (t) {
case (FCT_MinMaxCPoints):
((FlatCurveEditor*)ce)->controlPointsCurveEd = p;
static_cast<FlatCurveEditor*>(ce)->controlPointsCurveEd = p;
break;
default:
break;