generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#863: typo fixed, minor changes in cpp generator

Browse Source
This commit is contained in:
Andrey Pavlenko 2011-07-01 15:58:16 +00:00
parent 2b83d416b0
commit ee10a38851
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/java/gen_java.py
View File

@ -277,7 +277,7 @@ public class %(module)s {
""" % {"module" : module}) """ % {"module" : module})
self.cpp_code.write( "\n".join(['#include "opencv2/%s/%s"' % (module, os.path.basename(f)) \ self.cpp_code.write( "\n".join(['#include "opencv2/%s/%s"' % (module, os.path.basename(f)) \
for f in srcfiles]) ) for f in srcfiles]) )
self.cpp_code.write("\n\n") self.cpp_code.write('\n\nextern "C" {\n\n')
# step 2: generate the code for global constants # step 2: generate the code for global constants
self.gen_consts() self.gen_consts()
@ -288,8 +288,9 @@ public class %(module)s {
# step 4: generate code for the classes # step 4: generate code for the classes
#self.gen_classes() # !!! tempory disabled !!! #self.gen_classes() # !!! tempory disabled !!!
# java module tail # module tail
self.java_code.write("}\n") self.java_code.write("}\n")
self.cpp_code.write('} // extern "C"\n')
self.save(output_path, module+".java", self.java_code) self.save(output_path, module+".java", self.java_code)
self.save(output_path, module+".cpp", self.cpp_code) self.save(output_path, module+".cpp", self.cpp_code)
@ -449,16 +450,6 @@ public class %(module)s {
rtype = type_dict[fi.ctype]["jni_type"] rtype = type_dict[fi.ctype]["jni_type"]
self.cpp_code.write ( Template( \ self.cpp_code.write ( Template( \
""" """
#ifdef __cplusplus
extern "C" {
#endif
JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_$fname
($args);
#ifdef __cplusplus
}
#endif
JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_$fname JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_$fname
($args) ($args)
@ -468,6 +459,7 @@ JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_$fname
$ret( $cvname( $cvargs ) ); $ret( $cvname( $cvargs ) );
} }
""" ).substitute( \ """ ).substitute( \
rtype = rtype, \ rtype = rtype, \
module = self.module, \ module = self.module, \

2
modules/java/src/java/Mat.java
View File

@ -394,7 +394,7 @@ public class Mat {
} }
// native stuff // native stuff
static { System.loadLibrary("opencv_java"); ); } static { System.loadLibrary("opencv_java"); }
protected long nativeObj; protected long nativeObj;
private static native long nCreateMat(); private static native long nCreateMat();
private static native long nCreateMat(int rows, int cols, int type); private static native long nCreateMat(int rows, int cols, int type);