Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't reference (deprecated) kIgnore_SkAlphaType

Browse Source 
Change-Id: I6c09845c48efc66a1057bc8db512b7567ade7e72
This commit is contained in:
Mike Reed
2015-02-27 09:59:37 -05:00
parent c94ea96cb7
commit 73f9c7d478
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android_view_SurfaceControl.cpp
View File

@@ -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: {

5
core/jni/android_view_TextureView.cpp
View File

@@ -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;