diff options
| author | Langston Smith <langston.smith@mapbox.com> | 2017-10-10 17:04:11 -0700 |
|---|---|---|
| committer | Langston Smith <langston.smith@mapbox.com> | 2017-10-10 17:04:11 -0700 |
| commit | a829c2de392b8f826e939f1a5061c111630f48e0 (patch) | |
| tree | 7b0c7e2a033c3ad5489648568eb8f2fcbfcac74f /platform/android/src/style/conversion/types.hpp | |
| parent | 4d56366824b51095911dc591c664b963bc04634f (diff) | |
| parent | 98a47884f06a8f165a2c15a54f82b356c8ef23d8 (diff) | |
| download | qtlocation-mapboxgl-a829c2de392b8f826e939f1a5061c111630f48e0.tar.gz | |
Merge branch 'master' into ls-readme-updates
Diffstat (limited to 'platform/android/src/style/conversion/types.hpp')
| -rw-r--r-- | platform/android/src/style/conversion/types.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/android/src/style/conversion/types.hpp b/platform/android/src/style/conversion/types.hpp index a00f668c24..375d1a33aa 100644 --- a/platform/android/src/style/conversion/types.hpp +++ b/platform/android/src/style/conversion/types.hpp @@ -58,15 +58,15 @@ struct Converter<jni::jobject*, mbgl::style::IconTextFitType> { }; template <> -struct Converter<jni::jobject*, mbgl::style::TextJustifyType> { - Result<jni::jobject*> operator()(jni::JNIEnv& env, const mbgl::style::TextJustifyType& value) const { +struct Converter<jni::jobject*, mbgl::style::SymbolAnchorType> { + Result<jni::jobject*> operator()(jni::JNIEnv& env, const mbgl::style::SymbolAnchorType& value) const { return convert<jni::jobject*, std::string>(env, toString(value)); } }; template <> -struct Converter<jni::jobject*, mbgl::style::TextAnchorType> { - Result<jni::jobject*> operator()(jni::JNIEnv& env, const mbgl::style::TextAnchorType& value) const { +struct Converter<jni::jobject*, mbgl::style::TextJustifyType> { + Result<jni::jobject*> operator()(jni::JNIEnv& env, const mbgl::style::TextJustifyType& value) const { return convert<jni::jobject*, std::string>(env, toString(value)); } }; |