atduskgreg · EvansJahja · May 3, 2015 · May 4, 2015 · May 4, 2015 · May 5, 2015
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,5 @@ lib/
 .DS_Store
 *.DS_Store
 /bin
+*.ctxt
+*.class
diff --git a/examples/FindCircles/FindCircles.pde b/examples/FindCircles/FindCircles.pde
@@ -0,0 +1,29 @@
+import gab.opencv.*;
+
+OpenCV opencv;
+
+void setup() {
+  size(300*2, 400);
+  ellipseMode(RADIUS);
+
+  opencv = new OpenCV(this, 300, 400);
+
+}
+
+void draw() {
+  opencv.loadImage("sample.jpg");
+  image(opencv.getSnapshot(),0,0); 
+  image(loadImage("sample.jpg"),300,0);
+
+  ArrayList< ArrayList< Integer> > arr = opencv.findCircles();   
+
+  for (ArrayList<Integer> zx : arr)
+  {
+    ellipse(zx.get(0),zx.get(1),zx.get(2),zx.get(2)); //x, y, radius, radius (of the circle)
+  }
+
+  noFill();
+  stroke(0, 255, 0);
+  strokeWeight(3);
+
+}
diff --git a/examples/FindCircles/sample.jpg b/examples/FindCircles/sample.jpg
diff --git a/lib/.DS_Store b/lib/.DS_Store
diff --git a/lib/arm7/libopencv_calib3d.so b/lib/arm7/libopencv_calib3d.so
diff --git a/lib/arm7/libopencv_calib3d.so.2.4 b/lib/arm7/libopencv_calib3d.so.2.4
diff --git a/lib/arm7/libopencv_contrib.so b/lib/arm7/libopencv_contrib.so
diff --git a/lib/arm7/libopencv_contrib.so.2.4 b/lib/arm7/libopencv_contrib.so.2.4
diff --git a/lib/arm7/libopencv_core.so b/lib/arm7/libopencv_core.so
diff --git a/lib/arm7/libopencv_core.so.2.4 b/lib/arm7/libopencv_core.so.2.4
diff --git a/lib/arm7/libopencv_features2d.so b/lib/arm7/libopencv_features2d.so
diff --git a/lib/arm7/libopencv_features2d.so.2.4 b/lib/arm7/libopencv_features2d.so.2.4
diff --git a/lib/arm7/libopencv_flann.so b/lib/arm7/libopencv_flann.so
diff --git a/lib/arm7/libopencv_flann.so.2.4 b/lib/arm7/libopencv_flann.so.2.4
diff --git a/lib/arm7/libopencv_gpu.so b/lib/arm7/libopencv_gpu.so
diff --git a/lib/arm7/libopencv_gpu.so.2.4 b/lib/arm7/libopencv_gpu.so.2.4
diff --git a/lib/arm7/libopencv_highgui.so b/lib/arm7/libopencv_highgui.so
diff --git a/lib/arm7/libopencv_highgui.so.2.4 b/lib/arm7/libopencv_highgui.so.2.4
diff --git a/lib/arm7/libopencv_imgproc.so b/lib/arm7/libopencv_imgproc.so
diff --git a/lib/arm7/libopencv_imgproc.so.2.4 b/lib/arm7/libopencv_imgproc.so.2.4
diff --git a/lib/arm7/libopencv_legacy.so b/lib/arm7/libopencv_legacy.so
diff --git a/lib/arm7/libopencv_legacy.so.2.4 b/lib/arm7/libopencv_legacy.so.2.4
diff --git a/lib/arm7/libopencv_ml.so b/lib/arm7/libopencv_ml.so
diff --git a/lib/arm7/libopencv_ml.so.2.4 b/lib/arm7/libopencv_ml.so.2.4
diff --git a/lib/arm7/libopencv_nonfree.so b/lib/arm7/libopencv_nonfree.so
diff --git a/lib/arm7/libopencv_nonfree.so.2.4 b/lib/arm7/libopencv_nonfree.so.2.4
diff --git a/lib/arm7/libopencv_objdetect.so b/lib/arm7/libopencv_objdetect.so
diff --git a/lib/arm7/libopencv_objdetect.so.2.4 b/lib/arm7/libopencv_objdetect.so.2.4
diff --git a/lib/arm7/libopencv_photo.so b/lib/arm7/libopencv_photo.so
diff --git a/lib/arm7/libopencv_photo.so.2.4 b/lib/arm7/libopencv_photo.so.2.4
diff --git a/lib/arm7/libopencv_stitching.so b/lib/arm7/libopencv_stitching.so
diff --git a/lib/arm7/libopencv_stitching.so.2.4 b/lib/arm7/libopencv_stitching.so.2.4
diff --git a/lib/arm7/libopencv_superres.so b/lib/arm7/libopencv_superres.so
diff --git a/lib/arm7/libopencv_superres.so.2.4 b/lib/arm7/libopencv_superres.so.2.4
diff --git a/lib/arm7/libopencv_ts.so b/lib/arm7/libopencv_ts.so
diff --git a/lib/arm7/libopencv_ts.so.2.4 b/lib/arm7/libopencv_ts.so.2.4
diff --git a/lib/arm7/libopencv_video.so b/lib/arm7/libopencv_video.so
diff --git a/lib/arm7/libopencv_video.so.2.4 b/lib/arm7/libopencv_video.so.2.4
diff --git a/lib/arm7/libopencv_videostab.so b/lib/arm7/libopencv_videostab.so
diff --git a/lib/arm7/libopencv_videostab.so.2.4 b/lib/arm7/libopencv_videostab.so.2.4
diff --git a/lib/linux32/libopencv_calib3d.so b/lib/linux32/libopencv_calib3d.so
diff --git a/lib/linux32/libopencv_calib3d.so.2.4 b/lib/linux32/libopencv_calib3d.so.2.4
diff --git a/lib/linux32/libopencv_contrib.so b/lib/linux32/libopencv_contrib.so
diff --git a/lib/linux32/libopencv_contrib.so.2.4 b/lib/linux32/libopencv_contrib.so.2.4
diff --git a/lib/linux32/libopencv_core.so b/lib/linux32/libopencv_core.so
diff --git a/lib/linux32/libopencv_core.so.2.4 b/lib/linux32/libopencv_core.so.2.4
diff --git a/lib/linux32/libopencv_features2d.so b/lib/linux32/libopencv_features2d.so
diff --git a/lib/linux32/libopencv_features2d.so.2.4 b/lib/linux32/libopencv_features2d.so.2.4
diff --git a/lib/linux32/libopencv_flann.so b/lib/linux32/libopencv_flann.so
diff --git a/lib/linux32/libopencv_flann.so.2.4 b/lib/linux32/libopencv_flann.so.2.4
diff --git a/lib/linux32/libopencv_gpu.so b/lib/linux32/libopencv_gpu.so
diff --git a/lib/linux32/libopencv_gpu.so.2.4 b/lib/linux32/libopencv_gpu.so.2.4
diff --git a/lib/linux32/libopencv_highgui.so b/lib/linux32/libopencv_highgui.so
diff --git a/lib/linux32/libopencv_highgui.so.2.4 b/lib/linux32/libopencv_highgui.so.2.4
diff --git a/lib/linux32/libopencv_imgproc.so b/lib/linux32/libopencv_imgproc.so
diff --git a/lib/linux32/libopencv_imgproc.so.2.4 b/lib/linux32/libopencv_imgproc.so.2.4
diff --git a/lib/linux32/libopencv_legacy.so b/lib/linux32/libopencv_legacy.so
diff --git a/lib/linux32/libopencv_legacy.so.2.4 b/lib/linux32/libopencv_legacy.so.2.4
diff --git a/lib/linux32/libopencv_ml.so b/lib/linux32/libopencv_ml.so
diff --git a/lib/linux32/libopencv_ml.so.2.4 b/lib/linux32/libopencv_ml.so.2.4
diff --git a/lib/linux32/libopencv_nonfree.so b/lib/linux32/libopencv_nonfree.so
diff --git a/lib/linux32/libopencv_nonfree.so.2.4 b/lib/linux32/libopencv_nonfree.so.2.4
diff --git a/lib/linux32/libopencv_objdetect.so b/lib/linux32/libopencv_objdetect.so
diff --git a/lib/linux32/libopencv_objdetect.so.2.4 b/lib/linux32/libopencv_objdetect.so.2.4
diff --git a/lib/linux32/libopencv_photo.so b/lib/linux32/libopencv_photo.so
diff --git a/lib/linux32/libopencv_photo.so.2.4 b/lib/linux32/libopencv_photo.so.2.4
diff --git a/lib/linux32/libopencv_superres.so b/lib/linux32/libopencv_superres.so
diff --git a/lib/linux32/libopencv_superres.so.2.4 b/lib/linux32/libopencv_superres.so.2.4
diff --git a/lib/linux32/libopencv_ts.so b/lib/linux32/libopencv_ts.so
diff --git a/lib/linux32/libopencv_ts.so.2.4 b/lib/linux32/libopencv_ts.so.2.4
diff --git a/lib/linux32/libopencv_video.so b/lib/linux32/libopencv_video.so
diff --git a/lib/linux32/libopencv_video.so.2.4 b/lib/linux32/libopencv_video.so.2.4
diff --git a/lib/linux32/libopencv_videostab.so b/lib/linux32/libopencv_videostab.so
diff --git a/lib/linux32/libopencv_videostab.so.2.4 b/lib/linux32/libopencv_videostab.so.2.4
diff --git a/lib/linux64/libopencv_calib3d.so b/lib/linux64/libopencv_calib3d.so
diff --git a/lib/linux64/libopencv_calib3d.so.2.4 b/lib/linux64/libopencv_calib3d.so.2.4
diff --git a/lib/linux64/libopencv_contrib.so b/lib/linux64/libopencv_contrib.so
diff --git a/lib/linux64/libopencv_contrib.so.2.4 b/lib/linux64/libopencv_contrib.so.2.4
diff --git a/lib/linux64/libopencv_core.so b/lib/linux64/libopencv_core.so
diff --git a/lib/linux64/libopencv_core.so.2.4 b/lib/linux64/libopencv_core.so.2.4
diff --git a/lib/linux64/libopencv_features2d.so b/lib/linux64/libopencv_features2d.so
diff --git a/lib/linux64/libopencv_features2d.so.2.4 b/lib/linux64/libopencv_features2d.so.2.4
diff --git a/lib/linux64/libopencv_flann.so b/lib/linux64/libopencv_flann.so
diff --git a/lib/linux64/libopencv_flann.so.2.4 b/lib/linux64/libopencv_flann.so.2.4
diff --git a/lib/linux64/libopencv_gpu.so b/lib/linux64/libopencv_gpu.so
diff --git a/lib/linux64/libopencv_gpu.so.2.4 b/lib/linux64/libopencv_gpu.so.2.4
diff --git a/lib/linux64/libopencv_highgui.so b/lib/linux64/libopencv_highgui.so
diff --git a/lib/linux64/libopencv_highgui.so.2.4 b/lib/linux64/libopencv_highgui.so.2.4
diff --git a/lib/linux64/libopencv_imgproc.so b/lib/linux64/libopencv_imgproc.so
diff --git a/lib/linux64/libopencv_imgproc.so.2.4 b/lib/linux64/libopencv_imgproc.so.2.4
diff --git a/lib/linux64/libopencv_legacy.so b/lib/linux64/libopencv_legacy.so
diff --git a/lib/linux64/libopencv_legacy.so.2.4 b/lib/linux64/libopencv_legacy.so.2.4
diff --git a/lib/linux64/libopencv_ml.so b/lib/linux64/libopencv_ml.so
diff --git a/lib/linux64/libopencv_ml.so.2.4 b/lib/linux64/libopencv_ml.so.2.4
diff --git a/lib/linux64/libopencv_nonfree.so b/lib/linux64/libopencv_nonfree.so
diff --git a/lib/linux64/libopencv_nonfree.so.2.4 b/lib/linux64/libopencv_nonfree.so.2.4
diff --git a/lib/linux64/libopencv_objdetect.so b/lib/linux64/libopencv_objdetect.so
diff --git a/lib/linux64/libopencv_objdetect.so.2.4 b/lib/linux64/libopencv_objdetect.so.2.4
diff --git a/lib/linux64/libopencv_photo.so b/lib/linux64/libopencv_photo.so
diff --git a/lib/linux64/libopencv_photo.so.2.4 b/lib/linux64/libopencv_photo.so.2.4
diff --git a/lib/linux64/libopencv_stitching.so b/lib/linux64/libopencv_stitching.so
diff --git a/lib/linux64/libopencv_stitching.so.2.4 b/lib/linux64/libopencv_stitching.so.2.4
diff --git a/lib/linux64/libopencv_superres.so b/lib/linux64/libopencv_superres.so
diff --git a/lib/linux64/libopencv_superres.so.2.4 b/lib/linux64/libopencv_superres.so.2.4
diff --git a/lib/linux64/libopencv_ts.so b/lib/linux64/libopencv_ts.so
diff --git a/lib/linux64/libopencv_ts.so.2.4 b/lib/linux64/libopencv_ts.so.2.4
diff --git a/lib/linux64/libopencv_video.so b/lib/linux64/libopencv_video.so
diff --git a/lib/linux64/libopencv_video.so.2.4 b/lib/linux64/libopencv_video.so.2.4
diff --git a/lib/linux64/libopencv_videostab.so b/lib/linux64/libopencv_videostab.so
diff --git a/lib/linux64/libopencv_videostab.so.2.4 b/lib/linux64/libopencv_videostab.so.2.4
diff --git a/lib/arm7/cv2.so → library/arm7/cv2.so b/lib/arm7/cv2.so → library/arm7/cv2.so
diff --git a/library/arm7/libopencv_calib3d.so b/library/arm7/libopencv_calib3d.so
@@ -0,0 +1 @@
+libopencv_calib3d.so.2.4
diff --git a/library/arm7/libopencv_calib3d.so.2.4 b/library/arm7/libopencv_calib3d.so.2.4
@@ -0,0 +1 @@
+libopencv_calib3d.so.2.4.5
diff --git a/lib/arm7/libopencv_calib3d.so.2.4.5 → library/arm7/libopencv_calib3d.so.2.4.5 b/lib/arm7/libopencv_calib3d.so.2.4.5 → library/arm7/libopencv_calib3d.so.2.4.5
diff --git a/lib/arm7/libopencv_calib3d_pch_dephelp.a → library/arm7/libopencv_calib3d_pch_dephelp.a b/lib/arm7/libopencv_calib3d_pch_dephelp.a → library/arm7/libopencv_calib3d_pch_dephelp.a
diff --git a/library/arm7/libopencv_contrib.so b/library/arm7/libopencv_contrib.so
@@ -0,0 +1 @@
+libopencv_contrib.so.2.4
diff --git a/library/arm7/libopencv_contrib.so.2.4 b/library/arm7/libopencv_contrib.so.2.4
@@ -0,0 +1 @@
+libopencv_contrib.so.2.4.5
diff --git a/lib/arm7/libopencv_contrib.so.2.4.5 → library/arm7/libopencv_contrib.so.2.4.5 b/lib/arm7/libopencv_contrib.so.2.4.5 → library/arm7/libopencv_contrib.so.2.4.5
diff --git a/lib/arm7/libopencv_contrib_pch_dephelp.a → library/arm7/libopencv_contrib_pch_dephelp.a b/lib/arm7/libopencv_contrib_pch_dephelp.a → library/arm7/libopencv_contrib_pch_dephelp.a
diff --git a/library/arm7/libopencv_core.so b/library/arm7/libopencv_core.so
@@ -0,0 +1 @@
+libopencv_core.so.2.4
diff --git a/library/arm7/libopencv_core.so.2.4 b/library/arm7/libopencv_core.so.2.4
@@ -0,0 +1 @@
+libopencv_core.so.2.4.5
diff --git a/lib/arm7/libopencv_core.so.2.4.5 → library/arm7/libopencv_core.so.2.4.5 b/lib/arm7/libopencv_core.so.2.4.5 → library/arm7/libopencv_core.so.2.4.5
diff --git a/lib/arm7/libopencv_core_pch_dephelp.a → library/arm7/libopencv_core_pch_dephelp.a b/lib/arm7/libopencv_core_pch_dephelp.a → library/arm7/libopencv_core_pch_dephelp.a
diff --git a/library/arm7/libopencv_features2d.so b/library/arm7/libopencv_features2d.so
@@ -0,0 +1 @@
+libopencv_features2d.so.2.4
diff --git a/library/arm7/libopencv_features2d.so.2.4 b/library/arm7/libopencv_features2d.so.2.4
@@ -0,0 +1 @@
+libopencv_features2d.so.2.4.5
diff --git a/lib/arm7/libopencv_features2d.so.2.4.5 → library/arm7/libopencv_features2d.so.2.4.5 b/lib/arm7/libopencv_features2d.so.2.4.5 → library/arm7/libopencv_features2d.so.2.4.5
diff --git a/lib/arm7/libopencv_features2d_pch_dephelp.a → ...y/arm7/libopencv_features2d_pch_dephelp.a b/lib/arm7/libopencv_features2d_pch_dephelp.a → ...y/arm7/libopencv_features2d_pch_dephelp.a
diff --git a/library/arm7/libopencv_flann.so b/library/arm7/libopencv_flann.so
@@ -0,0 +1 @@
+libopencv_flann.so.2.4
diff --git a/library/arm7/libopencv_flann.so.2.4 b/library/arm7/libopencv_flann.so.2.4
@@ -0,0 +1 @@
+libopencv_flann.so.2.4.5
diff --git a/lib/arm7/libopencv_flann.so.2.4.5 → library/arm7/libopencv_flann.so.2.4.5 b/lib/arm7/libopencv_flann.so.2.4.5 → library/arm7/libopencv_flann.so.2.4.5
diff --git a/lib/arm7/libopencv_flann_pch_dephelp.a → library/arm7/libopencv_flann_pch_dephelp.a b/lib/arm7/libopencv_flann_pch_dephelp.a → library/arm7/libopencv_flann_pch_dephelp.a
diff --git a/library/arm7/libopencv_gpu.so b/library/arm7/libopencv_gpu.so
@@ -0,0 +1 @@
+libopencv_gpu.so.2.4
diff --git a/library/arm7/libopencv_gpu.so.2.4 b/library/arm7/libopencv_gpu.so.2.4
@@ -0,0 +1 @@
+libopencv_gpu.so.2.4.5
diff --git a/lib/arm7/libopencv_gpu.so.2.4.5 → library/arm7/libopencv_gpu.so.2.4.5 b/lib/arm7/libopencv_gpu.so.2.4.5 → library/arm7/libopencv_gpu.so.2.4.5
diff --git a/lib/arm7/libopencv_gpu_pch_dephelp.a → library/arm7/libopencv_gpu_pch_dephelp.a b/lib/arm7/libopencv_gpu_pch_dephelp.a → library/arm7/libopencv_gpu_pch_dephelp.a
diff --git a/lib/arm7/libopencv_haartraining_engine.a → library/arm7/libopencv_haartraining_engine.a b/lib/arm7/libopencv_haartraining_engine.a → library/arm7/libopencv_haartraining_engine.a
diff --git a/library/arm7/libopencv_highgui.so b/library/arm7/libopencv_highgui.so
@@ -0,0 +1 @@
+libopencv_highgui.so.2.4
diff --git a/library/arm7/libopencv_highgui.so.2.4 b/library/arm7/libopencv_highgui.so.2.4
@@ -0,0 +1 @@
+libopencv_highgui.so.2.4.5
diff --git a/lib/arm7/libopencv_highgui.so.2.4.5 → library/arm7/libopencv_highgui.so.2.4.5 b/lib/arm7/libopencv_highgui.so.2.4.5 → library/arm7/libopencv_highgui.so.2.4.5
diff --git a/lib/arm7/libopencv_highgui_pch_dephelp.a → library/arm7/libopencv_highgui_pch_dephelp.a b/lib/arm7/libopencv_highgui_pch_dephelp.a → library/arm7/libopencv_highgui_pch_dephelp.a
diff --git a/library/arm7/libopencv_imgproc.so b/library/arm7/libopencv_imgproc.so
@@ -0,0 +1 @@
+libopencv_imgproc.so.2.4
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,3 +20,5 @@ lib/ @@
     .DS_Store
     *.DS_Store
     /bin
+    *.ctxt
+    *.class