Merge "Return DNG mimeType for the case kRAW_SkEncodedFormat" into nyc-dev

2016-03-17 13:30:44 +00:00
parent 3df6390d2b 990ea136b2
commit 3509b727d9
1 changed files with 3 additions and 0 deletions
--- a/core/jni/android/graphics/BitmapFactory.cpp
+++ b/core/jni/android/graphics/BitmapFactory.cpp
@@ -73,6 +73,9 @@ jstring encodedFormatToString(JNIEnv* env, SkEncodedFormat format) {
        case SkEncodedFormat::kWBMP_SkEncodedFormat:
            mimeType = "image/vnd.wap.wbmp";
            break;
+        case SkEncodedFormat::kRAW_SkEncodedFormat:
+            mimeType = "image/x-adobe-dng";
+            break;
        default:
            mimeType = nullptr;
            break;