Commit 779f4e39 authored by Andrey Pavlenko's avatar Andrey Pavlenko

adding JNI func-s declarations to eliminate build warnings inside Android tree

parent 2c786a47
...@@ -1248,6 +1248,7 @@ extern "C" { ...@@ -1248,6 +1248,7 @@ extern "C" {
clazz = self.classes[fi.classname].jname clazz = self.classes[fi.classname].jname
cpp_code.write ( Template( \ cpp_code.write ( Template( \
""" """
JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_${clazz}_$fname ($argst);
JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_${clazz}_$fname JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_${clazz}_$fname
($args) ($args)
...@@ -1278,7 +1279,8 @@ JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_${clazz}_$fname ...@@ -1278,7 +1279,8 @@ JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_${clazz}_$fname
module = self.module, \ module = self.module, \
clazz = clazz.replace('_', '_1'), \ clazz = clazz.replace('_', '_1'), \
fname = (fi.jname + '_' + str(suffix_counter)).replace('_', '_1'), \ fname = (fi.jname + '_' + str(suffix_counter)).replace('_', '_1'), \
args = ", ".join(["%s %s" % (type_dict[a.ctype].get("jni_type"), a.name) for a in jni_args]), \ args = ", ".join(["%s %s" % (type_dict[a.ctype].get("jni_type"), a.name) for a in jni_args]), \
argst = ", ".join([type_dict[a.ctype].get("jni_type") for a in jni_args]), \
prologue = "\n ".join(c_prologue), \ prologue = "\n ".join(c_prologue), \
epilogue = " ".join(c_epilogue), \ epilogue = " ".join(c_epilogue), \
ret = ret, \ ret = ret, \
...@@ -1370,6 +1372,7 @@ JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_${clazz}_$fname ...@@ -1370,6 +1372,7 @@ JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_${clazz}_$fname
// native support for java finalize() // native support for java finalize()
// static void %(cls)s::delete( __int64 self ) // static void %(cls)s::delete( __int64 self )
// //
JNIEXPORT void JNICALL Java_org_opencv_%(module)s_%(j_cls)s_delete(JNIEnv*, jclass, jlong);
JNIEXPORT void JNICALL Java_org_opencv_%(module)s_%(j_cls)s_delete JNIEXPORT void JNICALL Java_org_opencv_%(module)s_%(j_cls)s_delete
(JNIEnv* env, jclass cls, jlong self) (JNIEnv* env, jclass cls, jlong self)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment