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-09-02 14:38:21 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:26:35 +0300
commitec2b5a4da1b2117e4c1e4f040d6c4673b21c8548 (patch)
treee1ec3cd92bb652e8002790c4e449b3de09f165b5 /generator/feature_generator.cpp
parent60414dc86254aed22ac9e66fed49eba554260a2c (diff)
[generator] Return feature offset in “dat” file section as it’s ID.
Diffstat (limited to 'generator/feature_generator.cpp')
-rw-r--r--generator/feature_generator.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/generator/feature_generator.cpp b/generator/feature_generator.cpp
index 5550812b3b..ac6fa2cea2 100644
--- a/generator/feature_generator.cpp
+++ b/generator/feature_generator.cpp
@@ -142,18 +142,18 @@ uint32_t FeaturesCollector::GetFileSize(FileWriter const & f)
return ret;
}
-void FeaturesCollector::WriteFeatureBase(vector<char> const & bytes, FeatureBuilder1 const & fb)
+uint32_t FeaturesCollector::WriteFeatureBase(vector<char> const & bytes, FeatureBuilder1 const & fb)
{
size_t const sz = bytes.size();
- CHECK ( sz != 0, ("Empty feature not allowed here!") );
+ CHECK(sz != 0, ("Empty feature not allowed here!"));
- if (sz > 0)
- {
- WriteVarUint(m_datFile, sz);
- m_datFile.Write(&bytes[0], sz);
+ uint32_t const offset = GetFileSize(m_datFile);
- m_bounds.Add(fb.GetLimitRect());
- }
+ WriteVarUint(m_datFile, sz);
+ m_datFile.Write(&bytes[0], sz);
+
+ m_bounds.Add(fb.GetLimitRect());
+ return offset;
}
void FeaturesCollector::operator() (FeatureBuilder1 const & fb)
@@ -163,7 +163,7 @@ void FeaturesCollector::operator() (FeatureBuilder1 const & fb)
FeatureBuilder1::buffer_t bytes;
fb.Serialize(bytes);
- WriteFeatureBase(bytes, fb);
+ (void)WriteFeatureBase(bytes, fb);
}
///////////////////////////////////////////////////////////////////////////////////////////////////