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

2017-07-11 14:31:05 -07:00
parent 1d15ed64dc
commit 8ae7010546
15 changed files with 53 additions and 34 deletions
--- a/platform/android/src/style/sources/image_source.cpp
+++ b/platform/android/src/style/sources/image_source.cpp
@@ -40,8 +40,7 @@ namespace android {
    }

    void ImageSource::setImage(jni::JNIEnv& env, jni::Object<Bitmap> bitmap) {
-        UnassociatedImage image = util::unpremultiply(Bitmap::GetImage(env, bitmap));
-        source.as<mbgl::style::ImageSource>()->setImage(std:: move(image));
+        source.as<mbgl::style::ImageSource>()->setImage(Bitmap::GetImage(env, bitmap));
    }

    jni::Class<ImageSource> ImageSource::javaClass;