summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2013-07-12 19:46:19 -0700
committer Chris Craik <ccraik@google.com> 2013-07-12 19:46:19 -0700
commit95587f9045443f8201d01db1d2bee8ae79edab8c (patch)
treea3790bff4d310dbfb5a742e3b4078c360516ba8b
parente969964c80a20b2d968b4ee54495176c9049d3e3 (diff)
Add webp to BitmapFactory.Options outMimetype
Change-Id: Id0d5b4d6c2c5b21fa0b31f1a5ada6275fdc38f44
-rw-r--r--core/jni/android/graphics/BitmapFactory.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp
index 016c11e04d45..e83be24d9eaa 100644
--- a/core/jni/android/graphics/BitmapFactory.cpp
+++ b/core/jni/android/graphics/BitmapFactory.cpp
@@ -65,6 +65,7 @@ jstring getMimeTypeString(JNIEnv* env, SkImageDecoder::Format format) {
{ SkImageDecoder::kICO_Format, "image/x-ico" },
{ SkImageDecoder::kJPEG_Format, "image/jpeg" },
{ SkImageDecoder::kPNG_Format, "image/png" },
+ { SkImageDecoder::kWEBP_Format, "image/webp" },
{ SkImageDecoder::kWBMP_Format, "image/vnd.wap.wbmp" }
};