added new arm libs, changed addLibraryPath to prepend additional paths

atduskgreg · Nov 4, 2014 · 91ff4be · 91ff4be
1 parent 44034f9
commit 91ff4be
Show file tree

Hide file tree

Showing 68 changed files with 3 additions and 2 deletions.
diff --git a/lib/arm7/cv2.so b/lib/arm7/cv2.so
diff --git a/lib/arm7/libopencv_calib3d.so.2.4.5 b/lib/arm7/libopencv_calib3d.so.2.4.5
diff --git a/lib/arm7/libopencv_calib3d_pch_dephelp.a b/lib/arm7/libopencv_calib3d_pch_dephelp.a
diff --git a/lib/arm7/libopencv_contrib.so.2.4.5 b/lib/arm7/libopencv_contrib.so.2.4.5
diff --git a/lib/arm7/libopencv_contrib_pch_dephelp.a b/lib/arm7/libopencv_contrib_pch_dephelp.a
diff --git a/lib/arm7/libopencv_core.so.2.4.5 b/lib/arm7/libopencv_core.so.2.4.5
diff --git a/lib/arm7/libopencv_core_pch_dephelp.a b/lib/arm7/libopencv_core_pch_dephelp.a
diff --git a/lib/arm7/libopencv_features2d.so.2.4.5 b/lib/arm7/libopencv_features2d.so.2.4.5
diff --git a/lib/arm7/libopencv_features2d_pch_dephelp.a b/lib/arm7/libopencv_features2d_pch_dephelp.a
diff --git a/lib/arm7/libopencv_flann.so.2.4.5 b/lib/arm7/libopencv_flann.so.2.4.5
diff --git a/lib/arm7/libopencv_flann_pch_dephelp.a b/lib/arm7/libopencv_flann_pch_dephelp.a
diff --git a/lib/arm7/libopencv_gpu.so.2.4.5 b/lib/arm7/libopencv_gpu.so.2.4.5
diff --git a/lib/arm7/libopencv_gpu_pch_dephelp.a b/lib/arm7/libopencv_gpu_pch_dephelp.a
diff --git a/lib/arm7/libopencv_haartraining_engine.a b/lib/arm7/libopencv_haartraining_engine.a
diff --git a/lib/arm7/libopencv_highgui.so.2.4.5 b/lib/arm7/libopencv_highgui.so.2.4.5
diff --git a/lib/arm7/libopencv_highgui_pch_dephelp.a b/lib/arm7/libopencv_highgui_pch_dephelp.a
diff --git a/lib/arm7/libopencv_imgproc.so.2.4.5 b/lib/arm7/libopencv_imgproc.so.2.4.5
diff --git a/lib/arm7/libopencv_imgproc_pch_dephelp.a b/lib/arm7/libopencv_imgproc_pch_dephelp.a
diff --git a/lib/arm7/libopencv_java245.so b/lib/arm7/libopencv_java245.so
diff --git a/lib/arm7/libopencv_legacy.so.2.4.5 b/lib/arm7/libopencv_legacy.so.2.4.5
diff --git a/lib/arm7/libopencv_legacy_pch_dephelp.a b/lib/arm7/libopencv_legacy_pch_dephelp.a
diff --git a/lib/arm7/libopencv_ml.so.2.4.5 b/lib/arm7/libopencv_ml.so.2.4.5
diff --git a/lib/arm7/libopencv_ml_pch_dephelp.a b/lib/arm7/libopencv_ml_pch_dephelp.a
diff --git a/lib/arm7/libopencv_nonfree.so.2.4.5 b/lib/arm7/libopencv_nonfree.so.2.4.5
diff --git a/lib/arm7/libopencv_nonfree_pch_dephelp.a b/lib/arm7/libopencv_nonfree_pch_dephelp.a
diff --git a/lib/arm7/libopencv_objdetect.so.2.4.5 b/lib/arm7/libopencv_objdetect.so.2.4.5
diff --git a/lib/arm7/libopencv_objdetect_pch_dephelp.a b/lib/arm7/libopencv_objdetect_pch_dephelp.a
diff --git a/lib/arm7/libopencv_perf_calib3d_pch_dephelp.a b/lib/arm7/libopencv_perf_calib3d_pch_dephelp.a
diff --git a/lib/arm7/libopencv_perf_core_pch_dephelp.a b/lib/arm7/libopencv_perf_core_pch_dephelp.a
diff --git a/lib/arm7/libopencv_perf_features2d_pch_dephelp.a b/lib/arm7/libopencv_perf_features2d_pch_dephelp.a
diff --git a/lib/arm7/libopencv_perf_gpu_pch_dephelp.a b/lib/arm7/libopencv_perf_gpu_pch_dephelp.a
diff --git a/lib/arm7/libopencv_perf_highgui_pch_dephelp.a b/lib/arm7/libopencv_perf_highgui_pch_dephelp.a
diff --git a/lib/arm7/libopencv_perf_imgproc_pch_dephelp.a b/lib/arm7/libopencv_perf_imgproc_pch_dephelp.a
diff --git a/lib/arm7/libopencv_perf_nonfree_pch_dephelp.a b/lib/arm7/libopencv_perf_nonfree_pch_dephelp.a
diff --git a/lib/arm7/libopencv_perf_objdetect_pch_dephelp.a b/lib/arm7/libopencv_perf_objdetect_pch_dephelp.a
diff --git a/lib/arm7/libopencv_perf_photo_pch_dephelp.a b/lib/arm7/libopencv_perf_photo_pch_dephelp.a
diff --git a/lib/arm7/libopencv_perf_stitching_pch_dephelp.a b/lib/arm7/libopencv_perf_stitching_pch_dephelp.a
diff --git a/lib/arm7/libopencv_perf_superres_pch_dephelp.a b/lib/arm7/libopencv_perf_superres_pch_dephelp.a
diff --git a/lib/arm7/libopencv_perf_video_pch_dephelp.a b/lib/arm7/libopencv_perf_video_pch_dephelp.a
diff --git a/lib/arm7/libopencv_photo.so.2.4.5 b/lib/arm7/libopencv_photo.so.2.4.5
diff --git a/lib/arm7/libopencv_photo_pch_dephelp.a b/lib/arm7/libopencv_photo_pch_dephelp.a
diff --git a/lib/arm7/libopencv_stitching.so.2.4.5 b/lib/arm7/libopencv_stitching.so.2.4.5
diff --git a/lib/arm7/libopencv_stitching_pch_dephelp.a b/lib/arm7/libopencv_stitching_pch_dephelp.a
diff --git a/lib/arm7/libopencv_superres.so.2.4.5 b/lib/arm7/libopencv_superres.so.2.4.5
diff --git a/lib/arm7/libopencv_superres_pch_dephelp.a b/lib/arm7/libopencv_superres_pch_dephelp.a
diff --git a/lib/arm7/libopencv_test_calib3d_pch_dephelp.a b/lib/arm7/libopencv_test_calib3d_pch_dephelp.a
diff --git a/lib/arm7/libopencv_test_contrib_pch_dephelp.a b/lib/arm7/libopencv_test_contrib_pch_dephelp.a
diff --git a/lib/arm7/libopencv_test_core_pch_dephelp.a b/lib/arm7/libopencv_test_core_pch_dephelp.a
diff --git a/lib/arm7/libopencv_test_features2d_pch_dephelp.a b/lib/arm7/libopencv_test_features2d_pch_dephelp.a
diff --git a/lib/arm7/libopencv_test_flann_pch_dephelp.a b/lib/arm7/libopencv_test_flann_pch_dephelp.a
diff --git a/lib/arm7/libopencv_test_gpu_pch_dephelp.a b/lib/arm7/libopencv_test_gpu_pch_dephelp.a
diff --git a/lib/arm7/libopencv_test_highgui_pch_dephelp.a b/lib/arm7/libopencv_test_highgui_pch_dephelp.a
diff --git a/lib/arm7/libopencv_test_imgproc_pch_dephelp.a b/lib/arm7/libopencv_test_imgproc_pch_dephelp.a
diff --git a/lib/arm7/libopencv_test_legacy_pch_dephelp.a b/lib/arm7/libopencv_test_legacy_pch_dephelp.a
diff --git a/lib/arm7/libopencv_test_ml_pch_dephelp.a b/lib/arm7/libopencv_test_ml_pch_dephelp.a
diff --git a/lib/arm7/libopencv_test_nonfree_pch_dephelp.a b/lib/arm7/libopencv_test_nonfree_pch_dephelp.a
diff --git a/lib/arm7/libopencv_test_objdetect_pch_dephelp.a b/lib/arm7/libopencv_test_objdetect_pch_dephelp.a
diff --git a/lib/arm7/libopencv_test_photo_pch_dephelp.a b/lib/arm7/libopencv_test_photo_pch_dephelp.a
diff --git a/lib/arm7/libopencv_test_stitching_pch_dephelp.a b/lib/arm7/libopencv_test_stitching_pch_dephelp.a
diff --git a/lib/arm7/libopencv_test_superres_pch_dephelp.a b/lib/arm7/libopencv_test_superres_pch_dephelp.a
diff --git a/lib/arm7/libopencv_test_video_pch_dephelp.a b/lib/arm7/libopencv_test_video_pch_dephelp.a
diff --git a/lib/arm7/libopencv_ts.so.2.4.5 b/lib/arm7/libopencv_ts.so.2.4.5
diff --git a/lib/arm7/libopencv_ts_pch_dephelp.a b/lib/arm7/libopencv_ts_pch_dephelp.a
diff --git a/lib/arm7/libopencv_video.so.2.4.5 b/lib/arm7/libopencv_video.so.2.4.5
diff --git a/lib/arm7/libopencv_video_pch_dephelp.a b/lib/arm7/libopencv_video_pch_dephelp.a
diff --git a/lib/arm7/libopencv_videostab.so.2.4.5 b/lib/arm7/libopencv_videostab.so.2.4.5
diff --git a/lib/arm7/libopencv_videostab_pch_dephelp.a b/lib/arm7/libopencv_videostab_pch_dephelp.a
diff --git a/src/gab/opencv/OpenCV.java b/src/gab/opencv/OpenCV.java
@@ -430,7 +430,8 @@ private void initNative(){
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
-		    	System.loadLibrary("opencv_java245"); 	
+		    	System.out.println(System.getProperty("java.library.path"));
+		    	System.loadLibrary("opencv_java245");
 	    	}
 	    	else{
 	    		 System.err.println("Cannot load local version of opencv_java245  : Linux 32/64, Windows 32 bits or Mac Os 64 bits are only avaible");
@@ -442,7 +443,7 @@ private void initNative(){
     private void addLibraryPath(String path) throws Exception {
     	System.out.println("Adding libarary path: " + path);
         String originalPath = System.getProperty("java.library.path");
-    	System.setProperty("java.library.path", originalPath +System.getProperty("path.separator")+ path);
+    	System.setProperty("java.library.path", path + System.getProperty("path.separator") + originalPath);
 
         //set sys_paths to null
         final Field sysPathsField = ClassLoader.class.getDeclaredField("sys_paths");