From 037153a2c667beb4619fae8f011e6933673f47d3 Mon Sep 17 00:00:00 2001
From: ExMix <rahuba.youri@mapswithme.com>
Date: Thu, 6 Nov 2014 21:44:57 +0300
Subject: [PATCH] review fixes

---
 drape/glsl_func.hpp            |  2 +-
 drape/glsl_types.hpp           |  2 +-
 drape/stipple_pen_resource.cpp |  3 +--
 drape/stipple_pen_resource.hpp |  2 +-
 drape_frontend/line_shape.cpp  | 44 +++++++++++++++++-----------------
 drape_frontend/text_layout.cpp |  2 +-
 drape_frontend/text_shape.cpp  |  6 ++---
 7 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/drape/glsl_func.hpp b/drape/glsl_func.hpp
index abd4248460..9e97fbb050 100644
--- a/drape/glsl_func.hpp
+++ b/drape/glsl_func.hpp
@@ -20,4 +20,4 @@ using glm::scale;
 
 using glm::value_ptr;
 
-}
+} // namespace glsl
diff --git a/drape/glsl_types.hpp b/drape/glsl_types.hpp
index 399e0a678d..bb92a48ba1 100644
--- a/drape/glsl_types.hpp
+++ b/drape/glsl_types.hpp
@@ -54,4 +54,4 @@ inline vec2 ToVec2(m2::PointD const & pt)
   return glsl::vec2(pt.x, pt.y);
 }
 
-}
+} // namespace glsl
diff --git a/drape/stipple_pen_resource.cpp b/drape/stipple_pen_resource.cpp
index 27a7b629f8..0bea74713c 100644
--- a/drape/stipple_pen_resource.cpp
+++ b/drape/stipple_pen_resource.cpp
@@ -83,8 +83,7 @@ void StipplePenHandle::Init(buffer_vector<uint8_t, 8> const & pattern)
   // 0 - 5 bits = reserved
 
   uint32_t patternSize = pattern.size();
-  ASSERT(patternSize >= 1, ());
-  ASSERT(patternSize < 9, ());
+  ASSERT(patternSize >= 1 && patternSize < 9, (patternSize));
 
   m_keyValue = patternSize - 1; // we code value 1 as 000 and value 8 as 111
   for (size_t i = 0; i < patternSize; ++i)
