removed forcing of arm7

jmwohl · jmwohl · commit 44034f9cc291 · 2014-11-04T10:25:10.000-05:00
diff --git a/src/gab/opencv/OpenCV.java b/src/gab/opencv/OpenCV.java
@@ -407,8 +407,7 @@ private void initNative(){
 					 isArm = true;
 				 }
 				 
-//				 path = isArm ? nativeLibPath + "arm7" : nativeLibPath + "linux" + bitsJVM;
-				 path = nativeLibPath + "arm7";
+				 path = isArm ? nativeLibPath + "arm7" : nativeLibPath + "linux" + bitsJVM;
 	    	}
 	    	
 	    	// ensure the determined path exists
@@ -423,7 +422,7 @@ private void initNative(){
 	    		e.printStackTrace();
 	    	}
 	    	
-	    	// this check might be redundant?
+	    	// this check might be redundant now...
 	    	if((PApplet.platform == PConstants.MACOSX && bitsJVM == 64) || (PApplet.platform == PConstants.WINDOWS) || (PApplet.platform == PConstants.LINUX)){
 		    	try {
 		    		System.out.println("Adding native libarary path: " + nativeLibPath);

Original file line number	Diff line number	Diff line change
`@@ -407,8 +407,7 @@ private void initNative(){`
`407`	`407`	`isArm = true;`
`408`	`408`	`}`
`409`	`409`
`410`		`-// path = isArm ? nativeLibPath + "arm7" : nativeLibPath + "linux" + bitsJVM;`
`411`		`- path = nativeLibPath + "arm7";`
	`410`	`+ path = isArm ? nativeLibPath + "arm7" : nativeLibPath + "linux" + bitsJVM;`
`412`	`411`	`}`
`413`	`412`
`414`	`413`	`// ensure the determined path exists`
`@@ -423,7 +422,7 @@ private void initNative(){`
`423`	`422`	`e.printStackTrace();`
`424`	`423`	`}`
`425`	`424`
`426`		`- // this check might be redundant?`
	`425`	`+ // this check might be redundant now...`
`427`	`426`	`if((PApplet.platform == PConstants.MACOSX && bitsJVM == 64) \|\| (PApplet.platform == PConstants.WINDOWS) \|\| (PApplet.platform == PConstants.LINUX)){`
`428`	`427`	`try {`
`429`	`428`	`System.out.println("Adding native libarary path: " + nativeLibPath);`