diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2011-02-02 21:24:36 +0000 |
|---|---|---|
| committer | Johan Engelen <goejendaagh@zonnet.nl> | 2011-02-02 21:24:36 +0000 |
| commit | 53933f5fea9d07d1ba6304b88439fba257ee8c34 (patch) | |
| tree | 21f94cd05346fc1236751bb1db3e0850e5aece54 /src/2geom/recursive-bezier-intersection.cpp | |
| parent | Translations. French translation minor update. (diff) | |
| download | inkscape-53933f5fea9d07d1ba6304b88439fba257ee8c34.tar.gz inkscape-53933f5fea9d07d1ba6304b88439fba257ee8c34.zip | |
update to latest 2geom !
(bzr r10025)
Diffstat (limited to 'src/2geom/recursive-bezier-intersection.cpp')
| -rw-r--r-- | src/2geom/recursive-bezier-intersection.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/2geom/recursive-bezier-intersection.cpp b/src/2geom/recursive-bezier-intersection.cpp index 421f61308..b4c81e08e 100644 --- a/src/2geom/recursive-bezier-intersection.cpp +++ b/src/2geom/recursive-bezier-intersection.cpp @@ -63,7 +63,7 @@ void find_intersections_bezier_recursive( std::vector<std::pair<double, double> > &xs, vector<Geom::Point> const & A, vector<Geom::Point> const & B, - double precision) { + double /*precision*/) { OldBezier a, b; a.p = A; b.p = B; @@ -317,9 +317,9 @@ double Lmax(Point p) { return std::max(fabs(p[X]), fabs(p[Y])); } -unsigned wangs_theorem(OldBezier a) { +unsigned wangs_theorem(OldBezier /*a*/) { return 6; // seems a good approximation! - double la1 = Lmax( ( a.p[2] - a.p[1] ) - (a.p[1] - a.p[0]) ); + /*double la1 = Lmax( ( a.p[2] - a.p[1] ) - (a.p[1] - a.p[0]) ); double la2 = Lmax( ( a.p[3] - a.p[2] ) - (a.p[2] - a.p[1]) ); double l0 = std::max(la1, la2); unsigned ra; @@ -328,7 +328,7 @@ unsigned wangs_theorem(OldBezier a) { else ra = (unsigned)ceil( log4( M_SQRT2 * 6.0 / 8.0 * INV_EPS * l0 ) ); //std::cout << ra << std::endl; - return ra; + return ra;*/ } struct rparams @@ -337,7 +337,7 @@ struct rparams OldBezier &B; }; -static int +/*static int intersect_polish_f (const gsl_vector * x, void *params, gsl_vector * f) { @@ -351,22 +351,22 @@ intersect_polish_f (const gsl_vector * x, void *params, gsl_vector_set (f, 1, dx[1]); return GSL_SUCCESS; -} +}*/ -union dbl_64{ +/*union dbl_64{ long long i64; double d64; -}; +};*/ -static double EpsilonBy(double value, int eps) +/*static double EpsilonBy(double value, int eps) { dbl_64 s; s.d64 = value; s.i64 += eps; return s.d64; -} - +}*/ +/* static void intersect_polish_root (OldBezier &A, double &s, OldBezier &B, double &t) { const gsl_multiroot_fsolver_type *T; @@ -394,7 +394,7 @@ static void intersect_polish_root (OldBezier &A, double &s, iter++; status = gsl_multiroot_fsolver_iterate (sol); - if (status) /* check if solver is stuck */ + if (status) // check if solver is stuck break; status = @@ -439,7 +439,7 @@ static void intersect_polish_root (OldBezier &A, double &s, best_v = trial_v; } } -} +}*/ void find_intersections_bezier_recursive( std::vector<std::pair<double, double> > &xs, |