diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2015-07-06 23:29:26 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2015-07-06 23:29:26 +0000 |
| commit | 02aedb930177c008f1074fa7b17dd6085825ee1b (patch) | |
| tree | e0ffd32ca363f863c7b4dd5c07f422100d0ad2c1 /src | |
| parent | Extensions. Fix for Bug #760429 (Scour extension files organization). (diff) | |
| download | inkscape-02aedb930177c008f1074fa7b17dd6085825ee1b.tar.gz inkscape-02aedb930177c008f1074fa7b17dd6085825ee1b.zip | |
Update 2Geom to r2417: make scan-build happy
(bzr r14235)
Diffstat (limited to 'src')
| -rw-r--r-- | src/2geom/ellipse.cpp | 4 | ||||
| -rw-r--r-- | src/2geom/nearest-time.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/2geom/ellipse.cpp b/src/2geom/ellipse.cpp index 0264ab4ae..fed3bf86f 100644 --- a/src/2geom/ellipse.cpp +++ b/src/2geom/ellipse.cpp @@ -499,7 +499,7 @@ std::vector<ShapeIntersection> Ellipse::intersect(Ellipse const &other) const Line lines[2]; if (aa != 0) { - bb /= aa; cc /= aa; dd /= aa; ee /= aa; ff /= aa; + bb /= aa; cc /= aa; dd /= aa; ee /= aa; /*ff /= aa;*/ Coord s = (ee + std::sqrt(ee*ee - 4*bb)) / 2; Coord q = ee - s; Coord alpha = (dd - cc*q) / (s - q); @@ -508,7 +508,7 @@ std::vector<ShapeIntersection> Ellipse::intersect(Ellipse const &other) const lines[0] = Line(1, q, alpha); lines[1] = Line(1, s, beta); } else if (bb != 0) { - cc /= bb; dd /= bb; ee /= bb; ff /= bb; + cc /= bb; /*dd /= bb;*/ ee /= bb; ff /= bb; Coord s = ee; Coord q = 0; Coord alpha = cc / ee; diff --git a/src/2geom/nearest-time.cpp b/src/2geom/nearest-time.cpp index 0b21e51a2..103921021 100644 --- a/src/2geom/nearest-time.cpp +++ b/src/2geom/nearest-time.cpp @@ -80,7 +80,7 @@ Coord nearest_time(Point const &p, D2<Bezier> const &input, Coord from, Coord to t = 0; } if (dfinal < mind) { - mind = dfinal; + //mind = dfinal; t = 1; } |