diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-06-14 15:16:29 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-06-14 15:16:29 +0000 |
| commit | dae2699cb6569de8755f2376b2bfe166241ed9fb (patch) | |
| tree | 2ba8946b09cc6f87b7cc5c9abadd6bc23ee76fdd /src/2geom/pathvector.cpp | |
| parent | Win32 fix: set stdout to binary mode before writing a file to it (diff) | |
| download | inkscape-dae2699cb6569de8755f2376b2bfe166241ed9fb.tar.gz inkscape-dae2699cb6569de8755f2376b2bfe166241ed9fb.zip | |
update 2geom, fixes includes
(bzr r5934)
Diffstat (limited to 'src/2geom/pathvector.cpp')
| -rw-r--r-- | src/2geom/pathvector.cpp | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/src/2geom/pathvector.cpp b/src/2geom/pathvector.cpp index 9c8111767..fe2f1976c 100644 --- a/src/2geom/pathvector.cpp +++ b/src/2geom/pathvector.cpp @@ -73,22 +73,10 @@ Rect bounds_fast( PathVector const& pv ) if (pv.empty()) return bound; bound = (pv.begin())->boundsFast(); - double top = bound.top(); - double bottom = bound.bottom(); - double left = bound.left(); - double right = bound.right(); for (const_iterator it = ++(pv.begin()); it != pv.end(); ++it) { - bound = it->boundsFast(); - if ( top > bound.top() ) top = bound.top(); - if ( bottom < bound.bottom() ) bottom = bound.bottom(); - if ( left > bound.left() ) left = bound.left(); - if ( right < bound.right() ) right = bound.right(); + bound.unionWith(it->boundsFast()); } - bound[0][0] = left; - bound[0][1] = right; - bound[1][0] = top; - bound[1][1] = bottom; return bound; } @@ -100,22 +88,10 @@ Rect bounds_exact( PathVector const& pv ) if (pv.empty()) return bound; bound = (pv.begin())->boundsExact(); - double top = bound.top(); - double bottom = bound.bottom(); - double left = bound.left(); - double right = bound.right(); for (const_iterator it = ++(pv.begin()); it != pv.end(); ++it) { - bound = it->boundsExact(); - if ( top > bound.top() ) top = bound.top(); - if ( bottom < bound.bottom() ) bottom = bound.bottom(); - if ( left > bound.left() ) left = bound.left(); - if ( right < bound.right() ) right = bound.right(); + bound.unionWith(it->boundsExact()); } - bound[0][0] = left; - bound[0][1] = right; - bound[1][0] = top; - bound[1][1] = bottom; return bound; } |