diff options
| -rw-r--r-- | core/jni/android/graphics/Canvas.cpp | 13 | ||||
| -rw-r--r-- | core/jni/android_view_GLES20Canvas.cpp | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/core/jni/android/graphics/Canvas.cpp b/core/jni/android/graphics/Canvas.cpp index 2cb28124f96e..e98d45b1eeba 100644 --- a/core/jni/android/graphics/Canvas.cpp +++ b/core/jni/android/graphics/Canvas.cpp @@ -327,9 +327,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; } @@ -342,9 +343,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, @@ -356,9 +357,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 1dc3630cbe9c..04e51bee09c4 100644 --- a/core/jni/android_view_GLES20Canvas.cpp +++ b/core/jni/android_view_GLES20Canvas.cpp @@ -210,7 +210,7 @@ static jint android_view_GLES20Canvas_callDrawGLFunction(JNIEnv* env, jobject cl } static void android_view_GLES20Canvas_detachFunctor(JNIEnv* env, - jobject clazz, jlong rendererPtr, jint functorPtr) { + jobject clazz, jlong rendererPtr, jlong functorPtr) { OpenGLRenderer* renderer = reinterpret_cast<OpenGLRenderer*>(rendererPtr); Functor* functor = reinterpret_cast<Functor*>(functorPtr); renderer->detachFunctor(functor); |