diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-12 11:12:38 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-13 10:18:43 -0700 |
| commit | bb544136f37c67f1ceea9a0b0c2ac780e72a1596 (patch) | |
| tree | cc0af681302b872f40b9cba4abb82cdabd0bb597 | |
| parent | 244819f2da6b892ce3eab78f3b54c61cb93abc92 (diff) | |
| download | qtlocation-mapboxgl-bb544136f37c67f1ceea9a0b0c2ac780e72a1596.tar.gz | |
[core] Update to shelf-pack 2.1.0
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/mbgl/renderer/image_atlas.cpp | 10 | ||||
| -rw-r--r-- | src/mbgl/text/glyph_atlas.cpp | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7107646587..0d8df9049f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ mason_use(pixelmatch VERSION 0.10.0 HEADER_ONLY) mason_use(geojson VERSION 0.4.0 HEADER_ONLY) mason_use(polylabel VERSION 1.0.2 HEADER_ONLY) mason_use(wagyu VERSION 0.4.1 HEADER_ONLY) -mason_use(shelf-pack VERSION 2.0.1 HEADER_ONLY) +mason_use(shelf-pack VERSION 2.1.0 HEADER_ONLY) add_definitions(-DRAPIDJSON_HAS_STDSTRING=1) diff --git a/src/mbgl/renderer/image_atlas.cpp b/src/mbgl/renderer/image_atlas.cpp index 9649187175..8eee7c2095 100644 --- a/src/mbgl/renderer/image_atlas.cpp +++ b/src/mbgl/renderer/image_atlas.cpp @@ -48,11 +48,11 @@ ImageAtlas makeImageAtlas(const ImageMap& images) { ImagePosition { bin, image }); } -// pack.shrink(); -// result.image.resize({ -// static_cast<uint32_t>(pack.width()), -// static_cast<uint32_t>(pack.height()) -// }); + pack.shrink(); + result.image.resize({ + static_cast<uint32_t>(pack.width()), + static_cast<uint32_t>(pack.height()) + }); return result; } diff --git a/src/mbgl/text/glyph_atlas.cpp b/src/mbgl/text/glyph_atlas.cpp index 6636c23f34..1b98ea36bf 100644 --- a/src/mbgl/text/glyph_atlas.cpp +++ b/src/mbgl/text/glyph_atlas.cpp @@ -53,11 +53,11 @@ GlyphAtlas makeGlyphAtlas(const GlyphMap& glyphs) { } } -// pack.shrink(); -// result.image.resize({ -// static_cast<uint32_t>(pack.width()), -// static_cast<uint32_t>(pack.height()) -// }); + pack.shrink(); + result.image.resize({ + static_cast<uint32_t>(pack.width()), + static_cast<uint32_t>(pack.height()) + }); return result; } |