summaryrefslogtreecommitdiff
path: root/platform/darwin/src/MGLImageSource.mm
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 /platform/darwin/src/MGLImageSource.mm
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 'platform/darwin/src/MGLImageSource.mm')
-rw-r--r--platform/darwin/src/MGLImageSource.mm5
1 files changed, 2 insertions, 3 deletions
diff --git a/platform/darwin/src/MGLImageSource.mm b/platform/darwin/src/MGLImageSource.mm
index 0a2dc2713f..351247e901 100644
--- a/platform/darwin/src/MGLImageSource.mm
+++ b/platform/darwin/src/MGLImageSource.mm
@@ -60,10 +60,9 @@
- (void)setImage:(MGLImage *)image {
if (image != nullptr) {
- mbgl::UnassociatedImage unassociatedImage = mbgl::util::unpremultiply(image.mgl_premultipliedImage);
- self.rawSource->setImage(std::move(unassociatedImage));
+ self.rawSource->setImage(image.mgl_premultipliedImage);
} else {
- self.rawSource->setImage(mbgl::UnassociatedImage({0,0}));
+ self.rawSource->setImage(mbgl::PremultipliedImage({0,0}));
}
_image = image;
}