linux64 support

arturoc · arturoc · commit 452390e3fa74 · 2013-09-25T20:14:44.000+02:00
diff --git a/.classpath b/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="/Users/p0/Documents/Eclipse/processing-libraries/core.jar"/>
-	<classpathentry kind="lib" path="/Users/p0/Documents/Eclipse/opencv-processing/lib/opencv-245.jar"/>
+	<classpathentry kind="lib" path="/home/arturo/Code/processing-2.0.3/core/library/core.jar"/>
+	<classpathentry kind="lib" path="lib/opencv-245.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/lib/linux64/libopencv_calib3d.so b/lib/linux64/libopencv_calib3d.so
@@ -0,0 +1 @@
+libopencv_calib3d.so.2.4
diff --git a/lib/linux64/libopencv_calib3d.so.2.4 b/lib/linux64/libopencv_calib3d.so.2.4
@@ -0,0 +1 @@
+libopencv_calib3d.so.2.4.5
diff --git a/lib/linux64/libopencv_calib3d.so.2.4.5 b/lib/linux64/libopencv_calib3d.so.2.4.5
diff --git a/lib/linux64/libopencv_contrib.so b/lib/linux64/libopencv_contrib.so
@@ -0,0 +1 @@
+libopencv_contrib.so.2.4
diff --git a/lib/linux64/libopencv_contrib.so.2.4 b/lib/linux64/libopencv_contrib.so.2.4
@@ -0,0 +1 @@
+libopencv_contrib.so.2.4.5
diff --git a/lib/linux64/libopencv_contrib.so.2.4.5 b/lib/linux64/libopencv_contrib.so.2.4.5
diff --git a/lib/linux64/libopencv_core.so b/lib/linux64/libopencv_core.so
@@ -0,0 +1 @@
+libopencv_core.so.2.4
diff --git a/lib/linux64/libopencv_core.so.2.4 b/lib/linux64/libopencv_core.so.2.4
@@ -0,0 +1 @@
+libopencv_core.so.2.4.5
diff --git a/lib/linux64/libopencv_core.so.2.4.5 b/lib/linux64/libopencv_core.so.2.4.5
diff --git a/lib/linux64/libopencv_features2d.so b/lib/linux64/libopencv_features2d.so
@@ -0,0 +1 @@
+libopencv_features2d.so.2.4
diff --git a/lib/linux64/libopencv_features2d.so.2.4 b/lib/linux64/libopencv_features2d.so.2.4
@@ -0,0 +1 @@
+libopencv_features2d.so.2.4.5
diff --git a/lib/linux64/libopencv_features2d.so.2.4.5 b/lib/linux64/libopencv_features2d.so.2.4.5
diff --git a/lib/linux64/libopencv_flann.so b/lib/linux64/libopencv_flann.so
@@ -0,0 +1 @@
+libopencv_flann.so.2.4
diff --git a/lib/linux64/libopencv_flann.so.2.4 b/lib/linux64/libopencv_flann.so.2.4
@@ -0,0 +1 @@
+libopencv_flann.so.2.4.5
diff --git a/lib/linux64/libopencv_flann.so.2.4.5 b/lib/linux64/libopencv_flann.so.2.4.5
diff --git a/lib/linux64/libopencv_gpu.so b/lib/linux64/libopencv_gpu.so
@@ -0,0 +1 @@
+libopencv_gpu.so.2.4
diff --git a/lib/linux64/libopencv_gpu.so.2.4 b/lib/linux64/libopencv_gpu.so.2.4
@@ -0,0 +1 @@
+libopencv_gpu.so.2.4.5
diff --git a/lib/linux64/libopencv_gpu.so.2.4.5 b/lib/linux64/libopencv_gpu.so.2.4.5
diff --git a/lib/linux64/libopencv_highgui.so b/lib/linux64/libopencv_highgui.so
@@ -0,0 +1 @@
+libopencv_highgui.so.2.4
diff --git a/lib/linux64/libopencv_highgui.so.2.4 b/lib/linux64/libopencv_highgui.so.2.4
@@ -0,0 +1 @@
+libopencv_highgui.so.2.4.5
diff --git a/lib/linux64/libopencv_highgui.so.2.4.5 b/lib/linux64/libopencv_highgui.so.2.4.5
diff --git a/lib/linux64/libopencv_imgproc.so b/lib/linux64/libopencv_imgproc.so
@@ -0,0 +1 @@
+libopencv_imgproc.so.2.4
diff --git a/lib/linux64/libopencv_imgproc.so.2.4 b/lib/linux64/libopencv_imgproc.so.2.4
@@ -0,0 +1 @@
+libopencv_imgproc.so.2.4.5
diff --git a/lib/linux64/libopencv_imgproc.so.2.4.5 b/lib/linux64/libopencv_imgproc.so.2.4.5
diff --git a/lib/linux64/libopencv_java245.so b/lib/linux64/libopencv_java245.so
diff --git a/lib/linux64/libopencv_legacy.so b/lib/linux64/libopencv_legacy.so
@@ -0,0 +1 @@
+libopencv_legacy.so.2.4
diff --git a/lib/linux64/libopencv_legacy.so.2.4 b/lib/linux64/libopencv_legacy.so.2.4
@@ -0,0 +1 @@
+libopencv_legacy.so.2.4.5
diff --git a/lib/linux64/libopencv_legacy.so.2.4.5 b/lib/linux64/libopencv_legacy.so.2.4.5
diff --git a/lib/linux64/libopencv_ml.so b/lib/linux64/libopencv_ml.so
@@ -0,0 +1 @@
+libopencv_ml.so.2.4
diff --git a/lib/linux64/libopencv_ml.so.2.4 b/lib/linux64/libopencv_ml.so.2.4
@@ -0,0 +1 @@
+libopencv_ml.so.2.4.5
diff --git a/lib/linux64/libopencv_ml.so.2.4.5 b/lib/linux64/libopencv_ml.so.2.4.5
diff --git a/lib/linux64/libopencv_nonfree.so b/lib/linux64/libopencv_nonfree.so
@@ -0,0 +1 @@
+libopencv_nonfree.so.2.4
diff --git a/lib/linux64/libopencv_nonfree.so.2.4 b/lib/linux64/libopencv_nonfree.so.2.4
@@ -0,0 +1 @@
+libopencv_nonfree.so.2.4.5
diff --git a/lib/linux64/libopencv_nonfree.so.2.4.5 b/lib/linux64/libopencv_nonfree.so.2.4.5
diff --git a/lib/linux64/libopencv_objdetect.so b/lib/linux64/libopencv_objdetect.so
@@ -0,0 +1 @@
+libopencv_objdetect.so.2.4
diff --git a/lib/linux64/libopencv_objdetect.so.2.4 b/lib/linux64/libopencv_objdetect.so.2.4
@@ -0,0 +1 @@
+libopencv_objdetect.so.2.4.5
diff --git a/lib/linux64/libopencv_objdetect.so.2.4.5 b/lib/linux64/libopencv_objdetect.so.2.4.5
diff --git a/lib/linux64/libopencv_photo.so b/lib/linux64/libopencv_photo.so
@@ -0,0 +1 @@
+libopencv_photo.so.2.4
diff --git a/lib/linux64/libopencv_photo.so.2.4 b/lib/linux64/libopencv_photo.so.2.4
@@ -0,0 +1 @@
+libopencv_photo.so.2.4.5
diff --git a/lib/linux64/libopencv_photo.so.2.4.5 b/lib/linux64/libopencv_photo.so.2.4.5
diff --git a/lib/linux64/libopencv_stitching.so b/lib/linux64/libopencv_stitching.so
@@ -0,0 +1 @@
+libopencv_stitching.so.2.4
diff --git a/lib/linux64/libopencv_stitching.so.2.4 b/lib/linux64/libopencv_stitching.so.2.4
@@ -0,0 +1 @@
+libopencv_stitching.so.2.4.5
diff --git a/lib/linux64/libopencv_stitching.so.2.4.5 b/lib/linux64/libopencv_stitching.so.2.4.5
diff --git a/lib/linux64/libopencv_superres.so b/lib/linux64/libopencv_superres.so
@@ -0,0 +1 @@
+libopencv_superres.so.2.4
diff --git a/lib/linux64/libopencv_superres.so.2.4 b/lib/linux64/libopencv_superres.so.2.4
@@ -0,0 +1 @@
+libopencv_superres.so.2.4.5
diff --git a/lib/linux64/libopencv_superres.so.2.4.5 b/lib/linux64/libopencv_superres.so.2.4.5
diff --git a/lib/linux64/libopencv_ts.so b/lib/linux64/libopencv_ts.so
@@ -0,0 +1 @@
+libopencv_ts.so.2.4
diff --git a/lib/linux64/libopencv_ts.so.2.4 b/lib/linux64/libopencv_ts.so.2.4
@@ -0,0 +1 @@
+libopencv_ts.so.2.4.5
diff --git a/lib/linux64/libopencv_ts.so.2.4.5 b/lib/linux64/libopencv_ts.so.2.4.5
diff --git a/lib/linux64/libopencv_video.so b/lib/linux64/libopencv_video.so
@@ -0,0 +1 @@
+libopencv_video.so.2.4
diff --git a/lib/linux64/libopencv_video.so.2.4 b/lib/linux64/libopencv_video.so.2.4
@@ -0,0 +1 @@
+libopencv_video.so.2.4.5
diff --git a/lib/linux64/libopencv_video.so.2.4.5 b/lib/linux64/libopencv_video.so.2.4.5
diff --git a/lib/linux64/libopencv_videostab.so b/lib/linux64/libopencv_videostab.so
@@ -0,0 +1 @@
+libopencv_videostab.so.2.4
diff --git a/lib/linux64/libopencv_videostab.so.2.4 b/lib/linux64/libopencv_videostab.so.2.4
@@ -0,0 +1 @@
+libopencv_videostab.so.2.4.5
diff --git a/lib/linux64/libopencv_videostab.so.2.4.5 b/lib/linux64/libopencv_videostab.so.2.4.5
diff --git a/src/gab/opencv/OpenCV.java b/src/gab/opencv/OpenCV.java
@@ -334,7 +334,7 @@ private String getLibPath() {
             
 
           n1 = path.indexOf("opencv_processing.jar");
-          if (PApplet.platform == 1) { //platform Windows
+          if (PApplet.platform == PConstants.WINDOWS) { //platform Windows
             // In Windows, path string starts with "jar file/C:/..."
             // so the substring up to the first / is removed.
             n0++;
@@ -354,14 +354,17 @@ private void initNative(){
     	if(!nativeLoaded){
     		int bitsJVM = PApplet.parseInt(System.getProperty("sun.arch.data.model"));
 	    	String nativeLibPath = getLibPath() ;
-	    	if (PApplet.platform == 1) { //platform Windows
+	    	if (PApplet.platform == PConstants.WINDOWS) { //platform Windows
 	          nativeLibPath = nativeLibPath + "windows" + bitsJVM; 
 	    	}
-	    	if (PApplet.platform == 2) { //platform Mac
+	    	if (PApplet.platform == PConstants.MACOSX) { //platform Mac
 	    		nativeLibPath = nativeLibPath + "macosx" + bitsJVM;
 	    	}
+	    	if (PApplet.platform == PConstants.LINUX) { //platform Linux
+	    		nativeLibPath = nativeLibPath + "linux" + bitsJVM;
+	    	}
 	    	
-	    	if((PApplet.platform == 2 && bitsJVM == 64) || (PApplet.platform == 1 && bitsJVM == 32)){
+	    	if((PApplet.platform == PConstants.MACOSX && bitsJVM == 64) || (PApplet.platform == PConstants.WINDOWS && bitsJVM == 32) || (PApplet.platform == PConstants.LINUX)){
 		    	try {
 					addLibraryPath(nativeLibPath);
 				} catch (Exception e) {
@@ -370,7 +373,7 @@ private void initNative(){
 		    	System.loadLibrary("opencv_java245"); 	
 	    	}
 	    	else{
-	    		 System.err.println("Cannot load local version of opencv_java245  : Windows 32 bits or Mac Os 64 bits are only avaible");
+	    		 System.err.println("Cannot load local version of opencv_java245  : Linux 32/64, Windows 32 bits or Mac Os 64 bits are only avaible");
 	    	}
     	}
     }
