diff options
| author | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-07-11 14:31:05 -0700 |
|---|---|---|
| committer | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-07-17 11:36:34 -0700 |
| commit | 3ecb9d607ff7104ec46870106fd2a2211acd9aaa (patch) | |
| tree | e5a8479f22d1beb097f43bd4e36922d2cf4bd56e /platform/darwin/src/MGLImageSource.mm | |
| parent | 6a2f03077a0d32efafacde34eee1597a340a2d4f (diff) | |
| download | qtlocation-mapboxgl-upstream/optimize-image-source.tar.gz | |
[core][ios][android][macos] Use premultiplied image directly for RasterTile and ImageSource, un-premultiply in the shader for blendingupstream/optimize-image-source
Diffstat (limited to 'platform/darwin/src/MGLImageSource.mm')
| -rw-r--r-- | platform/darwin/src/MGLImageSource.mm | 5 |
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; } |