summaryrefslogtreecommitdiffstats
path: root/src/libcola/gradient_projection.cpp
diff options
context:
space:
mode:
authorMichael Soegtrop <MSoegtrop@yahoo.de>2017-06-05 13:01:17 +0000
committerMichael Soegtrop <MSoegtrop@yahoo.de>2017-06-05 13:01:17 +0000
commite7248b2fa042f42a5c4dd14cd86ab6a5b4524059 (patch)
tree9097520c54e355ded9bd0b4d6618af4e8dacdd91 /src/libcola/gradient_projection.cpp
parentupdated to latest trunk (diff)
parent[Bug #1695016] Xaml export misses some radialGradients. (diff)
downloadinkscape-e7248b2fa042f42a5c4dd14cd86ab6a5b4524059.tar.gz
inkscape-e7248b2fa042f42a5c4dd14cd86ab6a5b4524059.zip
updated to latest trunk
(bzr r14876.2.4)
Diffstat (limited to 'src/libcola/gradient_projection.cpp')
-rw-r--r--src/libcola/gradient_projection.cpp5
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){