diff options
| author | Sergey Yershov <yershov@corp.mail.ru> | 2015-03-17 16:04:42 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:39:56 +0300 |
| commit | 3848db2389318c41b7c29a74cf9e5f2ba7e331dc (patch) | |
| tree | d2716c5a3d833c768dd4f94b22944c1fee18f822 /indexer/old | |
| parent | a97b51a6aaa759dc584f6f133d7aeee739aad62c (diff) | |
fixed warning in [indexer]
Diffstat (limited to 'indexer/old')
| -rw-r--r-- | indexer/old/feature_loader_101.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indexer/old/feature_loader_101.cpp b/indexer/old/feature_loader_101.cpp index 4c42cf6ba0..2c365cd593 100644 --- a/indexer/old/feature_loader_101.cpp +++ b/indexer/old/feature_loader_101.cpp @@ -198,7 +198,7 @@ int LoaderImpl::GetScaleIndex(int scale, offsets_t const & offsets) const if (scale == -1) { // Choose the best geometry for the last visible scale. - int i = offsets.size()-1; + int i = static_cast<int>(offsets.size()-1); while (i >= 0 && offsets[i] == s_InvalidOffset) --i; if (i >= 0) return i; @@ -207,7 +207,7 @@ int LoaderImpl::GetScaleIndex(int scale, offsets_t const & offsets) const } else { - for (size_t i = 0; i < m_Info.GetScalesCount(); ++i) + for (int i = 0; i < m_Info.GetScalesCount(); ++i) if (scale <= m_Info.GetScale(i)) { if (offsets[i] != s_InvalidOffset) @@ -268,7 +268,7 @@ namespace void LoaderImpl::ParseHeader2() { - uint8_t ptsCount, ptsMask, trgCount, trgMask; + uint8_t ptsCount = 0, ptsMask = 0, trgCount = 0, trgMask = 0; uint8_t const commonH = Header(); BitSource bitSource(DataPtr() + m_Header2Offset); @@ -311,7 +311,7 @@ void LoaderImpl::ParseHeader2() src = ArrayByteSource(serial::LoadInnerPath( start, ptsCount, GetDefCodingParams(), m_pF->m_points)); - m_pF->m_innerStats.m_points = src.PtrC() - start; + m_pF->m_innerStats.m_points = static_cast<uint32_t>(src.PtrC() - start); } else ReadOffsets(src, ptsMask, m_ptsOffsets); @@ -329,7 +329,7 @@ void LoaderImpl::ParseHeader2() src = ArrayByteSource(serial::LoadInnerTriangles( start, trgCount, GetDefCodingParams(), points)); - m_pF->m_innerStats.m_strips = src.PtrC() - start; + m_pF->m_innerStats.m_strips = static_cast<uint32_t>(src.PtrC() - start); for (uint8_t i = 2; i < trgCount; ++i) { @@ -342,7 +342,7 @@ void LoaderImpl::ParseHeader2() ReadOffsets(src, trgMask, m_trgOffsets); } - m_pF->m_innerStats.m_size = src.PtrC() - DataPtr(); + m_pF->m_innerStats.m_size = static_cast<uint32_t>(src.PtrC() - DataPtr()); } uint32_t LoaderImpl::ParseGeometry(int scale) |