diff options
| -rw-r--r-- | geometry/any_rect2d.hpp | 2 | ||||
| -rw-r--r-- | geometry/screenbase.cpp | 4 | ||||
| -rw-r--r-- | platform/settings.cpp | 2 | ||||
| -rw-r--r-- | yg/glyph_layout.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/geometry/any_rect2d.hpp b/geometry/any_rect2d.hpp index c81a34ac38..52db34833d 100644 --- a/geometry/any_rect2d.hpp +++ b/geometry/any_rect2d.hpp @@ -180,7 +180,7 @@ namespace m2 pts[i] = ConvertFrom(pts[i]); } - Rect<T> const GetLocalRect() const + Rect<T> const & GetLocalRect() const { return m_rect; } diff --git a/geometry/screenbase.cpp b/geometry/screenbase.cpp index 1c7772025c..de7f3aee72 100644 --- a/geometry/screenbase.cpp +++ b/geometry/screenbase.cpp @@ -233,8 +233,8 @@ void ScreenBase::PtoG(m2::RectD const & pxRect, m2::RectD & glbRect) const bool IsPanningAndRotate(ScreenBase const & s1, ScreenBase const & s2) { - m2::RectD r1 = s1.GlobalRect().GetLocalRect(); - m2::RectD r2 = s2.GlobalRect().GetLocalRect(); + m2::RectD const & r1 = s1.GlobalRect().GetLocalRect(); + m2::RectD const & r2 = s2.GlobalRect().GetLocalRect(); m2::PointD c1 = r1.Center(); m2::PointD c2 = r2.Center(); diff --git a/platform/settings.cpp b/platform/settings.cpp index d9baa3d88d..73f257d8fb 100644 --- a/platform/settings.cpp +++ b/platform/settings.cpp @@ -128,7 +128,7 @@ namespace Settings m2::PointD glbZero(rect.GlobalZero()); out << glbZero.x << " " << glbZero.y << " "; out << rect.Angle().val() << " "; - m2::RectD r = rect.GetLocalRect(); + m2::RectD const & r = rect.GetLocalRect(); out << r.minX() << " " << r.minY() << " " << r.maxX() << " " << r.maxY(); return out.str(); } diff --git a/yg/glyph_layout.cpp b/yg/glyph_layout.cpp index 731a7693bf..0ae89a4583 100644 --- a/yg/glyph_layout.cpp +++ b/yg/glyph_layout.cpp @@ -38,7 +38,7 @@ namespace yg if (prevElem.m_angle.val() == curElem.m_angle.val()) return res; - m2::RectD prevLocalRect = prevSymRectAA.GetLocalRect(); + //m2::RectD prevLocalRect = prevSymRectAA.GetLocalRect(); m2::PointD pts[4]; prevSymRectAA.GetGlobalPoints(pts); curSymRectAA.ConvertTo(pts, 4); @@ -48,7 +48,7 @@ namespace yg prevRectInCurSym.Add(pts[2]); prevRectInCurSym.Add(pts[3]); - m2::RectD curSymRect = curSymRectAA.GetLocalRect(); + m2::RectD const & curSymRect = curSymRectAA.GetLocalRect(); if (curSymRect.minX() < prevRectInCurSym.maxX()) res = prevRectInCurSym.maxX() - curSymRect.minX(); |