From 077932741669b8d5d673a5bf5e77327b351caa76 Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Fri, 16 Feb 2018 13:44:07 +0300 Subject: [PATCH] Fixed drape tests --- drape/drape_tests/font_texture_tests.cpp | 12 +++++++----- drape/texture_manager.cpp | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drape/drape_tests/font_texture_tests.cpp b/drape/drape_tests/font_texture_tests.cpp index 8e158bdc7b..193628911b 100644 --- a/drape/drape_tests/font_texture_tests.cpp +++ b/drape/drape_tests/font_texture_tests.cpp @@ -59,14 +59,15 @@ private: class DummyGlyphIndex : public GlyphIndex { - typedef GlyphIndex TBase; - public: - DummyGlyphIndex(m2::PointU size, ref_ptr mng) : TBase(size, mng) {} + DummyGlyphIndex(m2::PointU size, ref_ptr mng, + ref_ptr glyphGenerator) + : GlyphIndex(size, mng, glyphGenerator) + {} ref_ptr MapResource(GlyphKey const & key) { bool dummy = false; - return TBase::MapResource(key, dummy); + return GlyphIndex::MapResource(key, dummy); } }; } // namespace @@ -90,8 +91,9 @@ UNIT_TEST(UploadingGlyphs) args.m_blacklist = "fonts_blacklist.txt"; GetPlatform().GetFontNames(args.m_fonts); + GlyphGenerator glyphGenerator(4); GlyphManager mng(args); - DummyGlyphIndex index(m2::PointU(128, 128), make_ref(&mng)); + DummyGlyphIndex index(m2::PointU(128, 128), make_ref(&mng), make_ref(&glyphGenerator)); size_t count = 1; // invalid symbol glyph has mapped internally. count += (index.MapResource(GlyphKey(0x58, GlyphManager::kDynamicGlyphSize)) != nullptr) ? 1 : 0; count += (index.MapResource(GlyphKey(0x59, GlyphManager::kDynamicGlyphSize)) != nullptr) ? 1 : 0; diff --git a/drape/texture_manager.cpp b/drape/texture_manager.cpp index a1c7f2ff7a..e366b6393a 100644 --- a/drape/texture_manager.cpp +++ b/drape/texture_manager.cpp @@ -137,9 +137,9 @@ m2::PointU ColorTextureSize(size_t colorsCount, uint32_t maxTextureSize) } // namespace TextureManager::TextureManager(ref_ptr glyphGenerator) - : m_glyphGenerator(glyphGenerator) - , m_maxTextureSize(0) + : m_maxTextureSize(0) , m_maxGlypsCount(0) + , m_glyphGenerator(glyphGenerator) { m_nothingToUpload.test_and_set(); }