Merge pull request #45 from P0ulp/master

Updated loading of native lib for the new processing 2.1 export mode …

Author: atduskgreg

.classpath

@@ -2,7 +2,8 @@
 <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="lib/opencv-245.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/processing-core"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/processing-opencv"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitignore

@@ -9,6 +9,7 @@ local.properties
 .settings/
 .loadpath
 distribution/*
+lib/
 
 # External tool builders
 .externalToolBuilders/

resources/build.properties

@@ -38,7 +38,7 @@ sketchbook.location=${user.home}/Documents/Processing/
 # Uncommenting the line below will overwrite the classpath.local.location from 
 # above.
 
-classpath.local.location=${user.home}/Documents/code/eclipse/libs
+classpath.local.location=${user.home}/Documents/eclipse/userLibraries/processing-core
 
 
 # Add all jar files that are required for compiling your project to the local 

src/gab/opencv/OpenCV.java

@@ -35,15 +35,13 @@
 import gab.opencv.Line;
 
 import java.awt.Rectangle;
-
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferInt;
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
-
+import java.io.File;
 import java.lang.reflect.Field;
 import java.net.URL;
-
 import java.util.ArrayList;
 import java.util.Collections;
 
@@ -62,9 +60,7 @@
 import org.opencv.calib3d.Calib3d;
 import org.opencv.core.CvException;
 import org.opencv.core.Core.MinMaxLocResult;
-
 import org.opencv.video.BackgroundSubtractorMOG;
-
 import org.opencv.objdetect.CascadeClassifier;
 import org.opencv.imgproc.Imgproc;
 
@@ -354,14 +350,24 @@ private void initNative(){
     	if(!nativeLoaded){
     		int bitsJVM = PApplet.parseInt(System.getProperty("sun.arch.data.model"));
 	    	String nativeLibPath = getLibPath() ;
+
 	    	if (PApplet.platform == PConstants.WINDOWS) { //platform Windows
-	          nativeLibPath = nativeLibPath + "windows" + bitsJVM; 
+	    		 File path = new File(nativeLibPath + "windows" + bitsJVM);
+	    		 if (path.exists()) {
+	    		    nativeLibPath = nativeLibPath + "windows" + bitsJVM; 
+	    		 }
 	    	}
 	    	if (PApplet.platform == PConstants.MACOSX) { //platform Mac
-	    		nativeLibPath = nativeLibPath + "macosx" + bitsJVM;
+	    		 File path = new File(nativeLibPath + "macosx" + bitsJVM);
+	    		 if (path.exists()) {
+	    		    nativeLibPath = nativeLibPath + "macosx" + bitsJVM; 
+	    		 }
 	    	}
 	    	if (PApplet.platform == PConstants.LINUX) { //platform Linux
-	    		nativeLibPath = nativeLibPath + "linux" + bitsJVM;
+	    		File path = new File(nativeLibPath + "linux" + bitsJVM);
+	    		 if (path.exists()) {
+	    		    nativeLibPath = nativeLibPath + "linux" + bitsJVM; 
+	    		 }
 	    	}
 
 	    	if((PApplet.platform == PConstants.MACOSX && bitsJVM == 64) || (PApplet.platform == PConstants.WINDOWS && bitsJVM == 32) || (PApplet.platform == PConstants.LINUX)){