diff options
| author | Constantin Shalnev <c.shalnev@corp.mail.ru> | 2015-06-16 15:02:56 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:51:24 +0300 |
| commit | 6d8390d178076c0ad726492c2bf0f1646c6c44b1 (patch) | |
| tree | 286dfcfd83ac52502bed241f48025cbf069364c3 /indexer/map_style_reader.cpp | |
| parent | c9256b09096a1c4bb589a0e8bb30d0a4d2ad5105 (diff) | |
Removed cross-module link, indexer/StyleReader does not use graphics.
Diffstat (limited to 'indexer/map_style_reader.cpp')
| -rw-r--r-- | indexer/map_style_reader.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/indexer/map_style_reader.cpp b/indexer/map_style_reader.cpp index db550624d6..f3972d6c06 100644 --- a/indexer/map_style_reader.cpp +++ b/indexer/map_style_reader.cpp @@ -28,17 +28,6 @@ string GetDrawingRulesFile(MapStyle mapStyle) } } -string GetDensitySuffix(graphics::EDensity density) -{ - char const * const str = graphics::convert(density); - if (nullptr == str) - { - LOG(LERROR, ("Unknown density", density)); - return string(); - } - return str; -} - string GetStyleSuffix(MapStyle mapStyle) { switch (mapStyle) @@ -74,9 +63,9 @@ ReaderPtr<Reader> StyleReader::GetDrawingRulesReader() return GetPlatform().GetReader(rulesFile); } -ReaderPtr<Reader> StyleReader::GetResourceReader(string const & file, graphics::EDensity density) +ReaderPtr<Reader> StyleReader::GetResourceReader(string const & file, string const & density) { - string const resourceDir = string("resources-") + GetDensitySuffix(density) + GetStyleSuffix(GetCurrentStyle()); + string const resourceDir = string("resources-") + density + GetStyleSuffix(GetCurrentStyle()); return GetPlatform().GetReader(my::JoinFoldersToPath(resourceDir, file)); } |