Fix index initialization (FilesContainerR).

1 files changed, 9 insertions, 6 deletions

diff --git a/indexer/index.cpp b/indexer/index.cpp
index 8c4bdb26e2..48f91e3b23 100644
--- a/indexer/index.cpp
+++ b/indexer/index.cpp
@@ -5,10 +5,10 @@
 
 namespace
 {
-FilesContainerR * CreateFileContainer(string const & fileName)
-{
-  return new FilesContainerR(fileName);
-}
+  FilesContainerR * CreateFileContainer(string const & fileName)
+  {
+    return new FilesContainerR(GetPlatform().GetReader(fileName));
+  }
 }  // unnamed namespace
 
 Index::Index() : MwmSet(bind(&Index::FillInMwmInfo, this, _1, _2), &CreateFileContainer)
@@ -19,8 +19,11 @@ void Index::FillInMwmInfo(string const & fileName, MwmInfo & info)
 {
   IndexFactory factory;
   factory.Load(FilesContainerR(GetPlatform().GetReader(fileName)));
+
   feature::DataHeader const & h = factory.GetHeader();
   info.m_limitRect = h.GetBounds();
-  info.m_minScale = static_cast<uint8_t>(h.GetScaleRange().first);
-  info.m_maxScale = static_cast<uint8_t>(h.GetScaleRange().second);
+
+  pair<int, int> const scaleR = h.GetScaleRange();
+  info.m_minScale = static_cast<uint8_t>(scaleR.first);
+  info.m_maxScale = static_cast<uint8_t>(scaleR.second);
 }