summaryrefslogtreecommitdiff
path: root/src/mbgl/style/sources/image_source_impl.cpp
diff options
context:
space:
mode:
authorAsheem Mamoowala <asheem.mamoowala@mapbox.com>2017-07-11 14:31:05 -0700
committerAsheem Mamoowala <asheem.mamoowala@mapbox.com>2017-07-17 12:20:03 -0700
commit8ae70105463db78699ef3743fb24503ed8feb054 (patch)
treee5a8479f22d1beb097f43bd4e36922d2cf4bd56e /src/mbgl/style/sources/image_source_impl.cpp
parent1d15ed64dcf78daa9459247127857513608c18ad (diff)
downloadqtlocation-mapboxgl-8ae70105463db78699ef3743fb24503ed8feb054.tar.gz
[core][ios][android][macos] Use premultiplied image directly for RasterTile and ImageSource, un-premultiply in the shader for blending
Diffstat (limited to 'src/mbgl/style/sources/image_source_impl.cpp')
-rw-r--r--src/mbgl/style/sources/image_source_impl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/style/sources/image_source_impl.cpp b/src/mbgl/style/sources/image_source_impl.cpp
index eb3e2635e5..c1f31dbdc6 100644
--- a/src/mbgl/style/sources/image_source_impl.cpp
+++ b/src/mbgl/style/sources/image_source_impl.cpp
@@ -15,14 +15,14 @@ ImageSource::Impl::Impl(const Impl& other, std::array<LatLng, 4> coords_)
image(other.image) {
}
-ImageSource::Impl::Impl(const Impl& rhs, UnassociatedImage&& image_)
+ImageSource::Impl::Impl(const Impl& rhs, PremultipliedImage&& image_)
: Source::Impl(rhs),
coords(rhs.coords),
- image(std::make_shared<UnassociatedImage>(std::move(image_))) {
+ image(std::make_shared<PremultipliedImage>(std::move(image_))) {
}
ImageSource::Impl::~Impl() = default;
-std::shared_ptr<UnassociatedImage> ImageSource::Impl::getImage() const {
+std::shared_ptr<PremultipliedImage> ImageSource::Impl::getImage() const {
return image;
}