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

Merge change 5045

Browse Source 
* changes:
  remove deprecated use of porterduff
This commit is contained in:
Android (Google) Code Review
2009-06-23 06:48:32 -07:00
parent 1b28d26ae9 47c0d4eaa9
commit 89c352cf44
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/jni/android/graphics/Canvas.cpp
View File

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

6
core/jni/android/graphics/ColorFilter.cpp
View File

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