diff options
| -rw-r--r-- | drape_frontend/drape_frontend.pro | 4 | ||||
| -rw-r--r-- | drape_frontend/path_text_shape.cpp | 6 | ||||
| -rw-r--r-- | drape_frontend/text_layout.cpp | 18 | ||||
| -rw-r--r-- | drape_frontend/text_layout.hpp | 3 | ||||
| -rw-r--r-- | geometry/spline.hpp | 2 |
5 files changed, 7 insertions, 26 deletions
diff --git a/drape_frontend/drape_frontend.pro b/drape_frontend/drape_frontend.pro index 2d0b842ef8..5c6c392fb6 100644 --- a/drape_frontend/drape_frontend.pro +++ b/drape_frontend/drape_frontend.pro @@ -38,7 +38,7 @@ SOURCES += \ path_text_shape.cpp \ path_symbol_shape.cpp \ common_structures.cpp \ - text_layout.cpp + text_layout.cpp \ HEADERS += \ engine_context.hpp \ @@ -74,4 +74,4 @@ HEADERS += \ common_structures.hpp \ fribidi.hpp \ text_layout.hpp \ - intrusive_vector.hpp + intrusive_vector.hpp \ diff --git a/drape_frontend/path_text_shape.cpp b/drape_frontend/path_text_shape.cpp index a3101b2dda..4a529a6be9 100644 --- a/drape_frontend/path_text_shape.cpp +++ b/drape_frontend/path_text_shape.cpp @@ -108,11 +108,11 @@ namespace { beg = m_spline.CreateIterator(); end = m_spline.CreateIterator(); - float const textLangth = m_layout->GetPixelLength() * m_scalePtoG; - float const step = max(0.0f, m_splineOffset - textLangth / 2.0f); + float const textLength = m_layout->GetPixelLength() * m_scalePtoG; + float const step = max(0.0f, m_splineOffset - textLength / 2.0f); if (step > 0.0f) beg.Step(step); - end.Step(step + textLangth); + end.Step(step + textLength); } private: diff --git a/drape_frontend/text_layout.cpp b/drape_frontend/text_layout.cpp index 62d9f98287..bf3b3f9169 100644 --- a/drape_frontend/text_layout.cpp +++ b/drape_frontend/text_layout.cpp @@ -267,29 +267,11 @@ void TextLayout::GetMetrics(int32_t const index, float & xOffset, float & yOffse } /////////////////////////////////////////////////////////////// - -SharedTextLayout::SharedTextLayout() -{ -} - SharedTextLayout::SharedTextLayout(TextLayout * layout) : m_layout(layout) { } -SharedTextLayout::SharedTextLayout(SharedTextLayout const & other) -{ - m_layout = other.m_layout; -} - -SharedTextLayout const & SharedTextLayout::operator=(SharedTextLayout const & other) -{ - if (&other != this) - m_layout = other.m_layout; - - return *this; -} - bool SharedTextLayout::IsNull() const { return m_layout == NULL; diff --git a/drape_frontend/text_layout.hpp b/drape_frontend/text_layout.hpp index 6cf6293904..f3f43b39c8 100644 --- a/drape_frontend/text_layout.hpp +++ b/drape_frontend/text_layout.hpp @@ -67,10 +67,7 @@ private: class SharedTextLayout { public: - SharedTextLayout(); SharedTextLayout(TextLayout * layout); - SharedTextLayout(SharedTextLayout const & other); - SharedTextLayout const & operator= (SharedTextLayout const & other); bool IsNull() const; void Reset(TextLayout * layout); diff --git a/geometry/spline.hpp b/geometry/spline.hpp index 98d5cce5a1..1848fe3408 100644 --- a/geometry/spline.hpp +++ b/geometry/spline.hpp @@ -22,6 +22,8 @@ public: void Step(float speed); bool BeginAgain() const; + private: + friend class Spline; float GetDistance() const; int GetIndex() const; |