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:
authorSergey Magidovich <mgsergio@mapswithme.com>2016-01-05 14:10:08 +0300
committerSergey Yershov <yershov@corp.mail.ru>2016-03-23 16:04:20 +0300
commitef1e40d052042e91f5d5ed836cb3f1d656caee5d (patch)
tree87f1f5b5095ca2bfd7d5929ad3c5fbd48432aa4b /indexer/feature_data.cpp
parentea27bce049e73817b70e6df8dc1e131a0350efe2 (diff)
Implement serialsization for features with type other than GEOM_POINT.
Diffstat (limited to 'indexer/feature_data.cpp')
-rw-r--r--indexer/feature_data.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp
index bf9b144978..fe4b8a9679 100644
--- a/indexer/feature_data.cpp
+++ b/indexer/feature_data.cpp
@@ -102,7 +102,7 @@ public:
namespace feature
{
-uint8_t CalculateHeader(uint32_t const typesCount, uint8_t const geomType,
+uint8_t CalculateHeader(uint32_t const typesCount, uint8_t const headerGeomType,
FeatureParamsBase const & params)
{
ASSERT(typesCount != 0, ("Feature should have at least one type."));
@@ -114,10 +114,10 @@ uint8_t CalculateHeader(uint32_t const typesCount, uint8_t const geomType,
if (params.layer != 0)
header |= HEADER_HAS_LAYER;
- header |= geomType;
+ header |= headerGeomType;
// Geometry type for additional info is only one.
- switch (geomType)
+ switch (headerGeomType)
{
case HEADER_GEOM_POINT:
if (params.rank != 0)