From a9842dbd6bbd370f185505212ed3441b29e25240 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 26 Sep 2016 13:38:11 -0700 Subject: [PATCH] [core] Extract some GlyphRange-related constants --- platform/default/mbgl/storage/offline_download.cpp | 6 +++--- src/mbgl/text/glyph_range.hpp | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/platform/default/mbgl/storage/offline_download.cpp b/platform/default/mbgl/storage/offline_download.cpp index 5728b666474..293166b807a 100644 --- a/platform/default/mbgl/storage/offline_download.cpp +++ b/platform/default/mbgl/storage/offline_download.cpp @@ -114,7 +114,7 @@ OfflineRegionStatus OfflineDownload::getStatus() const { } if (!parser.glyphURL.empty()) { - result.requiredResourceCount += parser.fontStacks().size() * 256; + result.requiredResourceCount += parser.fontStacks().size() * GLYPH_RANGES_PER_FONT_STACK; } if (!parser.spriteURL.empty()) { @@ -184,8 +184,8 @@ void OfflineDownload::activateDownload() { if (!parser.glyphURL.empty()) { for (const auto& fontStack : parser.fontStacks()) { - for (uint32_t i = 0; i < 256; i++) { - queueResource(Resource::glyphs(parser.glyphURL, fontStack, getGlyphRange(i * 256))); + for (uint32_t i = 0; i < GLYPH_RANGES_PER_FONT_STACK; i++) { + queueResource(Resource::glyphs(parser.glyphURL, fontStack, getGlyphRange(i * GLYPHS_PER_GLYPH_RANGE))); } } } diff --git a/src/mbgl/text/glyph_range.hpp b/src/mbgl/text/glyph_range.hpp index aa11b35f5ea..dd39e092b74 100644 --- a/src/mbgl/text/glyph_range.hpp +++ b/src/mbgl/text/glyph_range.hpp @@ -17,4 +17,7 @@ struct GlyphRangeHash { typedef std::unordered_set GlyphRangeSet; +constexpr uint32_t GLYPHS_PER_GLYPH_RANGE = 256; +constexpr uint32_t GLYPH_RANGES_PER_FONT_STACK = 256; + } // end namespace mbgl