tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'glyphrange-boost-locale' into glyphrange-yh-guesses

Browse Source 
Conflicts:
	src/map/tile_parser.cpp
	src/text/glyph_store.cpp
This commit is contained in:
Young Hahn
2014-05-29 06:06:57 -04:00
parent f48999dc13 6e5ff8c122
commit 86ae823306
6 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/text/glyph_store.cpp
View File

@@ -2,10 +2,11 @@
#include <llmr/util/std.hpp>
#include <llmr/util/string.hpp>
#include <llmr/util/utf.hpp>
#include <llmr/util/pbf.hpp>
#include <llmr/platform/platform.hpp>
#include <uv.h>
#include <regex>
#include <algorithm>
namespace llmr {
@@ -27,7 +28,7 @@ const std::map<uint32_t, SDFGlyph> &FontStack::getSDFs() const {
return sdfs;
}
const Shaping FontStack::getShaping(const std::string &string) const {
const Shaping FontStack::getShaping(const std::u32string &string) const {
std::lock_guard<std::mutex> lock(mtx);
uint32_t i = 0;
uint32_t x = 0;