diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-07-28 22:05:28 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-07-28 22:05:28 +0000 |
| commit | 3eb67b103fe69a3b42ec16d085a2cb3a58a596b7 (patch) | |
| tree | 986b33696b0a7f229589b85bd13e6fdb2cbd022a /src/libcola/cola.cpp | |
| parent | fix typo, update CI (diff) | |
| parent | Show a control point for the center of a spiral (diff) | |
| download | inkscape-3eb67b103fe69a3b42ec16d085a2cb3a58a596b7.tar.gz inkscape-3eb67b103fe69a3b42ec16d085a2cb3a58a596b7.zip | |
Merge gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/libcola/cola.cpp')
| -rw-r--r-- | src/libcola/cola.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcola/cola.cpp b/src/libcola/cola.cpp index d553110b9..0009ef894 100644 --- a/src/libcola/cola.cpp +++ b/src/libcola/cola.cpp @@ -126,7 +126,7 @@ ConstrainedMajorizationLayout Dij[i*n + j] = d; if(i==j) continue; double lij=0; - if(d!=0 && !isinf(d)) { + if(d!=0 && !std::isinf(d)) { lij=1./(d*d); } degree += lap2[i*n + j] = lij; @@ -284,7 +284,7 @@ inline double ConstrainedMajorizationLayout for (unsigned i = 1; i < n; i++) { for (unsigned j = 0; j < i; j++) { d = Dij[i*n+j]; - if(!isinf(d)&&d!=numeric_limits<double>::max()) { + if(!std::isinf(d)&&d!=numeric_limits<double>::max()) { diff = d - euclidean_distance(i,j); if(d>80&&diff<0) continue; sum += diff*diff / (d*d); |