diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2012-01-04 18:17:44 +0000 |
|---|---|---|
| committer | Johan Engelen <goejendaagh@zonnet.nl> | 2012-01-04 18:17:44 +0000 |
| commit | 71fb33927ed70360073e7063c447b5ac46ee7c60 (patch) | |
| tree | 828bcdcddf9a1a3030fc758ef5d0a1193959ce3b /src/2geom/conic_section_clipper_impl.cpp | |
| parent | More GSEAL issues (diff) | |
| download | inkscape-71fb33927ed70360073e7063c447b5ac46ee7c60.tar.gz inkscape-71fb33927ed70360073e7063c447b5ac46ee7c60.zip | |
update 2geom to r2049. fixes bugs!
(bzr r10837)
Diffstat (limited to 'src/2geom/conic_section_clipper_impl.cpp')
| -rw-r--r-- | src/2geom/conic_section_clipper_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/2geom/conic_section_clipper_impl.cpp b/src/2geom/conic_section_clipper_impl.cpp index 33a218a8c..e091d1e05 100644 --- a/src/2geom/conic_section_clipper_impl.cpp +++ b/src/2geom/conic_section_clipper_impl.cpp @@ -438,7 +438,7 @@ bool CLIPPER_CLASS::clip (std::vector<RatQuad> & arcs) // if the conic does not cross any line passing through a rectangle edge or // it is tangent to only one edge then it is an ellipse if (no_crossing - || (crossing_points.size() == 1 && single_points.size() == 0)) + || (crossing_points.size() == 1 && single_points.empty())) { // if the ellipse centre is inside the rectangle // then so it is the ellipse @@ -477,7 +477,7 @@ bool CLIPPER_CLASS::clip (std::vector<RatQuad> & arcs) // in case the conic section intersects any of the four lines passing // through the rectangle edges but it does not cross any rectangle edge // then the conic is all outer of the rectangle - if (crossing_points.size() == 0) return false; + if (crossing_points.empty()) return false; // else we need to pair crossing points, and to find an arc inner point // in order to generate a RatQuad object pairing (paired_points, inner_points, crossing_points); |
