Merged the trunk r8901:8904

2012-07-02 13:46:47 +00:00
parent 721c24bc1f
commit af912f4843
9 changed files with 458 additions and 8 deletions
--- a/modules/java/generator/src/java/android+Utils.java
+++ b/modules/java/generator/src/java/android+Utils.java
@@ -133,11 +133,6 @@ public class Utils {
    }
    
    
-    // native stuff
-    static {
-        System.loadLibrary("opencv_java");
-    }
-
    private static native void nBitmapToMat2(Bitmap b, long m_addr, boolean unPremultiplyAlpha);

    private static native void nMatToBitmap2(long m_addr, Bitmap b, boolean premultiplyAlpha);