[core] remove use of <boost/algorithm/string.hpp>

This commit is contained in:
Konstantin Käfer
2018-10-17 16:45:41 +02:00
parent c87c25cc84
commit 729eeeb3f8
4 changed files with 7 additions and 6 deletions

View File

@@ -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;
}

View File

@@ -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

View File

@@ -618,6 +618,10 @@ bool isStringInSupportedScript(const std::string& input) {
return true;
}
bool isWhitespace(char16_t chr) {
return chr == u' ' || chr == u'\t' || chr == u'\n' || chr == u'\v' || chr == u'\f' || chr == u'\r';
}
} // namespace i18n
} // namespace util
} // namespace mbgl

View File

@@ -75,6 +75,8 @@ char16_t verticalizePunctuation(char16_t chr);
bool isStringInSupportedScript(const std::string& input);
bool isWhitespace(char16_t chr);
} // namespace i18n
} // namespace util
} // namespace mbgl