Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvng <viktor.govako@gmail.com>2014-04-01 17:51:24 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:14:05 +0300
commit5f441c5e9270c95ff94b1364929cf779de7e4252 (patch)
treead89f6d631e7e98600716a20364aa39f0f41a176 /indexer/geometry_serialization.hpp
parentc61c5f7521345bac99b8117762ed5f47b7b72816 (diff)
[generator] Fixed dummy assertion.
Diffstat (limited to 'indexer/geometry_serialization.hpp')
-rw-r--r--indexer/geometry_serialization.hpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/indexer/geometry_serialization.hpp b/indexer/geometry_serialization.hpp
index 8a17f6eaa6..4f9a93d5c6 100644
--- a/indexer/geometry_serialization.hpp
+++ b/indexer/geometry_serialization.hpp
@@ -185,9 +185,10 @@ namespace serial
template <class TSink> void Save(TSink & sink)
{
- // assume that 2 byte is enough for triangles count
+ // Not necessary assumption that 3-bytes varuint
+ // is enough for triangle chains count.
size_t const count = m_buffers.size();
- CHECK_LESS_OR_EQUAL(count, 0x3FFF, ());
+ CHECK_LESS_OR_EQUAL(count, 0x1FFFFF, ());
WriteVarUint(sink, static_cast<uint32_t>(count));
@@ -203,9 +204,9 @@ namespace serial
template <class TSource>
void LoadOuterTriangles(TSource & src, CodingParams const & params, OutPointsT & triangles)
{
- int const count = ReadVarUint<uint32_t>(src);
+ uint32_t const count = ReadVarUint<uint32_t>(src);
- for (int i = 0; i < count; ++i)
+ for (uint32_t i = 0; i < count; ++i)
LoadOuter(&DecodeTriangles, src, params, triangles, 3);
}
//@}