Merge branch 'master' of https://github.com/atduskgreg/opencv-processing

Author: atduskgreg

.classpath

@@ -3,6 +3,6 @@
 	<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="lib/opencv-245.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

examples/ColorChannels/ColorChannels.pde

@@ -6,7 +6,7 @@ PImage src, r, g, b, h, s, v;
 int imgH, imgW;
 
 void setup() {
-  src = loadImage("testImage.png");
+  src = loadImage("green_object.png");
   opencv = new OpenCV(this, src);  
   size(int(opencv.width*1.5), int(opencv.height * 1.5), P2D);
 

lib/linux32/libopencv_calib3d.so

@@ -0,0 +1 @@
+libopencv_calib3d.so.2.4

lib/linux32/libopencv_calib3d.so.2.4

@@ -0,0 +1 @@
+libopencv_calib3d.so.2.4.5

lib/linux32/libopencv_calib3d.so.2.4.5

@@ -0,0 +1 @@
+libopencv_contrib.so.2.4

lib/linux32/libopencv_contrib.so

@@ -0,0 +1 @@
+libopencv_contrib.so.2.4.5

lib/linux32/libopencv_contrib.so.2.4

@@ -0,0 +1 @@
+libopencv_core.so.2.4

lib/linux32/libopencv_contrib.so.2.4.5

@@ -0,0 +1 @@
+libopencv_core.so.2.4.5