From d51d8cb08911f192062bf4ab2783044dc42dbc90 Mon Sep 17 00:00:00 2001 From: bulia byak Date: Tue, 18 Aug 2009 01:18:17 +0000 Subject: patch by Alvin Penner for bug 415079 (bzr r8503) --- src/live_effects/spiro.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/live_effects/spiro.cpp') diff --git a/src/live_effects/spiro.cpp b/src/live_effects/spiro.cpp index 612348ab8..c734f91ee 100644 --- a/src/live_effects/spiro.cpp +++ b/src/live_effects/spiro.cpp @@ -731,6 +731,8 @@ spiro_iter(spiro_seg *s, bandmat *m, int *perm, double *v, int n) add_mat_line(m, v, derivs[1][1], -ends[1][1], 1, j, jk0r, jinc, nmat); add_mat_line(m, v, derivs[2][1], -ends[1][2], 1, j, jk1r, jinc, nmat); add_mat_line(m, v, derivs[3][1], -ends[1][3], 1, j, jk2r, jinc, nmat); + v[jthl] = mod_2pi(v[jthl]); + v[jthr] = mod_2pi(v[jthr]); j += jinc; } if (cyclic) { -- cgit v1.2.3 From 9ffb0ad4544d606b7ff3a04fc8e0b5f11ef7befe Mon Sep 17 00:00:00 2001 From: bulia byak Date: Mon, 24 Aug 2009 19:56:23 +0000 Subject: patch from 417179 by Alvin (bzr r8530) --- src/live_effects/spiro.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/live_effects/spiro.cpp') diff --git a/src/live_effects/spiro.cpp b/src/live_effects/spiro.cpp index c734f91ee..4aad25f08 100644 --- a/src/live_effects/spiro.cpp +++ b/src/live_effects/spiro.cpp @@ -773,6 +773,7 @@ spiro_iter(spiro_seg *s, bandmat *m, int *perm, double *v, int n) s[i].ks[k] += dk; norm += dk * dk; } + s[i].ks[0] = 2.0*mod_2pi(s[i].ks[0]/2.0); } return norm; } -- cgit v1.2.3 From 1852e80a93d680cb4ae0d4fb9938d1a10132d243 Mon Sep 17 00:00:00 2001 From: bulia byak Date: Sat, 29 Aug 2009 03:00:10 +0000 Subject: patch by Alvin for 418798 (bzr r8545) --- src/live_effects/spiro.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/live_effects/spiro.cpp') diff --git a/src/live_effects/spiro.cpp b/src/live_effects/spiro.cpp index 4aad25f08..abc9c94ca 100644 --- a/src/live_effects/spiro.cpp +++ b/src/live_effects/spiro.cpp @@ -731,8 +731,10 @@ spiro_iter(spiro_seg *s, bandmat *m, int *perm, double *v, int n) add_mat_line(m, v, derivs[1][1], -ends[1][1], 1, j, jk0r, jinc, nmat); add_mat_line(m, v, derivs[2][1], -ends[1][2], 1, j, jk1r, jinc, nmat); add_mat_line(m, v, derivs[3][1], -ends[1][3], 1, j, jk2r, jinc, nmat); - v[jthl] = mod_2pi(v[jthl]); - v[jthr] = mod_2pi(v[jthr]); + if (jthl >= 0) + v[jthl] = mod_2pi(v[jthl]); + if (jthr >= 0) + v[jthr] = mod_2pi(v[jthr]); j += jinc; } if (cyclic) { -- cgit v1.2.3