tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[msvc] Fix compilation errors and warnings (#141)

Browse Source
This commit is contained in:
Tadej Novak
2021-08-29 22:53:42 +02:00
committed by GitHub
parent c0d76c69cc
commit fe041b80ca
51 changed files with 206 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mbgl/geometry/dem_data.cpp
View File

@@ -90,9 +90,9 @@ int32_t DEMData::get(const int32_t x, const int32_t y) const {
const std::array<float, 4>& DEMData::getUnpackVector() const {
// https://www.mapbox.com/help/access-elevation-data/#mapbox-terrain-rgb
static const std::array<float, 4> unpackMapbox = {{ 6553.6, 25.6, 0.1, 10000.0 }};
static const std::array<float, 4> unpackMapbox = {{ 6553.6f, 25.6f, 0.1f, 10000.0f }};
// https://aws.amazon.com/public-datasets/terrain/
static const std::array<float, 4> unpackTerrarium = {{ 256.0, 1.0, 1.0 / 256.0, 32768.0 }};
static const std::array<float, 4> unpackTerrarium = {{ 256.0f, 1.0f, 1.0f / 256.0f, 32768.0f }};
return encoding == Tileset::DEMEncoding::Terrarium ? unpackTerrarium : unpackMapbox;
}