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

am 05cebdc2: Merge "Fix several bad function definitions."

Browse Source 
* commit '05cebdc2abd05b0dca351306cb039245d50c67ae':
  Fix several bad function definitions.
This commit is contained in:
Narayan Kamath
2014-02-20 04:58:52 -08:00
committed by Android Git Automerger
parent b152473f46 05cebdc2ab
commit fca204a4b8
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -321,9 +321,10 @@ public:
} }
static jboolean clipPath(JNIEnv* env, jobject, jlong canvasHandle, static jboolean clipPath(JNIEnv* env, jobject, jlong canvasHandle,
SkPath* path, jint op) { jlong pathHandle, jint op) {
SkCanvas* canvas = reinterpret_cast<SkCanvas*>(canvasHandle); SkCanvas* canvas = reinterpret_cast<SkCanvas*>(canvasHandle);
bool result = canvas->clipPath(*path, static_cast<SkRegion::Op>(op)); bool result = canvas->clipPath(*reinterpret_cast<SkPath*>(pathHandle),
static_cast<SkRegion::Op>(op));
return result ? JNI_TRUE : JNI_FALSE; return result ? JNI_TRUE : JNI_FALSE;
} }
@@ -336,9 +337,9 @@ public:
} }
static void setDrawFilter(JNIEnv* env, jobject, jlong canvasHandle, static void setDrawFilter(JNIEnv* env, jobject, jlong canvasHandle,
SkDrawFilter* filter) { jlong filterHandle) {
SkCanvas* canvas = reinterpret_cast<SkCanvas*>(canvasHandle); SkCanvas* canvas = reinterpret_cast<SkCanvas*>(canvasHandle);
canvas->setDrawFilter(filter); canvas->setDrawFilter(reinterpret_cast<SkDrawFilter*>(filterHandle));
} }
static jboolean quickReject__RectF(JNIEnv* env, jobject, jlong canvasHandle, static jboolean quickReject__RectF(JNIEnv* env, jobject, jlong canvasHandle,
@@ -350,9 +351,9 @@ public:
} }
static jboolean quickReject__Path(JNIEnv* env, jobject, jlong canvasHandle, static jboolean quickReject__Path(JNIEnv* env, jobject, jlong canvasHandle,
SkPath* path) { jlong pathHandle) {
SkCanvas* canvas = reinterpret_cast<SkCanvas*>(canvasHandle); SkCanvas* canvas = reinterpret_cast<SkCanvas*>(canvasHandle);
bool result = canvas->quickReject(*path); bool result = canvas->quickReject(*reinterpret_cast<SkPath*>(pathHandle));
return result ? JNI_TRUE : JNI_FALSE; return result ? JNI_TRUE : JNI_FALSE;
} }

6
core/jni/android_view_GLES20Canvas.cpp
View File

@@ -214,9 +214,9 @@ static jint android_view_GLES20Canvas_callDrawGLFunction(JNIEnv* env, jobject cl
} }
static void android_view_GLES20Canvas_detachFunctor(JNIEnv* env, static void android_view_GLES20Canvas_detachFunctor(JNIEnv* env,
jobject clazz, jlong rendererHandle, jlong functorHandle) { jobject clazz, jlong rendererPtr, jlong functorPtr) {
OpenGLRenderer* renderer = reinterpret_cast<OpenGLRenderer*>(rendererHandle); OpenGLRenderer* renderer = reinterpret_cast<OpenGLRenderer*>(rendererPtr);
Functor* functor = reinterpret_cast<Functor*>(functorHandle); Functor* functor = reinterpret_cast<Functor*>(functorPtr);
renderer->detachFunctor(functor); renderer->detachFunctor(functor);
} }