diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-03-30 12:14:35 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2017-04-03 10:54:47 +0200 |
| commit | b2570b909b6cbf408bd9779656fd6a397d08dcec (patch) | |
| tree | f63249640765a95769f04370b0f770c076c94049 /platform/android/src/geojson/polygon.cpp | |
| parent | 939864cb901fa35c41e7a04e93988cf746e921a6 (diff) | |
| download | qtlocation-mapboxgl-b2570b909b6cbf408bd9779656fd6a397d08dcec.tar.gz | |
[android] Fix implicit geometry conversions for NDK r13b
Diffstat (limited to 'platform/android/src/geojson/polygon.cpp')
| -rw-r--r-- | platform/android/src/geojson/polygon.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/platform/android/src/geojson/polygon.cpp b/platform/android/src/geojson/polygon.cpp index bb37b8d99e..ef00f9df3f 100644 --- a/platform/android/src/geojson/polygon.cpp +++ b/platform/android/src/geojson/polygon.cpp @@ -2,6 +2,8 @@ #include "multi_line_string.hpp" +#include "util.hpp" + namespace mbgl { namespace android { namespace geojson { @@ -24,7 +26,9 @@ mapbox::geojson::polygon Polygon::convert(jni::JNIEnv &env, jni::Object<java::ut if (jPositionListsList) { auto multiLine = MultiLineString::convert(env, jPositionListsList); polygon.reserve(multiLine.size()); - polygon.insert(std::end(polygon), std::begin(multiLine), std::end(multiLine)); + for (auto&& line : multiLine) { + polygon.emplace_back(convertExplicit<mapbox::geojson::linear_ring>(std::move(line))); + } } return polygon; |