diff options
| author | vng <viktor.govako@gmail.com> | 2011-10-15 21:21:08 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:26:03 +0300 |
| commit | da53c6195ba1d1f9000013ba501f0f428660967c (patch) | |
| tree | 3bec89c87f33165d03662c7979f2a2ca405d6e6c /indexer/feature_loader.cpp | |
| parent | 7213aade43df084f27a02180c66d29268530cb69 (diff) | |
Support dynamic scales in mwm header.
Diffstat (limited to 'indexer/feature_loader.cpp')
| -rw-r--r-- | indexer/feature_loader.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indexer/feature_loader.cpp b/indexer/feature_loader.cpp index 42d38b7308..320fbea692 100644 --- a/indexer/feature_loader.cpp +++ b/indexer/feature_loader.cpp @@ -266,18 +266,14 @@ namespace void LoaderCurrent::ReadOffsets(ArrayByteSource & src, uint8_t mask, offsets_t & offsets) const { + ASSERT ( offsets.empty(), () ); ASSERT_GREATER ( mask, 0, () ); - int index = 0; while (mask > 0) { - ASSERT_LESS ( index, m_Info.GetScalesCount(), () ); - offsets[index++] = (mask & 0x01) ? ReadVarUint<uint32_t>(src) : kInvalidOffset; + offsets.push_back((mask & 0x01) ? ReadVarUint<uint32_t>(src) : kInvalidOffset); mask = mask >> 1; } - - while (index < offsets.size()) - offsets[index++] = kInvalidOffset; } int LoaderCurrent::GetScaleIndex(int scale) const @@ -340,7 +336,7 @@ int LoaderCurrent::GetScaleIndex(int scale, offsets_t const & offsets) const return ind; else { - CHECK ( false, ("Feature should have any geometry ...") ); + ASSERT ( false, ("Feature should have any geometry ...") ); return -1; } } |