diff options
| author | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2017-08-09 18:32:18 +0300 |
|---|---|---|
| committer | Roman Kuznetsov <r.kuznetsow@gmail.com> | 2017-08-10 11:27:49 +0300 |
| commit | 3659b7d642f657e6ce054f36d05def98be36e980 (patch) | |
| tree | e91f046fc8687f3bb9034e723468652f3c9bc99d | |
| parent | 46530363dbf70c6460562cdf33168e15f2646341 (diff) | |
Minor warning fixes.
| -rw-r--r-- | drape/hw_texture_ios.mm | 4 | ||||
| -rw-r--r-- | drape_frontend/tile_info.cpp | 2 | ||||
| -rw-r--r-- | drape_frontend/user_mark_shapes.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drape/hw_texture_ios.mm b/drape/hw_texture_ios.mm index 87951b8a7a..f51430cf79 100644 --- a/drape/hw_texture_ios.mm +++ b/drape/hw_texture_ios.mm @@ -53,8 +53,8 @@ CVPixelBufferRef HWTextureAllocatorApple::CVCreatePixelBuffer(uint32_t width, ui CFDictionaryRef attrsRef = (__bridge CFDictionaryRef)attrs; - CVPixelBufferRef result; - CVReturn cvRetval; + CVPixelBufferRef result = nullptr; + CVReturn cvRetval = 0; switch (format) { case dp::RGBA8: diff --git a/drape_frontend/tile_info.cpp b/drape_frontend/tile_info.cpp index 4c3cfa91c1..4f8bc9abdc 100644 --- a/drape_frontend/tile_info.cpp +++ b/drape_frontend/tile_info.cpp @@ -45,7 +45,7 @@ void TileInfo::ReadFeatureIndex(MapDataProvider const & model) if (m_mwms.empty() || lastMwm != id.m_mwmId) { auto result = m_mwms.insert(id.m_mwmId); - ASSERT(result.second, ()); + VERIFY(result.second, ()); lastMwm = id.m_mwmId; } m_featureInfo.push_back(id); diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp index 1e9cecde13..b1199c818f 100644 --- a/drape_frontend/user_mark_shapes.cpp +++ b/drape_frontend/user_mark_shapes.cpp @@ -243,7 +243,7 @@ void CacheUserLines(TileKey const & tileKey, ref_ptr<dp::TextureManager> texture float const vs = static_cast<float>(df::VisualParams::Instance().GetVisualScale()); bool const simplify = tileKey.m_zoomLevel <= kLineSimplifyLevelEnd; - double sqrScale; + double sqrScale = 1.0; if (simplify) { double const currentScaleGtoP = 1.0 / GetScale(tileKey.m_zoomLevel); |