diff options
author | Narayan Kamath <narayan@google.com> | 2014-02-20 13:02:25 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-20 13:02:25 +0000 |
commit | c95ed62111e0b8aceda4322011ad019c28987cbc (patch) | |
tree | 50e6ae18e11c932363a69c8180b1a2b8cc6136da | |
parent | 520a5673fbe8bff90954045b24a361982861ef8d (diff) | |
parent | fca204a4b8771b800383c91465a48eb2cd8b3ba2 (diff) | |
download | frameworks_base-c95ed62111e0b8aceda4322011ad019c28987cbc.zip frameworks_base-c95ed62111e0b8aceda4322011ad019c28987cbc.tar.gz frameworks_base-c95ed62111e0b8aceda4322011ad019c28987cbc.tar.bz2 |
am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions."
* commit 'fca204a4b8771b800383c91465a48eb2cd8b3ba2':
Fix several bad function definitions.
-rw-r--r-- | core/jni/android/graphics/Canvas.cpp | 13 | ||||
-rw-r--r-- | core/jni/android_view_GLES20Canvas.cpp | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/core/jni/android/graphics/Canvas.cpp b/core/jni/android/graphics/Canvas.cpp index 89490bc..11089da 100644 --- a/core/jni/android/graphics/Canvas.cpp +++ b/core/jni/android/graphics/Canvas.cpp @@ -321,9 +321,10 @@ public: } static jboolean clipPath(JNIEnv* env, jobject, jlong canvasHandle, - SkPath* path, jint op) { + jlong pathHandle, jint op) { 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; } @@ -336,9 +337,9 @@ public: } static void setDrawFilter(JNIEnv* env, jobject, jlong canvasHandle, - SkDrawFilter* filter) { + jlong filterHandle) { SkCanvas* canvas = reinterpret_cast<SkCanvas*>(canvasHandle); - canvas->setDrawFilter(filter); + canvas->setDrawFilter(reinterpret_cast<SkDrawFilter*>(filterHandle)); } static jboolean quickReject__RectF(JNIEnv* env, jobject, jlong canvasHandle, @@ -350,9 +351,9 @@ public: } static jboolean quickReject__Path(JNIEnv* env, jobject, jlong canvasHandle, - SkPath* path) { + jlong pathHandle) { 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; } diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp index 86d5099..591ff77 100644 --- a/core/jni/android_view_GLES20Canvas.cpp +++ b/core/jni/android_view_GLES20Canvas.cpp @@ -214,9 +214,9 @@ static jint android_view_GLES20Canvas_callDrawGLFunction(JNIEnv* env, jobject cl } static void android_view_GLES20Canvas_detachFunctor(JNIEnv* env, - jobject clazz, jlong rendererHandle, jlong functorHandle) { - OpenGLRenderer* renderer = reinterpret_cast<OpenGLRenderer*>(rendererHandle); - Functor* functor = reinterpret_cast<Functor*>(functorHandle); + jobject clazz, jlong rendererPtr, jlong functorPtr) { + OpenGLRenderer* renderer = reinterpret_cast<OpenGLRenderer*>(rendererPtr); + Functor* functor = reinterpret_cast<Functor*>(functorPtr); renderer->detachFunctor(functor); } |