From 2bd8b8100529c96c81c30f749f672f4caf775b04 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 1 Nov 2013 13:46:54 +0000 Subject: move SkImage::ColorType into SkColorType objective -- move clients over to SkImage tasks - use SkImageInfo instead of SkBitmap::Config - add support for colortables to SkImage - add drawImage to SkCanvas - return SkImage from readPixels This CL works towards the first task R=robertphillips@google.com Review URL: https://codereview.chromium.org/54363008 git-svn-id: http://skia.googlecode.com/svn/trunk@12077 2bbb7eff-a529-9590-31e7-b0007b416f81 --- platform_tools/android/examples/hello_skia_app/jni/helloskia.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'platform_tools') diff --git a/platform_tools/android/examples/hello_skia_app/jni/helloskia.cpp b/platform_tools/android/examples/hello_skia_app/jni/helloskia.cpp index 5e60439ed2..65f622883d 100644 --- a/platform_tools/android/examples/hello_skia_app/jni/helloskia.cpp +++ b/platform_tools/android/examples/hello_skia_app/jni/helloskia.cpp @@ -26,8 +26,8 @@ JNIEXPORT void JNICALL Java_com_example_HelloSkiaActivity_drawIntoBitmap(JNIEnv* AndroidBitmap_getInfo(env, dstBitmap, &dstInfo); AndroidBitmap_lockPixels(env, dstBitmap, &dstPixels); - SkImage::Info info = { - dstInfo.width, dstInfo.height, SkImage::kPMColor_ColorType,kPremul_SkAlphaType + SkImageInfo info = { + dstInfo.width, dstInfo.height, kPMColor_SkColorType, kPremul_SkAlphaType }; // Create a surface from the given bitmap -- cgit v1.2.3