From ec2b5a4da1b2117e4c1e4f040d6c4673b21c8548 Mon Sep 17 00:00:00 2001 From: vng Date: Tue, 2 Sep 2014 13:38:21 +0300 Subject: =?UTF-8?q?[generator]=20Return=20feature=20offset=20in=20?= =?UTF-8?q?=E2=80=9Cdat=E2=80=9D=20file=20section=20as=20it=E2=80=99s=20ID?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- generator/feature_generator.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'generator/feature_generator.cpp') 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 const & bytes, FeatureBuilder1 const & fb) +uint32_t FeaturesCollector::WriteFeatureBase(vector 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); } /////////////////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3