Merge "Fix several bad function definitions." (8f52fee0) · Commits · e / os / android_frameworks_base

core/jni/android/graphics/Canvas.cpp

+7 −6

Original line number	Diff line number	Diff line
		@@ -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;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);