[core][ios][android][macos] Use premultiplied image directly for RasterTile and ImageSource, un-premultiply in the shader for blending

This commit is contained in:
Asheem Mamoowala
2017-07-11 14:31:05 -07:00
parent 1d15ed64dc
commit 8ae7010546
15 changed files with 53 additions and 34 deletions

View File

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