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:
authorr.kuznetsov <r.kuznetsov@corp.mail.ru>2015-07-08 17:41:41 +0300
committerr.kuznetsov <r.kuznetsov@corp.mail.ru>2015-11-30 16:09:31 +0300
commit7cd55c618315e55f9d5f349aaaf512e7ef8dc224 (patch)
tree24456ec8b36e2c31c315abe039fc10ec2bfe20e9 /drape/symbols_texture.cpp
parent99d172530c1077924bbeb002afbf4a34d26c9243 (diff)
Review fixes
Diffstat (limited to 'drape/symbols_texture.cpp')
-rw-r--r--drape/symbols_texture.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/drape/symbols_texture.cpp b/drape/symbols_texture.cpp
index 9a01c33c71..bf62d97397 100644
--- a/drape/symbols_texture.cpp
+++ b/drape/symbols_texture.cpp
@@ -1,6 +1,8 @@
#include "drape/symbols_texture.hpp"
#include "3party/stb_image/stb_image.h"
+#include "indexer/map_style_reader.hpp"
+
#include "platform/platform.hpp"
#include "coding/reader.hpp"
@@ -11,6 +13,8 @@
namespace dp
{
+string const SymbolsTextureName = "symbols";
+
class SymbolsTexture::DefinitionLoader
{
public:
@@ -128,7 +132,7 @@ void SymbolsTexture::Load(string const & skinPathName)
DefinitionLoader loader(m_definition);
{
- ReaderPtr<Reader> reader = GetPlatform().GetReader(skinPathName + ".sdf");
+ ReaderPtr<Reader> reader = GetStyleReader().GetResourceReader(SymbolsTextureName + ".sdf", skinPathName);
ReaderSource<ReaderPtr<Reader> > source(reader);
if (!ParseXML(source, loader))
{
@@ -142,7 +146,7 @@ void SymbolsTexture::Load(string const & skinPathName)
}
{
- ReaderPtr<Reader> reader = GetPlatform().GetReader(skinPathName + ".png");
+ ReaderPtr<Reader> reader = GetStyleReader().GetResourceReader(SymbolsTextureName + ".png", skinPathName);
size_t const size = reader.Size();
rawData.resize(size);
reader.Read(0, &rawData[0], size);