diff options
| author | vng <viktor.govako@gmail.com> | 2011-03-14 11:10:19 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:13:34 +0300 |
| commit | 221d3d99da351bddd4c82f9fc553737eb458025f (patch) | |
| tree | c45c9981941fec357f910fd7dae65d0ec484f1fd /indexer/features_vector.hpp | |
| parent | 25ea1267b48898b89681b93a5f371232fc79b711 (diff) | |
Refactoring of feature::DataHeader.
Added base point and scales array to header.
World and country generation now have different scale ranges.
Diffstat (limited to 'indexer/features_vector.hpp')
| -rw-r--r-- | indexer/features_vector.hpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indexer/features_vector.hpp b/indexer/features_vector.hpp index e84e8daea7..0f4b40592d 100644 --- a/indexer/features_vector.hpp +++ b/indexer/features_vector.hpp @@ -1,6 +1,5 @@ #pragma once #include "feature.hpp" -#include "data_header_reader.hpp" #include "../defines.hpp" @@ -17,8 +16,6 @@ struct FeatureReaders FeatureReaders(FilesContainerR const & cont) : m_cont(cont), m_datR(cont.GetReader(DATA_FILE_TAG)) { - uint64_t const offset = feature::GetSkipHeaderSize(m_datR); - m_datR = m_datR.SubReader(offset, m_datR.Size() - offset); } }; @@ -28,9 +25,7 @@ public: FeaturesVector(FeatureReaders const & dataR) : m_RecordReader(dataR.m_datR, 256), m_source(dataR.m_cont) { - FileReader r = dataR.m_cont.GetReader(HEADER_FILE_TAG); - m_source.m_base = ReadPrimitiveFromPos<int64_t>(r, 0); - // LOG(LINFO, ("OFFSET = ", m_source.m_base)); + m_source.m_header.Load(dataR.m_cont.GetReader(HEADER_FILE_TAG)); } void Get(uint64_t pos, FeatureType & feature) const |