From: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Thu, 28 Feb 2013 12:24:52 +0000 (+0400)
Subject: updating samples to load JNI lib with correct suffix
X-Git-Tag: accepted/2.0/20130307.220821~22^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29b763dc60c25f08ea188cac1f809cedaf9c8d28;p=profile%2Fivi%2Fopencv.git

updating samples to load JNI lib with correct suffix
---

diff --git a/samples/java/ant/src/SimpleSample.java b/samples/java/ant/src/SimpleSample.java
index 990536f..fb8be46 100644
--- a/samples/java/ant/src/SimpleSample.java
+++ b/samples/java/ant/src/SimpleSample.java
@@ -1,12 +1,14 @@
+import org.opencv.core.Core;
 import org.opencv.core.Mat;
 import org.opencv.core.CvType;
 import org.opencv.core.Scalar;
 
 class SimpleSample {
 
-  static{ System.loadLibrary("opencv_java244"); }
+  static{ System.loadLibrary("opencv_java" + Core.VERSION_SUFFIX); }
 
   public static void main(String[] args) {
+    System.out.println("Welcome to OpenCV " + Core.VERSION);
     Mat m = new Mat(5, 10, CvType.CV_8UC1, new Scalar(0));
     System.out.println("OpenCV Mat: " + m);
     Mat mr1 = m.row(1);
diff --git a/samples/java/eclipse/HelloCV/src/Main.java b/samples/java/eclipse/HelloCV/src/Main.java
index 0e9bb58..18d4b3d 100644
--- a/samples/java/eclipse/HelloCV/src/Main.java
+++ b/samples/java/eclipse/HelloCV/src/Main.java
@@ -1,10 +1,12 @@
+import org.opencv.core.Core;
 import org.opencv.core.CvType;
 import org.opencv.core.Mat;
 
 public class Main {
 
     public static void main(String[] args) {
-        System.loadLibrary("opencv_java244");
+        System.out.println("Welcome to OpenCV " + Core.VERSION);
+        System.loadLibrary("opencv_java" + Core.VERSION_SUFFIX);
         Mat m  = Mat.eye(3, 3, CvType.CV_8UC1);
         System.out.println("m = " + m.dump());
     }
diff --git a/samples/java/sbt/src/main/scala/Main.scala b/samples/java/sbt/src/main/scala/Main.scala
index 4a68d14..f2de5c3 100644
--- a/samples/java/sbt/src/main/scala/Main.scala
+++ b/samples/java/sbt/src/main/scala/Main.scala
@@ -8,11 +8,14 @@
  * You're invited to submit your own examples, in any JVM language of
  * your choosing so long as you can get them to build.
  */
+
+import org.opencv.core.Core
+
 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")
+  System.loadLibrary("opencv_java" + Core.VERSION_SUFFIX)
 
   ScalaCorrespondenceMatchingDemo.run()
   ScalaDetectFaceDemo.run()