diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-10-29 01:39:57 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-10-29 01:39:57 +0000 |
| commit | dc2bb9cef19401592553dd8166b13fa6c4c0c3af (patch) | |
| tree | 2823464a9e928f4aae2e189fa47fb1997d727270 /src/live_effects | |
| parent | Removed recursion from code because no speed improvements (diff) | |
| parent | Dutch translation update (diff) | |
| download | inkscape-dc2bb9cef19401592553dd8166b13fa6c4c0c3af.tar.gz inkscape-dc2bb9cef19401592553dd8166b13fa6c4c0c3af.zip | |
update to trunk
(bzr r14422.1.26)
Diffstat (limited to 'src/live_effects')
| -rw-r--r-- | src/live_effects/lpe-simplify.cpp | 2 | ||||
| -rw-r--r-- | src/live_effects/lpe-taperstroke.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/live_effects/lpe-simplify.cpp b/src/live_effects/lpe-simplify.cpp index f6842a030..2d79d5b34 100644 --- a/src/live_effects/lpe-simplify.cpp +++ b/src/live_effects/lpe-simplify.cpp @@ -29,7 +29,7 @@ LPESimplify::LPESimplify(LivePathEffectObject *lpeobject) : Effect(lpeobject), steps(_("Steps:"),_("Change number of simplify steps "), "steps", &wr, this,1), threshold(_("Roughly threshold:"), _("Roughly threshold:"), "threshold", &wr, this, 0.003), - smooth_angles(_("Smooth angles:"), _("Max degree difference on handles to preform a smooth"), "smooth_angles", &wr, this, 20.), + smooth_angles(_("Smooth angles:"), _("Max degree difference on handles to perform a smooth"), "smooth_angles", &wr, this, 20.), helper_size(_("Helper size:"), _("Helper size"), "helper_size", &wr, this, 5), simplify_individual_paths(_("Paths separately"), _("Simplifying paths (separately)"), "simplify_individual_paths", &wr, this, false, "", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")), diff --git a/src/live_effects/lpe-taperstroke.cpp b/src/live_effects/lpe-taperstroke.cpp index ef616f802..f2ddd4929 100644 --- a/src/live_effects/lpe-taperstroke.cpp +++ b/src/live_effects/lpe-taperstroke.cpp @@ -408,9 +408,8 @@ Piecewise<D2<SBasis> > stretch_along(Piecewise<D2<SBasis> > pwd2_in, Geom::Path n = force_continuity(remove_short_cuts(n,.1)); int nbCopies = 0; - double scaling = 1; + double scaling = (uskeleton.domain().extent() - toffset)/pattBndsX->extent(); nbCopies = 1; - scaling = (uskeleton.domain().extent() - toffset)/pattBndsX->extent(); double pattWidth = pattBndsX->extent() * scaling; |