diff options
| author | ExMix <rahuba.youri@mapswithme.com> | 2013-09-23 20:19:24 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:02:27 +0300 |
| commit | fc2426d373999bea98adb524a5cf5162ead74e84 (patch) | |
| tree | 0a7a3b16b9ad5ca0711cb208ae19a858afeebfa9 | |
| parent | 0bd1cf2af993e86a5ee9024d6036ba3fc4fc5e71 (diff) | |
use only symbol bound rects for overlay merging. Circles can overlap
| -rw-r--r-- | graphics/circled_symbol.cpp | 12 | ||||
| -rw-r--r-- | graphics/circled_symbol.hpp | 1 |
2 files changed, 0 insertions, 13 deletions
diff --git a/graphics/circled_symbol.cpp b/graphics/circled_symbol.cpp index 1a6ad1c6f2..108ecc5c14 100644 --- a/graphics/circled_symbol.cpp +++ b/graphics/circled_symbol.cpp @@ -7,18 +7,6 @@ namespace graphics : SymbolElement(symbolElement) , m_circle(circleElement) {} - vector<m2::AnyRectD> const & CircledSymbol::boundRects() const - { - if (isDirtyRect()) - { - SymbolElement::boundRects(); - vector<m2::AnyRectD> circleBounds = m_circle.boundRects(); - m_boundRects.insert(m_boundRects.end(), circleBounds.begin(), circleBounds.end()); - } - - return SymbolElement::boundRects(); - } - void CircledSymbol::draw(OverlayRenderer * s, math::Matrix<double, 3, 3> const & m) const { m_circle.draw(s, m); diff --git a/graphics/circled_symbol.hpp b/graphics/circled_symbol.hpp index a4384abc09..cd573fdf54 100644 --- a/graphics/circled_symbol.hpp +++ b/graphics/circled_symbol.hpp @@ -11,7 +11,6 @@ namespace graphics CircledSymbol(SymbolElement::Params const & symbolElement, CircleElement::Params const & circleElement); - vector<m2::AnyRectD> const & boundRects() const; void draw(OverlayRenderer * s, math::Matrix<double, 3, 3> const & m) const; void setTransformation(const math::Matrix<double, 3, 3> & m); |