summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/jni/android/graphics/Bitmap.cpp2
-rw-r--r--core/jni/android/graphics/Utils.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp
index d97a945..310966c 100644
--- a/core/jni/android/graphics/Bitmap.cpp
+++ b/core/jni/android/graphics/Bitmap.cpp
@@ -627,7 +627,7 @@ static jobject Bitmap_extractAlpha(JNIEnv* env, jobject clazz,
}
return GraphicsJNI::createBitmap(env, dst, allocator.getStorageObj(),
- GraphicsJNI::kBitmapCreateFlag_Mutable, NULL, NULL);
+ getPremulBitmapCreateFlags(true), NULL, NULL);
}
///////////////////////////////////////////////////////////////////////////////
diff --git a/core/jni/android/graphics/Utils.cpp b/core/jni/android/graphics/Utils.cpp
index eb416cb..a134d4b 100644
--- a/core/jni/android/graphics/Utils.cpp
+++ b/core/jni/android/graphics/Utils.cpp
@@ -52,7 +52,6 @@ bool AssetStreamAdaptor::isAtEnd() const {
}
SkStreamRewindable* AssetStreamAdaptor::duplicate() const {
- SkASSERT(false);
// Cannot create a duplicate, since each AssetStreamAdaptor
// would be modifying the Asset.
//return new AssetStreamAdaptor(fAsset);