diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-06-06 01:43:35 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-06-06 01:43:35 +0000 |
| commit | 8a38c52bce619b07117cdd87a183eb05fb51e28e (patch) | |
| tree | 39b9f2af1ce9df43884a3b33ca2445097fe8f5a5 /src/libcola | |
| parent | oops. sys/wait.h not on win32 (diff) | |
| download | inkscape-8a38c52bce619b07117cdd87a183eb05fb51e28e.tar.gz inkscape-8a38c52bce619b07117cdd87a183eb05fb51e28e.zip | |
merge gsoc2008_johan_path2geom into trunk
(bzr r5823)
Diffstat (limited to 'src/libcola')
| -rw-r--r-- | src/libcola/cola.cpp | 2 | ||||
| -rw-r--r-- | src/libcola/gradient_projection.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libcola/cola.cpp b/src/libcola/cola.cpp index afad49eb2..2119ea981 100644 --- a/src/libcola/cola.cpp +++ b/src/libcola/cola.cpp @@ -132,7 +132,7 @@ void ConstrainedMajorizationLayout::majlayout( } b[i] += degree * coords[i]; } - assert(!isNaN(b[i])); + assert(!IS_NAN(b[i])); } if(constrainedLayout) { setupDummyVars(); diff --git a/src/libcola/gradient_projection.cpp b/src/libcola/gradient_projection.cpp index 94844ca88..237cb94af 100644 --- a/src/libcola/gradient_projection.cpp +++ b/src/libcola/gradient_projection.cpp @@ -50,7 +50,7 @@ unsigned GradientProjection::solve(double * b) { solver = setupVPSC(); //cerr << "in gradient projection: n=" << n << endl; for (i=0;i<n;i++) { - assert(!isNaN(place[i])); + assert(!IS_NAN(place[i])); assert(!isinf(place[i])); vars[i]->desiredPosition=place[i]; } @@ -98,7 +98,7 @@ unsigned GradientProjection::solve(double * b) { // move to new unconstrained position for (i=0; i<n; i++) { place[i]-=alpha*g[i]; - assert(!isNaN(place[i])); + assert(!IS_NAN(place[i])); assert(!isinf(place[i])); vars[i]->desiredPosition=place[i]; } |