diff options
author | Narayan Kamath <narayan@google.com> | 2014-10-14 12:44:22 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-14 12:44:22 +0000 |
commit | ab02f818aa312f0795152449c29cb994f72e4891 (patch) | |
tree | a069ad14eddba316b5db06c82e96d32fa01b7e5a | |
parent | af6e0b0c0cb946a4222d7f5bacc7bea11c33d814 (diff) | |
parent | 0037214648ffc810cd54c232b2026096e834a93a (diff) | |
download | neven-ab02f818aa312f0795152449c29cb994f72e4891.tar.gz |
am 00372146: Merge "Remove unused parameter"android-wear-5.0.0_r1lollipop-wear-release
* commit '0037214648ffc810cd54c232b2026096e834a93a':
Remove unused parameter
-rw-r--r-- | FaceDetector_jni.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/FaceDetector_jni.cpp b/FaceDetector_jni.cpp index 3744c49..7b44c75 100644 --- a/FaceDetector_jni.cpp +++ b/FaceDetector_jni.cpp @@ -254,7 +254,7 @@ detect(JNIEnv *_env, jobject _this, static void get_face(JNIEnv *_env, jobject _this, - jobject face, jint index) + jobject face, jint) { btk_HDCR hdcr = (btk_HDCR)(_env->GetLongField(_this, gFaceDetectorOffsets.dcr)); btk_HFaceFinder hfd = @@ -293,7 +293,7 @@ int register_android_media_FaceDetector(JNIEnv *_env) // --------------------------------------------------------------------------- -jint JNI_OnLoad(JavaVM* vm, void* reserved) +jint JNI_OnLoad(JavaVM* vm, void*) { JNIEnv* env = NULL; jint result = -1; |