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>2011-09-16 20:16:04 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:23:56 +0300
commit160e5ced67c6499188b81513f174f08c26ee9de0 (patch)
treeb11c2c89394c5bcfb164274f653be466f3ffc3a0 /indexer/old
parent75daa7a5c7ae5272815ff11ddb586aa14bb28c4e (diff)
[Reduce mwm size] Add dynamic serial::CodingParams (coordinate bits) for different scale levels.
Diffstat (limited to 'indexer/old')
-rw-r--r--indexer/old/feature_loader_101.cpp10
-rw-r--r--indexer/old/feature_loader_101.hpp1
2 files changed, 5 insertions, 6 deletions
diff --git a/indexer/old/feature_loader_101.cpp b/indexer/old/feature_loader_101.cpp
index c886c40684..4f253d87c9 100644
--- a/indexer/old/feature_loader_101.cpp
+++ b/indexer/old/feature_loader_101.cpp
@@ -67,7 +67,7 @@ void LoaderImpl::ParseCommon()
if (h & HEADER_HAS_POINT)
{
CoordPointT const center = Int64ToPoint(
- ReadVarInt<int64_t>(source) + m_Info.GetCodingParams().GetBasePointInt64(), POINT_COORD_BITS);
+ ReadVarInt<int64_t>(source) + GetDefCodingParams().GetBasePointInt64(), POINT_COORD_BITS);
m_pF->m_Center = m2::PointD(center.first, center.second);
m_pF->m_LimitRect.Add(m_pF->m_Center);
@@ -208,7 +208,7 @@ void LoaderImpl::ParseHeader2()
char const * start = static_cast<char const *>(src.Ptr());
src = ArrayByteSource(serial::LoadInnerPath(
- src.Ptr(), ptsCount, m_Info.GetCodingParams(), m_pF->m_Points));
+ src.Ptr(), ptsCount, GetDefCodingParams(), m_pF->m_Points));
m_pF->m_InnerStats.m_Points = static_cast<char const *>(src.Ptr()) - start;
}
@@ -226,7 +226,7 @@ void LoaderImpl::ParseHeader2()
FeatureType::points_t points;
src = ArrayByteSource(serial::LoadInnerTriangles(
- src.Ptr(), trgCount, m_Info.GetCodingParams(), points));
+ src.Ptr(), trgCount, GetDefCodingParams(), points));
m_pF->m_InnerStats.m_Strips = static_cast<char const *>(src.Ptr()) - start;
@@ -257,7 +257,7 @@ uint32_t LoaderImpl::ParseGeometry(int scale)
{
ReaderSource<FilesContainerR::ReaderT> src(m_Info.GetGeometryReader(ind));
src.Skip(m_ptsOffsets[ind]);
- serial::LoadOuterPath(src, m_Info.GetCodingParams(), m_pF->m_Points);
+ serial::LoadOuterPath(src, GetDefCodingParams(), m_pF->m_Points);
sz = static_cast<uint32_t>(src.Pos() - m_ptsOffsets[ind]);
}
@@ -303,7 +303,7 @@ uint32_t LoaderImpl::ParseTriangles(int scale)
{
ReaderSource<FilesContainerR::ReaderT> src(m_Info.GetTrianglesReader(ind));
src.Skip(m_trgOffsets[ind]);
- serial::LoadOuterTriangles(src, m_Info.GetCodingParams(), m_pF->m_Triangles);
+ serial::LoadOuterTriangles(src, GetDefCodingParams(), m_pF->m_Triangles);
sz = static_cast<uint32_t>(src.Pos() - m_trgOffsets[ind]);
}
diff --git a/indexer/old/feature_loader_101.hpp b/indexer/old/feature_loader_101.hpp
index d7fe928c10..6b439d4a0e 100644
--- a/indexer/old/feature_loader_101.hpp
+++ b/indexer/old/feature_loader_101.hpp
@@ -39,6 +39,5 @@ namespace old_101 { namespace feature
virtual uint32_t ParseGeometry(int scale);
virtual uint32_t ParseTriangles(int scale);
};
-
}
}