summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mbgl/renderer/image_atlas.cpp13
-rw-r--r--src/mbgl/renderer/image_atlas.hpp3
2 files changed, 8 insertions, 8 deletions
diff --git a/src/mbgl/renderer/image_atlas.cpp b/src/mbgl/renderer/image_atlas.cpp
index c9cedb3386..e38bd923ee 100644
--- a/src/mbgl/renderer/image_atlas.cpp
+++ b/src/mbgl/renderer/image_atlas.cpp
@@ -9,14 +9,11 @@ static constexpr uint32_t padding = 1;
ImagePosition::ImagePosition(const mapbox::Bin& bin, const style::Image::Impl& image, uint32_t version_)
: pixelRatio(image.pixelRatio),
- textureRect(
- bin.x + padding,
- bin.y + padding,
- bin.w - padding * 2,
- bin.h - padding * 2
- ),
- version(version_) {
-}
+ textureRect(bin.x + padding, bin.y + padding, bin.w - padding * 2, bin.h - padding * 2),
+ version(version_),
+ stretchX(image.stretchX),
+ stretchY(image.stretchY),
+ content(image.content) {}
const mapbox::Bin& _packImage(mapbox::ShelfPack& pack, const style::Image::Impl& image, ImageAtlas& resultImage, ImageType imageType) {
const mapbox::Bin& bin = *pack.packOne(-1,
diff --git a/src/mbgl/renderer/image_atlas.hpp b/src/mbgl/renderer/image_atlas.hpp
index e4d7d0f009..e5305b0e42 100644
--- a/src/mbgl/renderer/image_atlas.hpp
+++ b/src/mbgl/renderer/image_atlas.hpp
@@ -24,6 +24,9 @@ public:
float pixelRatio;
Rect<uint16_t> textureRect;
uint32_t version;
+ style::ImageStretches stretchX;
+ style::ImageStretches stretchY;
+ style::ImageContent content;
std::array<uint16_t, 2> tl() const {
return {{