OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e969964
)
Add webp to BitmapFactory.Options outMimetype
author
Chris Craik
<ccraik@google.com>
Sat, 13 Jul 2013 02:46:19 +0000
(19:46 -0700)
committer
Chris Craik
<ccraik@google.com>
Sat, 13 Jul 2013 02:46:19 +0000
(19:46 -0700)
Change-Id: Id0d5b4d6c2c5b21fa0b31f1a5ada6275fdc38f44
core/jni/android/graphics/BitmapFactory.cpp
patch
|
blob
|
history
diff --git
a/core/jni/android/graphics/BitmapFactory.cpp
b/core/jni/android/graphics/BitmapFactory.cpp
index
016c11e
..
e83be24
100644
(file)
--- 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" }
};