diff options
| author | Michael Soegtrop <MSoegtrop@yahoo.de> | 2017-06-05 13:56:11 +0000 |
|---|---|---|
| committer | Michael Soegtrop <MSoegtrop@yahoo.de> | 2017-06-05 13:56:11 +0000 |
| commit | 132e83fd6f6124731dc773ae2978d115ca492ef2 (patch) | |
| tree | b561a4dbbacd7eecbdbae3fa220a353375ccecf8 /src/libcola | |
| parent | updated to trunk (diff) | |
| parent | [Bug #1695016] Xaml export misses some radialGradients. (diff) | |
| download | inkscape-132e83fd6f6124731dc773ae2978d115ca492ef2.tar.gz inkscape-132e83fd6f6124731dc773ae2978d115ca492ef2.zip | |
merged with latest version of lpe-bool and trunk
(bzr r14862.2.3)
Diffstat (limited to 'src/libcola')
| -rw-r--r-- | src/libcola/Makefile_insert | 18 | ||||
| -rw-r--r-- | src/libcola/gradient_projection.cpp | 5 |
2 files changed, 2 insertions, 21 deletions
diff --git a/src/libcola/Makefile_insert b/src/libcola/Makefile_insert deleted file mode 100644 index dc032a289..000000000 --- a/src/libcola/Makefile_insert +++ /dev/null @@ -1,18 +0,0 @@ -## Makefile.am fragment sourced by src/Makefile.am. - -libcola/all: libcola.a - -libcola/clean: - rm -f libcola/libcola.a $(libcola_libcola_a_OBJECTS) - -libcola_libcola_a_SOURCES = libcola/cola.h\ - libcola/cola.cpp\ - libcola/conjugate_gradient.cpp\ - libcola/conjugate_gradient.h\ - libcola/gradient_projection.cpp\ - libcola/gradient_projection.h\ - libcola/shortest_paths.cpp\ - libcola/shortest_paths.h\ - libcola/straightener.h\ - libcola/straightener.cpp\ - libcola/connected_components.cpp 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){ |