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/sbasis-to-bezier.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/sbasis-to-bezier.cpp')
| -rw-r--r-- | src/2geom/sbasis-to-bezier.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/2geom/sbasis-to-bezier.cpp b/src/2geom/sbasis-to-bezier.cpp index 497091d1c..9843b78d7 100644 --- a/src/2geom/sbasis-to-bezier.cpp +++ b/src/2geom/sbasis-to-bezier.cpp @@ -112,7 +112,7 @@ D2<Bezier<order> > sbasis_to_bezier(D2<SBasis> const &B) { // mutating void subpath_from_sbasis(Geom::OldPathSetBuilder &pb, D2<SBasis> const &B, double tol, bool initial) { - assert(B.is_finite()); + assert(B.IS_FINITE()); if(B.tail_error(2) < tol || B.size() == 2) { // nearly cubic enough if(B.size() == 1) { if (initial) { @@ -144,8 +144,8 @@ void subpath_from_sbasis_incremental(Geom::OldPathSetBuilder &pb, D2<SBasis> B, double tol, bool initial) { const unsigned k = 2; // cubic bezier double te = B.tail_error(k); - assert(B[0].is_finite()); - assert(B[1].is_finite()); + assert(B[0].IS_FINITE()); + assert(B[1].IS_FINITE()); //std::cout << "tol = " << tol << std::endl; while(1) { @@ -181,7 +181,7 @@ subpath_from_sbasis_incremental(Geom::OldPathSetBuilder &pb, D2<SBasis> B, doubl void build_from_sbasis(Geom::PathBuilder &pb, D2<SBasis> const &B, double tol) { if (!B.isFinite()) { - throwException("assertion failed: B.isFinite()"); + THROW_EXCEPTION("assertion failed: B.isFinite()"); } if(tail_error(B, 2) < tol || sbasis_size(B) == 2) { // nearly cubic enough if(sbasis_size(B) <= 1) { |