Merge branch '2.4'

2013-02-22 17:33:30 +04:00
parent 0ccdc5b4af e6dd4e840d
commit 0b8a6da817
47 changed files with 669 additions and 376 deletions
--- a/modules/java/generator/src/java/android+OpenCVLoader.java
+++ b/modules/java/generator/src/java/android+OpenCVLoader.java
@@ -17,6 +17,11 @@ public class OpenCVLoader
     */
    public static final String OPENCV_VERSION_2_4_3 = "2.4.3";

+    /**
+     * OpenCV Library version 2.4.4.
+     */
+    public static final String OPENCV_VERSION_2_4_4 = "2.4.4";
+
    /**
     * Loads and initializes OpenCV library from current application package. Roughly, it's an analog of system.loadLibrary("opencv_java").
     * @return Returns true is initialization of OpenCV was successful.