mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-27 20:50:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

adding more version-related variables

Browse Source
This commit is contained in:
Andrey Pavlenko 2013-02-28 16:56:53 +04:00
parent 29b763dc60
commit c24d7cc066
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -739,8 +739,9 @@ public class %(jc)s {
# version_suffix = version_suffix[0 : -1]
self.classes[class_name].imports.add("java.lang.String")
self.java_code[class_name]["j_code"].write("""
public static final String VERSION = "%(v)s", VERSION_SUFFIX = "%(vs)s";
""" % { 'v' : version_str, 'vs' : version_suffix } )
public static final String VERSION = "%(v)s", NATIVE_LIBRARY_NAME = "opencv_java%(vs)s";
public static final int VERSION_EPOCH = %(ep)s, VERSION_MAJOR = %(ma)s, VERSION_MINOR = %(mi)s, VERSION_PATCH = %(pa)s;
""" % { 'v' : version_str, 'vs' : version_suffix, 'ep' : epoch, 'ma' : major, 'mi' : minor, 'pa' : patch } )
def add_class(self, decl):

2
samples/java/ant/src/SimpleSample.java
View File

@ -5,7 +5,7 @@ import org.opencv.core.Scalar;
class SimpleSample {
static{ System.loadLibrary("opencv_java" + Core.VERSION_SUFFIX); }
static{ System.loadLibrary(Core.NATIVE_LIBRARY_NAME); }
public static void main(String[] args) {
System.out.println("Welcome to OpenCV " + Core.VERSION);

2
samples/java/eclipse/HelloCV/src/Main.java
View File

@ -6,7 +6,7 @@ public class Main {
public static void main(String[] args) {
System.out.println("Welcome to OpenCV " + Core.VERSION);
System.loadLibrary("opencv_java" + Core.VERSION_SUFFIX);
System.loadLibrary(Core.NATIVE_LIBRARY_NAME);
Mat m = Mat.eye(3, 3, CvType.CV_8UC1);
System.out.println("m = " + m.dump());
}

2
samples/java/sbt/src/main/scala/Main.scala
View File

@ -15,7 +15,7 @@ object Main extends App {
// We must load the native library before using any OpenCV functions.
// You must load this library _exactly once_ per Java invocation.
// If you load it more than once, you will get a java.lang.UnsatisfiedLinkError.
System.loadLibrary("opencv_java" + Core.VERSION_SUFFIX)
System.loadLibrary(Core.NATIVE_LIBRARY_NAME)
ScalaCorrespondenceMatchingDemo.run()
ScalaDetectFaceDemo.run()