diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-09 02:24:41 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-09 02:24:41 +0400 |
| commit | 3c4987f98378d44eda133311c65aa19412e4cd38 (patch) | |
| tree | 4371b4117d3290e60a58190481e926ebb17fcf28 /source/blender/freestyle/intern/stroke/Operators.cpp | |
| parent | ec33687d6cf74775e37fdc1a14e22dea08289cb1 (diff) | |
Fix for a number of compiler warnings as well as a bug hidden by the warnings.
Patch contribution by Bastien Montagne, thanks!
Diffstat (limited to 'source/blender/freestyle/intern/stroke/Operators.cpp')
| -rwxr-xr-x | source/blender/freestyle/intern/stroke/Operators.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp index 09833bf4b4a..80562e104d2 100755 --- a/source/blender/freestyle/intern/stroke/Operators.cpp +++ b/source/blender/freestyle/intern/stroke/Operators.cpp @@ -643,8 +643,8 @@ error: #include "CurveIterators.h" // Internal function -int __recursiveSplit(Chain *_curve, UnaryFunction0D<double>& func, UnaryPredicate1D& pred, float sampling, - Operators::I1DContainer& newChains, Operators::I1DContainer& splitted_chains) +static int __recursiveSplit(Chain *_curve, UnaryFunction0D<double>& func, UnaryPredicate1D& pred, float sampling, + Operators::I1DContainer& newChains, Operators::I1DContainer& splitted_chains) { if(((_curve->nSegments() == 1) && (sampling == 0)) || (_curve->getLength2D() <= sampling)){ newChains.push_back(_curve); @@ -796,8 +796,8 @@ int Operators::recursiveSplit(UnaryFunction0D<double>& func, UnaryPredicate1D& p // recursive split with pred 0D -int __recursiveSplit(Chain *_curve, UnaryFunction0D<double>& func, UnaryPredicate0D& pred0d, UnaryPredicate1D& pred, float sampling, - Operators::I1DContainer& newChains, Operators::I1DContainer& splitted_chains) +static int __recursiveSplit(Chain *_curve, UnaryFunction0D<double>& func, UnaryPredicate0D& pred0d, UnaryPredicate1D& pred, float sampling, + Operators::I1DContainer& newChains, Operators::I1DContainer& splitted_chains) { if(((_curve->nSegments() == 1) && (sampling == 0)) || (_curve->getLength2D() <= sampling)){ newChains.push_back(_curve); @@ -992,7 +992,7 @@ int Operators::sort(BinaryPredicate1D& pred) { return 0; } -Stroke* createStroke(Interface1D& inter) { +static Stroke* createStroke(Interface1D& inter) { Stroke* stroke = new Stroke; stroke->setId(inter.getId()); |