diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-04-03 19:20:55 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-04-03 19:20:55 +0000 |
| commit | 49ec02c315e6e5068b1ad395c01db2b536dd9b9e (patch) | |
| tree | 0b8993b8d6dcc8c2716a44b7d6f64208c85bcfd6 /src/live_effects | |
| parent | Update pathinfo class to allow piecewise and pathvector as input. (diff) | |
| download | inkscape-49ec02c315e6e5068b1ad395c01db2b536dd9b9e.tar.gz inkscape-49ec02c315e6e5068b1ad395c01db2b536dd9b9e.zip | |
Updated Pathinfo to discrimine degenerate curves optionaly.
Fixed redundant data in are_near from pointwise
Fixed Fillet-Chamfer lpe to allow duplicate nodes
(bzr r13645.1.73)
Diffstat (limited to 'src/live_effects')
| -rw-r--r-- | src/live_effects/lpe-fillet-chamfer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp index fdf2469e0..6cc9062d9 100644 --- a/src/live_effects/lpe-fillet-chamfer.cpp +++ b/src/live_effects/lpe-fillet-chamfer.cpp @@ -487,11 +487,11 @@ LPEFilletChamfer::doEffect_path(std::vector<Geom::Path> const &path_in) double time0 = 0; std::vector<Geom::Satellite> sats = pointwise->getSatellites(); while (curve_it1 != curve_endit) { - if ((*curve_it1).isDegenerate() || (curve_it2 != curve_endit && (*curve_it2).isDegenerate())) { + if (curve_it2 != curve_endit && (*curve_it2).isDegenerate()) { + ++curve_it2; + } + if ((*curve_it1).isDegenerate()) { ++curve_it1; - if (curve_it2 != curve_endit) { - ++curve_it2; - } counter++; counter_curves++; time0 = 0.0; |