summaryrefslogtreecommitdiffstats
path: root/src/2geom/path-intersection.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2011-07-24 23:24:28 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2011-07-24 23:24:28 +0000
commit3e2e4bb6dc7b919c0fc2a56b3e9eed9e30cfabed (patch)
treed2ea0404211b3a89850bf4848ea758bc9385ef22 /src/2geom/path-intersection.cpp
parentfix page shadow rendering bug introduced in r10495 (diff)
downloadinkscape-3e2e4bb6dc7b919c0fc2a56b3e9eed9e30cfabed.tar.gz
inkscape-3e2e4bb6dc7b919c0fc2a56b3e9eed9e30cfabed.zip
Update 2Geom to fix serious IntRect bug I've found in my GSoC branch
(bzr r10502)
Diffstat (limited to 'src/2geom/path-intersection.cpp')
-rw-r--r--src/2geom/path-intersection.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/2geom/path-intersection.cpp b/src/2geom/path-intersection.cpp
index 7aa662abb..c38776304 100644
--- a/src/2geom/path-intersection.cpp
+++ b/src/2geom/path-intersection.cpp
@@ -226,8 +226,8 @@ intersect_polish_f (const gsl_vector * x, void *params,
#endif
static void
-intersect_polish_root (Curve const &A, double &s,
- Curve const &B, double &t) {
+intersect_polish_root (Curve const &A, double &s, Curve const &B, double &t)
+{
std::vector<Point> as, bs;
as = A.pointAndDerivatives(s, 2);
bs = B.pointAndDerivatives(t, 2);
@@ -271,6 +271,8 @@ intersect_polish_root (Curve const &A, double &s,
}
#ifdef HAVE_GSL
+ int status;
+ size_t iter = 0;
if(0) { // the GSL version is more accurate, but taints this with GPL
const size_t n = 2;
struct rparams p = {A, B};