summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2014-03-14 13:31:37 +0000
committerJabiertxof <jtx@jtx.marker.es>2014-03-14 13:31:37 +0000
commitcf0c5225ad7d55c82a850970f9eea4e001f5928d (patch)
tree2ea82b23e6ea0809f93de68611e60f97d80d1b6d /src
parentupdate to trunk (diff)
parentAdding default argument to PathManipulator::isBSpline. (diff)
downloadinkscape-cf0c5225ad7d55c82a850970f9eea4e001f5928d.tar.gz
inkscape-cf0c5225ad7d55c82a850970f9eea4e001f5928d.zip
commit Vinícius code
(bzr r11950.1.294)
Diffstat (limited to 'src')
-rw-r--r--src/ui/tool/path-manipulator.cpp6
-rw-r--r--src/ui/tool/path-manipulator.h2
2 files changed, 2 insertions, 6 deletions
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index 1cc075603..f8cc58e3b 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -1206,11 +1206,7 @@ bool PathManipulator::isBSpline(bool recalculate){
if(recalculate){
BSplineSteps = this->BSplineGetSteps();
}
- bool isBSpline = false;
- if(BSplineSteps>0){
- isBSpline = true;
- }
- return isBSpline;
+ return BSplineSteps > 0;
}
// returns the corresponding strength to the position of a handler
diff --git a/src/ui/tool/path-manipulator.h b/src/ui/tool/path-manipulator.h
index 5186bfc95..594f56ff9 100644
--- a/src/ui/tool/path-manipulator.h
+++ b/src/ui/tool/path-manipulator.h
@@ -106,7 +106,7 @@ private:
typedef boost::shared_ptr<NodeList> SubpathPtr;
void _createControlPointsFromGeometry();
- bool isBSpline(bool recalculate);
+ bool isBSpline(bool recalculate = true);
double BSplineHandlePosition(Handle *h);
Geom::Point BSplineHandleReposition(Handle *h);
Geom::Point BSplineHandleReposition(Handle *h,double pos);