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

[core] Update to shelf-pack 2.1.0

Browse Source
This commit is contained in:
John Firebaugh
2017-06-12 11:12:38 -07:00
parent 244819f2da
commit bb544136f3
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -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)

10
src/mbgl/renderer/image_atlas.cpp
View File

@@ -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;
}

10
src/mbgl/text/glyph_atlas.cpp
View File

@@ -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;
}