diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2018-10-17 16:45:41 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2018-10-23 12:23:40 +0200 |
| commit | 729eeeb3f821981cc5d3c9e06ffbb85ed4d857d7 (patch) | |
| tree | 896c896e65736d328f744d73a765e5730e0bafeb /src/mbgl/text | |
| parent | c87c25cc8407c33e4d88390836a9a52a1626c19e (diff) | |
| download | qtlocation-mapboxgl-729eeeb3f821981cc5d3c9e06ffbb85ed4d857d7.tar.gz | |
[core] remove use of <boost/algorithm/string.hpp>
Diffstat (limited to 'src/mbgl/text')
| -rw-r--r-- | src/mbgl/text/shaping.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/text/tagged_string.cpp | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/mbgl/text/shaping.cpp b/src/mbgl/text/shaping.cpp index d6cbb2a4f8..6d10085ad3 100644 --- a/src/mbgl/text/shaping.cpp +++ b/src/mbgl/text/shaping.cpp @@ -4,8 +4,6 @@ #include <mbgl/math/minmax.hpp> #include <mbgl/text/bidi.hpp> -#include <boost/algorithm/string.hpp> - #include <algorithm> #include <cmath> @@ -247,7 +245,7 @@ std::set<std::size_t> determineLineBreaks(const TaggedString& logicalInput, continue; } auto it = glyphs->second.find(codePoint); - if (it != glyphs->second.end() && it->second && !boost::algorithm::is_any_of(u" \t\n\v\f\r")(codePoint)) { + if (it != glyphs->second.end() && it->second && !util::i18n::isWhitespace(codePoint)) { currentX += (*it->second)->metrics.advance * section.scale + spacing; } diff --git a/src/mbgl/text/tagged_string.cpp b/src/mbgl/text/tagged_string.cpp index e199a7c962..851e011c4f 100644 --- a/src/mbgl/text/tagged_string.cpp +++ b/src/mbgl/text/tagged_string.cpp @@ -1,8 +1,6 @@ #include <mbgl/text/tagged_string.hpp> #include <mbgl/util/i18n.hpp> -#include <boost/algorithm/string.hpp> - namespace mbgl { void TaggedString::addSection(const std::u16string& sectionText, double scale, FontStackHash fontStack) { @@ -12,7 +10,6 @@ void TaggedString::addSection(const std::u16string& sectionText, double scale, F } void TaggedString::trim() { - auto whiteSpace = boost::algorithm::is_any_of(u" \t\n\v\f\r"); std::size_t beginningWhitespace = styledText.first.find_first_not_of(u" \t\n\v\f\r"); if (beginningWhitespace == std::u16string::npos) { // Entirely whitespace |