diff options
| author | Jabiertxof <jtx@jtx> | 2017-03-16 19:08:44 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx> | 2017-03-16 19:08:44 +0000 |
| commit | 8330d0ef2b97c73121ead78ea9fbcec6ee01f879 (patch) | |
| tree | 1b1717d1706ee6ebfecc800f2cc80430eb0450e0 /src/libcola/gradient_projection.cpp | |
| parent | update to trunk (diff) | |
| parent | Fix rendering when canvas rotated. General code clean-up and documentation. (diff) | |
| download | inkscape-8330d0ef2b97c73121ead78ea9fbcec6ee01f879.tar.gz inkscape-8330d0ef2b97c73121ead78ea9fbcec6ee01f879.zip | |
Update to trunk
(bzr r13645.1.170)
Diffstat (limited to 'src/libcola/gradient_projection.cpp')
| -rw-r--r-- | src/libcola/gradient_projection.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libcola/gradient_projection.cpp b/src/libcola/gradient_projection.cpp index 3e41aceac..c079c3149 100644 --- a/src/libcola/gradient_projection.cpp +++ b/src/libcola/gradient_projection.cpp @@ -18,7 +18,6 @@ #include "gradient_projection.h" #include <iostream> #include <2geom/math-utils.h> -#include "isinf.h" #include <math.h> using namespace std; @@ -51,7 +50,7 @@ unsigned GradientProjection::solve(double * b) { //cerr << "in gradient projection: n=" << n << endl; for (i=0;i<n;i++) { assert(!IS_NAN(place[i])); - assert(!isinf(place[i])); + assert(IS_FINITE(place[i])); vars[i]->desiredPosition=place[i]; } try { @@ -99,7 +98,7 @@ unsigned GradientProjection::solve(double * b) { for (i=0; i<n; i++) { place[i]-=alpha*g[i]; assert(!IS_NAN(place[i])); - assert(!isinf(place[i])); + assert(IS_FINITE(place[i])); vars[i]->desiredPosition=place[i]; } for (DummyVars::iterator it=dummy_vars.begin();it!=dummy_vars.end();++it){ |