diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2018-02-03 02:16:39 -0800 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2018-02-20 22:29:29 -0800 |
| commit | 61c224a6770e2d30b33052f64099914ff9ba5d53 (patch) | |
| tree | 48aaeef7236f28c95841e13f0bb5f86b7e6239a4 | |
| parent | b002887e54a800c2aaa5a015be9057fc13db08b6 (diff) | |
| download | qtlocation-mapboxgl-61c224a6770e2d30b33052f64099914ff9ba5d53.tar.gz | |
[ios, macos] Added Darwin shaping implementation to projects
| -rw-r--r-- | platform/darwin/src/shaping.mm (renamed from platform/darwin/src/CTShaping.mm) | 0 | ||||
| -rw-r--r-- | platform/ios/config.cmake | 1 | ||||
| -rw-r--r-- | platform/macos/config.cmake | 1 | ||||
| -rw-r--r-- | src/mbgl/text/shaping.hpp | 2 |
4 files changed, 3 insertions, 1 deletions
diff --git a/platform/darwin/src/CTShaping.mm b/platform/darwin/src/shaping.mm index cde3272e9c..cde3272e9c 100644 --- a/platform/darwin/src/CTShaping.mm +++ b/platform/darwin/src/shaping.mm diff --git a/platform/ios/config.cmake b/platform/ios/config.cmake index 1caf372b25..cde0cd3431 100644 --- a/platform/ios/config.cmake +++ b/platform/ios/config.cmake @@ -32,6 +32,7 @@ macro(mbgl_platform_core) PRIVATE platform/darwin/src/local_glyph_rasterizer.mm PRIVATE platform/darwin/src/logging_nslog.mm PRIVATE platform/darwin/src/nsthread.mm + PRIVATE platform/darwin/src/shaping.mm PRIVATE platform/darwin/src/string_nsstring.mm PRIVATE platform/default/bidi.cpp PRIVATE platform/default/thread_local.cpp diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake index e929bb55c6..4c582bdbb4 100644 --- a/platform/macos/config.cmake +++ b/platform/macos/config.cmake @@ -18,6 +18,7 @@ macro(mbgl_platform_core) PRIVATE platform/darwin/src/local_glyph_rasterizer.mm PRIVATE platform/darwin/src/logging_nslog.mm PRIVATE platform/darwin/src/nsthread.mm + PRIVATE platform/darwin/src/shaping.mm PRIVATE platform/darwin/src/string_nsstring.mm PRIVATE platform/default/bidi.cpp PRIVATE platform/default/thread_local.cpp diff --git a/src/mbgl/text/shaping.hpp b/src/mbgl/text/shaping.hpp index a36cf58ab2..33f851dc9b 100644 --- a/src/mbgl/text/shaping.hpp +++ b/src/mbgl/text/shaping.hpp @@ -57,7 +57,7 @@ const Shaping getShaping(const std::u16string& string, BiDi& bidi, const Glyphs& glyphs); -// implemented in CTShaping.mm +// implemented in shaping.mm GlyphIDs getGlyphDependencies(const std::u16string& string); float shapeLine(Shaping&, const std::u16string&, const float y); |