diff options
| author | Mike Reed <reed@google.com> | 2015-02-27 09:59:37 -0500 |
|---|---|---|
| committer | Mike Reed <reed@google.com> | 2015-02-27 10:52:21 -0500 |
| commit | 73f9c7d478010c9692ea46526e0dd5e91dc00299 (patch) | |
| tree | fcffd6a4e1b75149bb2d9b905b423f71e9f407d7 /core/jni | |
| parent | c94ea96cb77b27d93e675912b2420bd43ae9b8fe (diff) | |
| download | frameworks_base-73f9c7d478010c9692ea46526e0dd5e91dc00299.zip frameworks_base-73f9c7d478010c9692ea46526e0dd5e91dc00299.tar.gz frameworks_base-73f9c7d478010c9692ea46526e0dd5e91dc00299.tar.bz2 | |
don't reference (deprecated) kIgnore_SkAlphaType
Change-Id: I6c09845c48efc66a1057bc8db512b7567ade7e72
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_view_SurfaceControl.cpp | 4 | ||||
| -rw-r--r-- | core/jni/android_view_TextureView.cpp | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index 13c373f..a8355c2 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -150,7 +150,7 @@ static jobject nativeScreenshotBitmap(JNIEnv* env, jclass clazz, switch (screenshot->getFormat()) { case PIXEL_FORMAT_RGBX_8888: { screenshotInfo.fColorType = kRGBA_8888_SkColorType; - screenshotInfo.fAlphaType = kIgnore_SkAlphaType; + screenshotInfo.fAlphaType = kOpaque_SkAlphaType; break; } case PIXEL_FORMAT_RGBA_8888: { @@ -160,7 +160,7 @@ static jobject nativeScreenshotBitmap(JNIEnv* env, jclass clazz, } case PIXEL_FORMAT_RGB_565: { screenshotInfo.fColorType = kRGB_565_SkColorType; - screenshotInfo.fAlphaType = kIgnore_SkAlphaType; + screenshotInfo.fAlphaType = kOpaque_SkAlphaType; break; } default: { diff --git a/core/jni/android_view_TextureView.cpp b/core/jni/android_view_TextureView.cpp index 011c326..c2bd0b3 100644 --- a/core/jni/android_view_TextureView.cpp +++ b/core/jni/android_view_TextureView.cpp @@ -88,12 +88,15 @@ static inline SkImageInfo convertPixelFormat(const ANativeWindow_Buffer& buffer) case WINDOW_FORMAT_RGBX_8888: info.fColorType = kN32_SkColorType; info.fAlphaType = kOpaque_SkAlphaType; + break; case WINDOW_FORMAT_RGB_565: info.fColorType = kRGB_565_SkColorType; info.fAlphaType = kOpaque_SkAlphaType; + break; default: info.fColorType = kUnknown_SkColorType; - info.fAlphaType = kIgnore_SkAlphaType; + // switch to kUnknown_SkAlphaType when its in skia + info.fAlphaType = kOpaque_SkAlphaType; break; } return info; |