diff options
| author | Sergey Magidovich <mgsergio@mapswithme.com> | 2016-02-28 22:33:38 +0300 |
|---|---|---|
| committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:49:24 +0300 |
| commit | 4a3989ff23d90c112b50f690e7a2c2329aa54389 (patch) | |
| tree | 6c4476e3d423686acbf55f180c39abb55561b929 /indexer/feature_loader.cpp | |
| parent | 78fb143a7901288395d5cc70b0aa4e0b9ff707fc (diff) | |
Platform::GetReader returns unique_ptr. Fix leaks.
Diffstat (limited to 'indexer/feature_loader.cpp')
| -rw-r--r-- | indexer/feature_loader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indexer/feature_loader.cpp b/indexer/feature_loader.cpp index bea87702df..37093182e8 100644 --- a/indexer/feature_loader.cpp +++ b/indexer/feature_loader.cpp @@ -195,7 +195,7 @@ uint32_t LoaderCurrent::ParseGeometry(int scale) int const ind = GetScaleIndex(scale, m_ptsOffsets); if (ind != -1) { - ReaderSource<FilesContainerR::ReaderT> src(m_Info.GetGeometryReader(ind)); + ReaderSource<FilesContainerR::TReader> src(m_Info.GetGeometryReader(ind)); src.Skip(m_ptsOffsets[ind]); serial::CodingParams cp = GetCodingParams(ind); @@ -243,7 +243,7 @@ uint32_t LoaderCurrent::ParseTriangles(int scale) uint32_t const ind = GetScaleIndex(scale, m_trgOffsets); if (ind != -1) { - ReaderSource<FilesContainerR::ReaderT> src(m_Info.GetTrianglesReader(ind)); + ReaderSource<FilesContainerR::TReader> src(m_Info.GetTrianglesReader(ind)); src.Skip(m_trgOffsets[ind]); serial::LoadOuterTriangles(src, GetCodingParams(ind), m_pF->m_triangles); @@ -266,7 +266,7 @@ void LoaderCurrent::ParseMetadata() uint32_t key; uint32_t value; }; - DDVector<TMetadataIndexEntry, FilesContainerR::ReaderT> idx(m_Info.GetMetadataIndexReader()); + DDVector<TMetadataIndexEntry, FilesContainerR::TReader> idx(m_Info.GetMetadataIndexReader()); auto it = lower_bound( idx.begin(), idx.end(), @@ -278,7 +278,7 @@ void LoaderCurrent::ParseMetadata() if (it != idx.end() && m_pF->m_id.m_index == it->key) { - ReaderSource<FilesContainerR::ReaderT> src(m_Info.GetMetadataReader()); + ReaderSource<FilesContainerR::TReader> src(m_Info.GetMetadataReader()); src.Skip(it->value); if (m_Info.GetMWMFormat() >= version::Format::v8) m_pF->m_metadata.Deserialize(src); |