From 084dba71fcd5bf915178fde30efb4b31b44f3df8 Mon Sep 17 00:00:00 2001 From: Chris Loer Date: Thu, 29 Dec 2016 17:17:57 -0800 Subject: Make sure explicit newlines get considered as breakpoints before being passed to ICU. --- src/mbgl/text/glyph_set.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mbgl/text/glyph_set.cpp b/src/mbgl/text/glyph_set.cpp index 6f4ccdcf0a..4738bf97cf 100644 --- a/src/mbgl/text/glyph_set.cpp +++ b/src/mbgl/text/glyph_set.cpp @@ -211,7 +211,7 @@ std::set GlyphSet::determineLineBreaks(const std::u16string& logica for (std::size_t i = 0; i < logicalInput.size(); i++) { const char16_t codePoint = logicalInput[i]; auto it = sdfs.find(codePoint); - if (it == sdfs.end()) { + if (it == sdfs.end() || codePoint == 0x0a) { continue; } @@ -233,7 +233,9 @@ std::set GlyphSet::determineLineBreaks(const std::u16string& logica insideParenthesesPenalty -= 10000000; } - currentX += it->second.metrics.advance + spacing; + if (it != sdfs.end()) { + currentX += it->second.metrics.advance + spacing; + } } return leastBadBreaks(evaluateBreak(logicalInput.size(), currentX, targetWidth, potentialBreaks, 0, true)); -- cgit v1.2.1