diff options
author | Molly Lloyd <mollymerp@users.noreply.github.com> | 2018-02-14 13:17:55 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-14 13:17:55 -0800 |
commit | 8a283b030629abb00367929d047731c3974bc3d6 (patch) | |
tree | 4016b561a3ab52e4ce12e65b4307f0b626124120 /src/mbgl/geometry/dem_data.hpp | |
parent | a386cac452b333d3e9656efd04e98035cd6b1c57 (diff) | |
download | qtlocation-mapboxgl-8a283b030629abb00367929d047731c3974bc3d6.tar.gz |
[core] add support for mapzen terrarium (#11154)
* add support for mapzen terrarium
* Encoding --> DEMEncoding, avoid if statement when unpacking elevation values
* add Terrarium test
* update submodule
* remove redundant checks
Diffstat (limited to 'src/mbgl/geometry/dem_data.hpp')
-rw-r--r-- | src/mbgl/geometry/dem_data.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mbgl/geometry/dem_data.hpp b/src/mbgl/geometry/dem_data.hpp index 507a51661d..817d3cc9c9 100644 --- a/src/mbgl/geometry/dem_data.hpp +++ b/src/mbgl/geometry/dem_data.hpp @@ -2,6 +2,7 @@ #include <mbgl/math/clamp.hpp> #include <mbgl/util/image.hpp> +#include <mbgl/util/tileset.hpp> #include <memory> #include <array> @@ -12,7 +13,7 @@ namespace mbgl { class DEMData { public: - DEMData(const PremultipliedImage& image); + DEMData(const PremultipliedImage& image, Tileset::DEMEncoding encoding); void backfillBorder(const DEMData& borderTileData, int8_t dx, int8_t dy); void set(const int32_t x, const int32_t y, const int32_t value) { |