diff --git a/drape/stipple_pen_resource.hpp b/drape/stipple_pen_resource.hpp
index b01e163e54..bb585bbdf2 100644
--- a/drape/stipple_pen_resource.hpp
+++ b/drape/stipple_pen_resource.hpp
@@ -18,7 +18,7 @@ class StipplePenKey : public Texture::Key
 {
 public:
   StipplePenKey() = default;
-  StipplePenKey(buffer_vector<uint8_t, 8> const pattern) : m_pattern(pattern) {}
+  StipplePenKey(buffer_vector<uint8_t, 8> const & pattern) : m_pattern(pattern) {}
   virtual Texture::ResourceType GetType() const { return Texture::StipplePen; }
 
   static StipplePenKey const & Solid();
diff --git a/drape_frontend/line_shape.cpp b/drape_frontend/line_shape.cpp
index 4f19bb8638..387aced512 100644
--- a/drape_frontend/line_shape.cpp
+++ b/drape_frontend/line_shape.cpp
@@ -60,7 +60,7 @@ private:
     m_aspect = l1 / l2;
 
     /// normal1 is normal from segment v2 - v1
-    /// normal2 is normal from segmeny v3 - v2
+    /// normal2 is normal from segment v3 - v2
     glsl::vec2 const normal1(-dif21.y / l1, dif21.x / l1);
     glsl::vec2 const normal2(-dif32.y / l2, dif32.x / l2);
 
@@ -86,7 +86,7 @@ private:
 class LineEnumerator
 {
 public:
-  explicit LineEnumerator(vector<m2::PointD> const & points, float GtoPScale, bool generateEndpoints)
+  LineEnumerator(vector<m2::PointD> const & points, float GtoPScale, bool generateEndpoints)
     : m_points(points)
     , m_GtoPScale(GtoPScale)
     , m_generateEndpoints(generateEndpoints)
@@ -127,7 +127,7 @@ public:
     m_isSolid = isSolid;
   }
 
-  dp::TextureSetHolder::StippleRegion const & GetStippleMaskItem()
+  dp::TextureSetHolder::StippleRegion const & GetStippleMaskItem() const
   {
     ASSERT(!IsSolid(), ());
     ASSERT(m_stippleRegion.IsValid(), ());
@@ -204,7 +204,7 @@ private:
     if (partialSegment)
     {
       int const numParts = static_cast<int>(ceilf(pixelLength / maxLength));
-      m2::PointD const singlePart = segmentVector / (float)numParts;
+      m2::PointD const singlePart = segmentVector / (double)numParts;
 
       result = glsl::ToVec2(prevPt + singlePart * m_partGenerated);
 
@@ -229,7 +229,7 @@ private:
     if (m_iterIndex == -1)
     {
       ASSERT(m_generateEndpoints, ());
-      glsl::vec2 tmp = glsl::ToVec2(m_points[0]);
+      glsl::vec2 const tmp = glsl::ToVec2(m_points[0]);
       result = tmp + glsl::normalize(tmp - glsl::ToVec2(m_points[1]));
       m_iterIndex = 0;
       return true;
@@ -243,8 +243,8 @@ private:
     if (m_iterIndex == static_cast<int>(m_points.size()))
     {
       ASSERT(m_generateEndpoints, ());
-      size_t size = m_points.size();
-      glsl::vec2 tmp = glsl::ToVec2(m_points[size - 1]);
+      size_t const size = m_points.size();
+      glsl::vec2 const tmp = glsl::ToVec2(m_points[size - 1]);
       result = tmp + glsl::normalize(tmp - glsl::ToVec2(m_points[size - 2]));
       m_iterIndex++;
       return true;
@@ -256,14 +256,14 @@ private:
 private:
   vector<m2::PointD> const & m_points;
   int m_iterIndex = 0;
+  int m_partGenerated = 1;
 
   dp::TextureSetHolder::ColorRegion m_colorRegion;
   dp::TextureSetHolder::StippleRegion m_stippleRegion;
   bool m_isSolid = true;
 
-  float m_GtoPScale = 1.0f;
-  bool m_generateEndpoints = false;
-  int m_partGenerated = 1;
+  float m_GtoPScale;
+  bool m_generateEndpoints;
 };
 
 } // namespace
@@ -299,7 +299,7 @@ void LineShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::Tex
   float const halfWidth = m_params.m_width / 2.0f;
   float const insetHalfWidth= 1.0f * halfWidth;
 
-  int size = m_spline->GetPath().size();
+  size_t size = m_spline->GetPath().size();
   if (m_params.m_cap != dp::ButtCap)
     size += 2;
 
@@ -309,7 +309,7 @@ void LineShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::Tex
   // |       |   |      |
   // A2 --- AB2 BC2 --- C2
   // By this segment count == points.size() - 1
-  int vertexCount = (size - 1) * 4;
+  size_t const vertexCount = (size - 1) * 4;
   vector<glsl::vec4> vertexArray;
   vector<glsl::vec3> dxValsArray;
   vector<glsl::vec4> centersArray;
@@ -381,7 +381,7 @@ void LineShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::Tex
   v3 = 2.0f * v2 - v1;
   helper = GeomHelper(v1, v2, v3);
 
-  if (m_params.m_cap !=dp::ButtCap)
+  if (m_params.m_cap != dp::ButtCap)
   {
     vertexArray.push_back(glsl::vec4(helper.m_prevPt, helper.m_leftBisector));
     vertexArray.push_back(glsl::vec4(helper.m_prevPt, helper.m_rightBisector));
@@ -401,10 +401,10 @@ void LineShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::Tex
   centersArray.push_back(glsl::vec4(helper.m_prevPt, helper.m_currentPt));
   centersArray.push_back(glsl::vec4(helper.m_prevPt, helper.m_currentPt));
 
-  ASSERT(vertexArray.size() == dxValsArray.size(), ());
-  ASSERT(vertexArray.size() == centersArray.size(), ());
-  ASSERT(vertexArray.size() == widthTypeArray.size(), ());
-  ASSERT(vertexArray.size() % 4 == 0, ());
+  ASSERT_EQUAL(vertexArray.size(), dxValsArray.size(), ());
+  ASSERT_EQUAL(vertexArray.size(), centersArray.size(), ());
+  ASSERT_EQUAL(vertexArray.size(), widthTypeArray.size(), ());
+  ASSERT_EQUAL(vertexArray.size() % 4, 0, ());
 
   colorArray.resize(vertexArray.size(), enumerator.GetColorItem());
 
@@ -414,14 +414,14 @@ void LineShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::Tex
     float const stippleTexOffset = region.GetTextureNode().GetOffset();
     m2::RectF const & stippleRect = region.GetTexRect();
 
-    float maskTexLength = region.GetMaskPixelLength() / stippleRect.SizeX();
-    float patternTexLength = region.GetPatternPixelLength() / maskTexLength;
+    float const maskTexLength = region.GetMaskPixelLength() / stippleRect.SizeX();
+    float const patternTexLength = region.GetPatternPixelLength() / maskTexLength;
     float const dxFactor = halfWidth / (2.0f * m_params.m_baseGtoPScale);
     float patternStart = 0.0f;
-    int quadCount = vertexArray.size() / 4;
-    for(int i = 0; i < quadCount; ++i)
+    size_t const quadCount = vertexArray.size() / 4;
+    for(size_t i = 0; i < quadCount; ++i)
     {
-      int const baseIndex = i * 4;
+      size_t const baseIndex = i * 4;
       float dx1 = dxValsArray[baseIndex + 0].x * dxFactor;
       float dx2 = dxValsArray[baseIndex + 1].x * dxFactor;
       float dx3 = dxValsArray[baseIndex + 2].x * dxFactor;
diff --git a/drape_frontend/text_layout.cpp b/drape_frontend/text_layout.cpp
index c95a519043..25a03f465c 100644
--- a/drape_frontend/text_layout.cpp
+++ b/drape_frontend/text_layout.cpp
@@ -49,7 +49,7 @@ public:
   m2::RectD GetPixelRect(ScreenBase const & screen) const
   {
     m2::PointD const pivot = screen.GtoP(m2::PointD(m_pivot.x, m_pivot.y)) + m2::PointD(m_offset.x, m_offset.y);
-    return m2::RectD(pivot, pivot + m2::PointD(m_size.x, m_size.y));
+    return m2::RectD(pivot, pivot + glsl::ToPoint(m_size));
   }
 
   void GetPixelShape(ScreenBase const & screen, Rects & rects) const
diff --git a/drape_frontend/text_shape.cpp b/drape_frontend/text_shape.cpp
index d207b6b983..6d558fec0a 100644
--- a/drape_frontend/text_shape.cpp
+++ b/drape_frontend/text_shape.cpp
@@ -231,14 +231,14 @@ void TextShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::Tex
 void TextShape::DrawMultipleLines(dp::RefPointer<dp::Batcher> batcher, vector<TextLayout> & layouts,
                                   int delim, dp::RefPointer<dp::TextureSetHolder> textures) const
 {
-  uint32_t const count = layouts.size();
+  size_t const count = layouts.size();
   vector<float> lengths(count);
   float maxLength = 0.0f;
   float textHeight = 0.0f;
   uint32_t maxCount = 0;
   uint32_t symCount = 0;
   vector<uint32_t> heights(count);
-  for (int i = 0; i < count; ++i)
+  for (size_t i = 0; i < count; ++i)
   {
     lengths[i] = layouts[i].GetPixelLength();
     heights[i] = layouts[i].GetPixelHeight();
@@ -262,7 +262,7 @@ void TextShape::DrawMultipleLines(dp::RefPointer<dp::Batcher> batcher, vector<Te
   vector<TextLayout>::iterator it1;
   vector<glsl::vec2>::iterator it2;
   glsl::vec2 pivot(m_basePoint.x, m_basePoint.y);
-  for (int i = 0; i < count; ++i)
+  for (size_t i = 0; i < count; ++i)
   {
     float const dx = (maxLength - lengths[i]) / 2.0f;
     pixelOffset[i] = glsl::vec2(dx, dy) + anchorOffset + glsl::vec2(m_params.m_primaryOffset.x,