diff --git a/geometry/packer.cpp b/geometry/packer.cpp index bf90e3f6aa..b376f35083 100644 --- a/geometry/packer.cpp +++ b/geometry/packer.cpp @@ -109,6 +109,7 @@ namespace m2 yStep = 0; if (width <= m_width - currentX) + { if (height <= m_height - currentY) { yStep = max(height, yStep); @@ -116,6 +117,7 @@ namespace m2 } else return false; + } } } diff --git a/map/ruler.cpp b/map/ruler.cpp index cafd96553e..dac9160c34 100644 --- a/map/ruler.cpp +++ b/map/ruler.cpp @@ -157,7 +157,7 @@ void Ruler::CalcMetresDiff(double v) Ruler::Ruler(Params const & p) - : base_t(p), m_boundRects(1), m_isInitialized(false), m_hasPendingUpdate(false), m_currSystem(0) + : base_t(p), m_boundRects(1), m_currSystem(0), m_isInitialized(false), m_hasPendingUpdate(false) { } diff --git a/words/words_tests/sorted_index_test.cpp b/words/words_tests/sorted_index_test.cpp index e61bda6ed4..1069ac65d4 100644 --- a/words/words_tests/sorted_index_test.cpp +++ b/words/words_tests/sorted_index_test.cpp @@ -61,13 +61,13 @@ namespace return strFn; } - void PushBackArticleIntoVector(vector & v, - sl::Dictionary const * pDic, - sl::Dictionary::Id id) - { - v.push_back(""); - pDic->ArticleById(id, v.back()); - } +// void PushBackArticleIntoVector(vector & v, +// sl::Dictionary const * pDic, +// sl::Dictionary::Id id) +// { +// v.push_back(""); +// pDic->ArticleById(id, v.back()); +// } string KeyByIndexId(sl::SortedIndex const & idx, sl::SortedIndex::Pos id) { diff --git a/yg/info_layer.cpp b/yg/info_layer.cpp index 96176db213..aa775eedd5 100644 --- a/yg/info_layer.cpp +++ b/yg/info_layer.cpp @@ -186,10 +186,12 @@ namespace yg void InfoLayer::processOverlayElement(shared_ptr const & oe) { if (oe->isVisible()) + { if (m_couldOverlap) addOverlayElement(oe); else replaceOverlayElement(oe); + } } void InfoLayer::merge(InfoLayer const & layer, math::Matrix const & m)