diff options
| author | ygorshenin <mipt.vi002@gmail.com> | 2016-08-30 15:47:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-30 15:47:27 +0300 |
| commit | 530f7c270356993c362e216ae177806fca4d8850 (patch) | |
| tree | 7ec3d37e02699e010f9e645fb6b9af02e691e9a7 /drape_frontend | |
| parent | 11a4e21c76fdeb7d738f4cf6aae5becca3b0d6a7 (diff) | |
| parent | f1d3a34101014fcf1f1294d588944cc3fe7ccb36 (diff) | |
Merge pull request #4143 from milchakov/names_optimization_and_fix
[drape][indexer] names optimization and fix
Diffstat (limited to 'drape_frontend')
| -rw-r--r-- | drape_frontend/stylist.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drape_frontend/stylist.cpp b/drape_frontend/stylist.cpp index 56e7edec63..54df0b0f8a 100644 --- a/drape_frontend/stylist.cpp +++ b/drape_frontend/stylist.cpp @@ -214,14 +214,14 @@ void CaptionDescription::FormatCaptions(FeatureType const & f, { if (!auxCaptionExists && !m_auxText.empty() && type != feature::GEOM_LINE) { - f.GetReadableName(m_mainText); - if (m_mainText == m_auxText) - m_auxText.clear(); + m_mainText.swap(m_auxText); + m_auxText.clear(); } if (mainTextType == drule::text_type_housenumber) { - m_mainText = move(m_houseNumber); + m_mainText.swap(m_houseNumber); + m_houseNumber.clear(); } else if (mainTextType == drule::text_type_name) { |