diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/livarot/PathSimplify.cpp | 3 | ||||
| -rw-r--r-- | src/trace/quantize.cpp | 2 | ||||
| -rw-r--r-- | src/ui/control-manager.cpp | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/livarot/PathSimplify.cpp b/src/livarot/PathSimplify.cpp index d9f609e87..7d9f3f57d 100644 --- a/src/livarot/PathSimplify.cpp +++ b/src/livarot/PathSimplify.cpp @@ -67,6 +67,7 @@ void Path::Simplify(double treshhold) } +#if 0 // dichomtomic method to get distance to curve approximation // a real polynomial solver would get the minimum more efficiently, but since the polynom // would likely be of degree >= 5, that would imply using some generic solver, liek using the sturm metod @@ -114,7 +115,7 @@ static double RecDistanceToCubic(Geom::Point const &iS, Geom::Point const &isD, return current; } - +#endif static double DistanceToCubic(Geom::Point const &start, PathDescrCubicTo res, Geom::Point &pt) { diff --git a/src/trace/quantize.cpp b/src/trace/quantize.cpp index ba9306da8..c386c0ee9 100644 --- a/src/trace/quantize.cpp +++ b/src/trace/quantize.cpp @@ -192,6 +192,7 @@ static void octreeDelete(pool<Ocnode> *pool, Ocnode *node) /** * pretty-print an octree, debugging purposes */ +#if 0 static void ocnodePrint(Ocnode *node, int indent) { if (!node) return; @@ -213,7 +214,6 @@ static void ocnodePrint(Ocnode *node, int indent) } } -#if 0 void octreePrint(Ocnode *node) { printf("<<octree>>\n"); diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index 9357a17ff..62e6ce3a3 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -31,11 +31,12 @@ namespace { std::map<Inkscape::ControlType, std::vector<int> > sizeTable; // Note: The following operator overloads are local to this file at the moment to discourage flag manipulation elsewhere. - +/* ControlFlags operator |(ControlFlags lhs, ControlFlags rhs) { return static_cast<ControlFlags>(static_cast<int>(lhs) | static_cast<int>(rhs)); } +*/ ControlFlags operator &(ControlFlags lhs, ControlFlags rhs) { |
