From 44c13dae8b2d4cd8d5475f98f51ba0930efcaf98 Mon Sep 17 00:00:00 2001
From: Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru>
Date: Mon, 16 Nov 2015 16:47:05 +0300
Subject: [PATCH] Using exact density (exact dpi) in C++ core.

---
 map/framework.cpp        | 2 +-
 render/render_policy.cpp | 7 +++++--
 render/render_policy.hpp | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/map/framework.cpp b/map/framework.cpp
index c9cb15f544..28e09857dd 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -363,7 +363,7 @@ void Framework::InitSingleFrameRenderer(graphics::EDensity density, int exactDen
   ASSERT(!IsSingleFrameRendererInited(), ());
   if (m_cpuDrawer == nullptr)
   {
-    CPUDrawer::Params params(GetGlyphCacheParams(density));
+    CPUDrawer::Params params(GetGlyphCacheParams(density, exactDensityDPI));
     params.m_visualScale = graphics::visualScaleExact(exactDensityDPI);
     params.m_density = density;
 
diff --git a/render/render_policy.cpp b/render/render_policy.cpp
index 5daa444050..ca0f5d15f1 100644
--- a/render/render_policy.cpp
+++ b/render/render_policy.cpp
@@ -40,7 +40,7 @@ RenderPolicy::RenderPolicy(Params const & p,
     m_doForceUpdate(false),
     m_density(p.m_density),
     m_exactDensityDPI(p.m_exactDensityDPI),
-    m_visualScale(graphics::visualScale(p.m_density)),
+    m_visualScale(graphics::visualScaleExact(p.m_exactDensityDPI)),
     m_skinName(p.m_skinName)
 {
   m_bgColors.resize(scales::UPPER_STYLE_SCALE+1);
@@ -341,13 +341,16 @@ RenderPolicy * CreateRenderPolicy(RenderPolicy::Params const & params)
 }
 
 
-graphics::GlyphCache::Params GetGlyphCacheParams(graphics::EDensity density, size_t cacheMaxSize)
+graphics::GlyphCache::Params GetGlyphCacheParams(graphics::EDensity density,
+                                                 int exactDensity,
+                                                 size_t cacheMaxSize)
 {
   return graphics::GlyphCache::Params(UNICODE_BLOCK_FILE,
                                       WHITE_LIST_FILE,
                                       BLACK_LIST_FILE,
                                       cacheMaxSize,
                                       density,
+                                      exactDensity,
                                       false);
 }
 
diff --git a/render/render_policy.hpp b/render/render_policy.hpp
index 3260f2ce5f..5a1f5ef6b0 100644
--- a/render/render_policy.hpp
+++ b/render/render_policy.hpp
@@ -201,5 +201,6 @@ protected:
 
 RenderPolicy * CreateRenderPolicy(RenderPolicy::Params const & params);
 
-graphics::GlyphCache::Params GetGlyphCacheParams(graphics::EDensity density, size_t cacheMaxSize = 2 * 1024 * 1024);
+graphics::GlyphCache::Params GetGlyphCacheParams(graphics::EDensity density,
+                                                 int exactDensity, size_t cacheMaxSize = 2 * 1024 * 1024);
 graphics::ResourceManager::GlyphCacheParams GetResourceGlyphCacheParams(graphics::EDensity density, size_t cacheMaxSize = 2 * 1024 * 1024);