Inkscape

Merge lp:~dasprid/inkscape/taperstroke-fix into lp:~inkscape.dev/inkscape/trunk

  1. taperstroke-fix
  2. Merge into trunk
Proposed by Ben Scholzen 'DASPRiD'
Status: Merged
Merged at revision: 14174
Proposed branch: lp:~dasprid/inkscape/taperstroke-fix
Merge into: lp:~inkscape.dev/inkscape/trunk
Diff against target: 21 lines (+2/-2)
1 file modified
src/live_effects/lpe-taperstroke.cpp (+2/-2)
To merge this branch: bzr merge lp:~dasprid/inkscape/taperstroke-fix
Reviewer Review Type Date Requested Status
Liam P. White (community) Approve
Review via email: mp+260053@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Liam P. White (liampwhite) wrote :

Looks fine

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/live_effects/lpe-taperstroke.cpp'
2--- src/live_effects/lpe-taperstroke.cpp 2015-05-08 13:46:25 +0000
3+++ src/live_effects/lpe-taperstroke.cpp 2015-05-25 14:53:01 +0000
4@@ -275,7 +275,7 @@
5 pat_str << "M 1,0 C " << 1 - (double)smoothing << ",0 0,0.5 0,0.5 0,0.5 " << 1 - (double)smoothing << ",1 1,1";
6
7 pat_vec = sp_svg_read_pathv(pat_str.str().c_str());
8- pwd2.concat(stretch_along(pathv_out[0].toPwSb(), pat_vec[0], -fabs(line_width)));
9+ pwd2.concat(stretch_along(pathv_out[0].toPwSb(), pat_vec[0], fabs(line_width)));
10 throwaway_path = Geom::path_from_piecewise(pwd2, LPE_CONVERSION_TOLERANCE)[0];
11
12 real_path.append(throwaway_path);
13@@ -304,7 +304,7 @@
14 pat_vec = sp_svg_read_pathv(pat_str_1.str().c_str());
15
16 pwd2 = Piecewise<D2<SBasis> >();
17- pwd2.concat(stretch_along(pathv_out[2].toPwSb(), pat_vec[0], -fabs(line_width)));
18+ pwd2.concat(stretch_along(pathv_out[2].toPwSb(), pat_vec[0], fabs(line_width)));
19
20 throwaway_path = Geom::path_from_piecewise(pwd2, LPE_CONVERSION_TOLERANCE)[0];
21 if (!Geom::are_near(real_path.finalPoint(), throwaway_path.initialPoint()) && real_path.size() >= 1) {