From 47c0d4eaa926d979c5ea366934750526c20af8ff Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 22 Jun 2009 22:53:52 -0400 Subject: [PATCH] remove deprecated use of porterduff --- core/jni/android/graphics/Canvas.cpp | 3 ++- core/jni/android/graphics/ColorFilter.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/jni/android/graphics/Canvas.cpp b/core/jni/android/graphics/Canvas.cpp index 93d68cbfe0aea..c61b2ed8f43ec 100644 --- a/core/jni/android/graphics/Canvas.cpp +++ b/core/jni/android/graphics/Canvas.cpp @@ -23,6 +23,7 @@ #include "SkGLCanvas.h" #include "SkGraphics.h" #include "SkImageRef_GlobalPool.h" +#include "SkPorterDuff.h" #include "SkShader.h" #include "SkTemplates.h" @@ -324,7 +325,7 @@ public: static void drawColor__II(JNIEnv* env, jobject, SkCanvas* canvas, jint color, SkPorterDuff::Mode mode) { - canvas->drawColor(color, mode); + canvas->drawColor(color, SkPorterDuff::ToXfermodeMode(mode)); } static void drawPaint(JNIEnv* env, jobject, SkCanvas* canvas, diff --git a/core/jni/android/graphics/ColorFilter.cpp b/core/jni/android/graphics/ColorFilter.cpp index b6ec4a2ef4404..ebfb20929f5f9 100644 --- a/core/jni/android/graphics/ColorFilter.cpp +++ b/core/jni/android/graphics/ColorFilter.cpp @@ -21,6 +21,7 @@ #include "SkColorFilter.h" #include "SkColorMatrixFilter.h" +#include "SkPorterDuff.h" namespace android { @@ -32,8 +33,9 @@ public: } static SkColorFilter* CreatePorterDuffFilter(JNIEnv* env, jobject, - jint srcColor, SkPorterDuff::Mode porterDuffMode) { - return SkColorFilter::CreatePorterDuffFilter(srcColor, porterDuffMode); + jint srcColor, SkPorterDuff::Mode mode) { + return SkColorFilter::CreateModeFilter(srcColor, + SkPorterDuff::ToXfermodeMode(mode)); } static SkColorFilter* CreateLightingFilter(JNIEnv* env, jobject,