diff options
| author | Chris Loer <chris.loer@gmail.com> | 2018-11-20 13:46:26 -0800 |
|---|---|---|
| committer | Chris Loer <chris.loer@mapbox.com> | 2018-11-24 09:57:32 -0800 |
| commit | 0bba794e98a6fd8d2da1065c255bbce38a45f754 (patch) | |
| tree | 954d4c5b7b8bf0d668349130eb44d16992e3ca6d /platform/android/src | |
| parent | 336409b8613c4737d73e669b1ac3e0b6747f7ede (diff) | |
| download | qtlocation-mapboxgl-0bba794e98a6fd8d2da1065c255bbce38a45f754.tar.gz | |
[android] Expose "local ideograph font family" in MapSnapshotter::Options
Use local glyph generation in test app's MapSnapshotterActivity.
Diffstat (limited to 'platform/android/src')
| -rw-r--r-- | platform/android/src/snapshotter/map_snapshotter.cpp | 10 | ||||
| -rw-r--r-- | platform/android/src/snapshotter/map_snapshotter.hpp | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/platform/android/src/snapshotter/map_snapshotter.cpp b/platform/android/src/snapshotter/map_snapshotter.cpp index e2e01f4e38..a5f44a1d4c 100644 --- a/platform/android/src/snapshotter/map_snapshotter.cpp +++ b/platform/android/src/snapshotter/map_snapshotter.cpp @@ -24,7 +24,8 @@ MapSnapshotter::MapSnapshotter(jni::JNIEnv& _env, const jni::Object<LatLngBounds>& region, const jni::Object<CameraPosition>& position, jni::jboolean _showLogo, - const jni::String& _programCacheDir) + const jni::String& _programCacheDir, + const jni::String& _localIdeographFontFamily) : javaPeer(_env, _obj) , pixelRatio(_pixelRatio) , threadPool(sharedThreadPool()) { @@ -65,7 +66,10 @@ MapSnapshotter::MapSnapshotter(jni::JNIEnv& _env, pixelRatio, cameraOptions, bounds, - jni::Make<std::string>(_env, _programCacheDir)); + jni::Make<std::string>(_env, _programCacheDir), + _localIdeographFontFamily ? + jni::Make<std::string>(_env, _localIdeographFontFamily) : + optional<std::string>{}); } @@ -156,7 +160,7 @@ void MapSnapshotter::registerNative(jni::JNIEnv& env) { // Register the peer jni::RegisterNativePeer<MapSnapshotter>(env, javaClass, "nativePtr", - jni::MakePeer<MapSnapshotter, const jni::Object<MapSnapshotter>&, const jni::Object<FileSource>&, jni::jfloat, jni::jint, jni::jint, const jni::String&, const jni::String&, const jni::Object<LatLngBounds>&, const jni::Object<CameraPosition>&, jni::jboolean, const jni::String&>, + jni::MakePeer<MapSnapshotter, const jni::Object<MapSnapshotter>&, const jni::Object<FileSource>&, jni::jfloat, jni::jint, jni::jint, const jni::String&, const jni::String&, const jni::Object<LatLngBounds>&, const jni::Object<CameraPosition>&, jni::jboolean, const jni::String&, const jni::String&>, "nativeInitialize", "finalize", METHOD(&MapSnapshotter::setStyleUrl, "setStyleUrl"), diff --git a/platform/android/src/snapshotter/map_snapshotter.hpp b/platform/android/src/snapshotter/map_snapshotter.hpp index e20acf4f1f..e8c0885ff1 100644 --- a/platform/android/src/snapshotter/map_snapshotter.hpp +++ b/platform/android/src/snapshotter/map_snapshotter.hpp @@ -35,7 +35,8 @@ public: const jni::Object<LatLngBounds>& region, const jni::Object<CameraPosition>& position, jni::jboolean showLogo, - const jni::String& programCacheDir); + const jni::String& programCacheDir, + const jni::String& localIdeographFontFamily); ~MapSnapshotter(); |