diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-05-10 20:20:11 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-05-10 20:20:11 +0000 |
| commit | 711043c7ca9bd675133e9bb1c1a3ec05c83cbeba (patch) | |
| tree | 9395fdf4cc57a8192fc0ebe506dd0f5b9db0d9d3 /src/2geom/bezier-utils.cpp | |
| parent | Do not show/edit image URL for data URIs. (diff) | |
| download | inkscape-711043c7ca9bd675133e9bb1c1a3ec05c83cbeba.tar.gz inkscape-711043c7ca9bd675133e9bb1c1a3ec05c83cbeba.zip | |
update to latest 2geom. this adds gsl dependency, doesn't seem to make inskape executable bigger
(bzr r5649)
Diffstat (limited to 'src/2geom/bezier-utils.cpp')
| -rw-r--r-- | src/2geom/bezier-utils.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/2geom/bezier-utils.cpp b/src/2geom/bezier-utils.cpp index 76c90a915..59aac8951 100644 --- a/src/2geom/bezier-utils.cpp +++ b/src/2geom/bezier-utils.cpp @@ -165,8 +165,8 @@ copy_without_nans_or_adjacent_duplicates(Point const src[], unsigned src_len, Po if ( si == src_len ) { return 0; } - if (!is_nan(src[si][X]) && - !is_nan(src[si][Y])) { + if (!IS_NAN(src[si][X]) && + !IS_NAN(src[si][Y])) { dest[0] = Point(src[si]); ++si; break; @@ -176,8 +176,8 @@ copy_without_nans_or_adjacent_duplicates(Point const src[], unsigned src_len, Po for (; si < src_len; ++si) { Point const src_pt = Point(src[si]); if ( src_pt != dest[di] - && !is_nan(src_pt[X]) - && !is_nan(src_pt[Y])) { + && !IS_NAN(src_pt[X]) + && !IS_NAN(src_pt[Y])) { dest[++di] = src_pt; } } @@ -216,7 +216,7 @@ bezier_fit_cubic_full(Point bezier[], int split_points[], bezier[0] = data[0]; bezier[3] = data[len - 1]; double const dist = distance(bezier[0], bezier[3]) / 3.0; - if (is_nan(dist)) { + if (IS_NAN(dist)) { /* Numerical problem, fall back to straight line segment. */ bezier[1] = bezier[0]; bezier[2] = bezier[3]; @@ -619,7 +619,7 @@ NewtonRaphsonRootFind(BezierCurve const Q, Point const &P, double const u) } } - if (!is_finite(improved_u)) { + if (!IS_FINITE(improved_u)) { improved_u = u; } else if ( improved_u < 0.0 ) { improved_u = 0.0; @@ -853,7 +853,7 @@ chord_length_parameterize(Point const d[], double u[], unsigned const len) double tot_len = u[len - 1]; if(!( tot_len != 0 )) return; - if (is_finite(tot_len)) { + if (IS_FINITE(tot_len)) { for (unsigned i = 1; i < len; ++i) { u[i] /= tot_len; } |
