diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-10-18 16:44:48 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-10-18 16:44:48 +0000 |
| commit | c6f1fa0dfb5beaac7b0781213711028b511c5f6e (patch) | |
| tree | 3712e7c481f312bde6cb19d9b760ad0ba6f48f2a /src/livarot/PathOutline.cpp | |
| parent | Update to trunk (diff) | |
| parent | fix memory reallocation (diff) | |
| download | inkscape-c6f1fa0dfb5beaac7b0781213711028b511c5f6e.tar.gz inkscape-c6f1fa0dfb5beaac7b0781213711028b511c5f6e.zip | |
Update to trunk
(bzr r11950.1.185)
Diffstat (limited to 'src/livarot/PathOutline.cpp')
| -rw-r--r-- | src/livarot/PathOutline.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/livarot/PathOutline.cpp b/src/livarot/PathOutline.cpp index 3b5ce79f9..2cd359328 100644 --- a/src/livarot/PathOutline.cpp +++ b/src/livarot/PathOutline.cpp @@ -1047,7 +1047,7 @@ void Path::TangentOnArcAt(double at, const Geom::Point &iS, PathDescrArcTo const dtgt[0] = -ca * rx * cb + sa * ry * sb; dtgt[1] = -sa * rx * cb - ca * ry * sb; len = L2(tgt); - rad = len * dot(tgt, tgt) / (tgt[0] * dtgt[1] - tgt[1] * dtgt[0]); + rad = -len * dot(tgt, tgt) / (tgt[0] * dtgt[1] - tgt[1] * dtgt[0]); tgt /= len; } else @@ -1476,7 +1476,7 @@ Path::RecStdArcTo (outline_callback_data * data, double tol, double width, } const Geom::Point diff = req - chk; const double err = (dot(diff,diff)); - if (err <= tol * tol) + if (err <= tol) // tolerance is given as a quadratic value, no need to use tol*tol here { int n_d = data->dest->CubicTo (enPos + width*enNor, stGue*scal*stTgt, |