diff options
| author | ExMix <rahuba.youri@mapswithme.com> | 2015-01-06 12:03:00 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:35:54 +0300 |
| commit | ac80186f7db8cee3dd7b1772f8eddfbd7f808258 (patch) | |
| tree | da3afd7261da0fd9d80975d1acf77ebd1751b528 /drape_frontend | |
| parent | 15fe59a27bc750d6bd5e668e6f6ce2cd02291f16 (diff) | |
review fixes
Diffstat (limited to 'drape_frontend')
| -rw-r--r-- | drape_frontend/line_shape.cpp | 2 | ||||
| -rw-r--r-- | drape_frontend/path_symbol_shape.cpp | 3 | ||||
| -rw-r--r-- | drape_frontend/poi_symbol_shape.cpp | 3 | ||||
| -rw-r--r-- | drape_frontend/text_layout.cpp | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/drape_frontend/line_shape.cpp b/drape_frontend/line_shape.cpp index 4d5c1b1ae6..048fe852f0 100644 --- a/drape_frontend/line_shape.cpp +++ b/drape_frontend/line_shape.cpp @@ -8,9 +8,7 @@ #include "../drape/batcher.hpp" #include "../drape/texture_manager.hpp" -//#include "../base/math.hpp" #include "../base/logging.hpp" -//#include "../base/stl_add.hpp" #include "../std/algorithm.hpp" diff --git a/drape_frontend/path_symbol_shape.cpp b/drape_frontend/path_symbol_shape.cpp index f4535c9936..d31946e364 100644 --- a/drape_frontend/path_symbol_shape.cpp +++ b/drape_frontend/path_symbol_shape.cpp @@ -27,8 +27,7 @@ void PathSymbolShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<d textures->GetSymbolRegion(m_params.m_symbolName, region); m2::RectF const & rect = region.GetTexRect(); - m2::PointU pixelSize; - region.GetPixelSize(pixelSize); + m2::PointU pixelSize = region.GetPixelSize(); float halfW = pixelSize.x / 2.0f; float halfH = pixelSize.y / 2.0f; diff --git a/drape_frontend/poi_symbol_shape.cpp b/drape_frontend/poi_symbol_shape.cpp index a8d7774ada..c8a1b2ad74 100644 --- a/drape_frontend/poi_symbol_shape.cpp +++ b/drape_frontend/poi_symbol_shape.cpp @@ -22,8 +22,7 @@ void PoiSymbolShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp dp::TextureManager::SymbolRegion region; textures->GetSymbolRegion(m_params.m_symbolName, region); - m2::PointU pixelSize; - region.GetPixelSize(pixelSize); + m2::PointU pixelSize = region.GetPixelSize(); m2::PointF const halfSize(pixelSize.x / 2.0, pixelSize.y / 2.0); m2::RectF const & texRect = region.GetTexRect(); diff --git a/drape_frontend/text_layout.cpp b/drape_frontend/text_layout.cpp index 1b177b6f68..00d3177414 100644 --- a/drape_frontend/text_layout.cpp +++ b/drape_frontend/text_layout.cpp @@ -308,7 +308,7 @@ void StraightTextLayout::Cache(glm::vec3 const & pivot, glm::vec2 const & pixelO gpu::TTextDynamicVertexBuffer & dynamicBuffer) const { size_t beginOffset = 0; - for (pair<size_t, glsl::vec2> node : m_offsets) + for (pair<size_t, glsl::vec2> const & node : m_offsets) { size_t endOffset = node.first; StraigthTextGeometryGenerator generator(pivot, pixelOffset + node.second, m_textSizeRatio, |