mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 06:03:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix build of java bindings on mingw

Browse Source
This commit is contained in:
Andrey Kamaev 2012-12-30 23:24:39 +04:00
parent 47df8f4c2a
commit da9089612a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/java/generator/gen_java.py
View File

@ -1243,6 +1243,10 @@ extern "C" {
jni_name = "&%(n)s" jni_name = "&%(n)s"
else: else:
jni_name = "%(n)s" jni_name = "%(n)s"
if not a.out and not "jni_var" in type_dict[a.ctype]:
# explicit cast to C type to avoid ambiguous call error on platforms (mingw)
# where jni types are different from native types (e.g. jint is not the same as int)
jni_name = "(%s)%s" % (a.ctype, jni_name)
if not a.ctype: # hidden if not a.ctype: # hidden
jni_name = a.defval jni_name = a.defval
cvargs.append( type_dict[a.ctype].get("jni_name", jni_name) % {"n" : a.name}) cvargs.append( type_dict[a.ctype].get("jni_name", jni_name) % {"n" : a.name})
@ -1267,8 +1271,7 @@ JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_${clazz}_$fname
LOGD("$module::$fname()"); LOGD("$module::$fname()");
$prologue $prologue
$retval$cvname( $cvargs ); $retval$cvname( $cvargs );
$epilogue $epilogue$ret
$ret
} catch(cv::Exception e) { } catch(cv::Exception e) {
LOGD("$module::$fname() catched cv::Exception: %s", e.what()); LOGD("$module::$fname() catched cv::Exception: %s", e.what());
jclass je = env->FindClass("org/opencv/core/CvException"); jclass je = env->FindClass("org/opencv/core/CvException");
@ -1292,7 +1295,7 @@ JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_${clazz}_$fname
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]), \ 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) + ("\n " if c_epilogue else ""), \
ret = ret, \ ret = ret, \
cvname = cvname, \ cvname = cvname, \
cvargs = ", ".join(cvargs), \ cvargs = ", ".join(cvargs), \