tested CvMat#optical_flow_lk

Author: ser1zw

ext/cvmat.cpp

@@ -391,7 +391,7 @@ void define_ruby_class()
   rb_define_method(rb_klass, "snake_image", RUBY_METHOD_FUNC(rb_snake_image), -1);
 
   rb_define_method(rb_klass, "optical_flow_hs", RUBY_METHOD_FUNC(rb_optical_flow_hs), -1);
-  rb_define_method(rb_klass, "optical_flow_lk", RUBY_METHOD_FUNC(rb_optical_flow_lk), -1);
+  rb_define_method(rb_klass, "optical_flow_lk", RUBY_METHOD_FUNC(rb_optical_flow_lk), 2);
   rb_define_method(rb_klass, "optical_flow_bm", RUBY_METHOD_FUNC(rb_optical_flow_bm), -1);
 
   rb_define_singleton_method(rb_klass, "find_fundamental_mat_7point", RUBY_METHOD_FUNC(rb_find_fundamental_mat_7point), -1);
@@ -4919,11 +4919,10 @@ rb_optical_flow_hs(int argc, VALUE *argv, VALUE self)
  * <i>win_size</i> is size of the averaging window used for grouping pixels.
  */
 VALUE
-rb_optical_flow_lk(int argc, VALUE *argv, VALUE self)
+rb_optical_flow_lk(VALUE self, VALUE prev, VALUE win_size)
 {
   SUPPORT_8UC1_ONLY(self);
-  VALUE prev, win_size, velx, vely;
-  rb_scan_args(argc, argv, "20", &prev, &win_size);
+  VALUE velx, vely;
   if (!rb_obj_is_kind_of(prev, cCvMat::rb_class()))
     rb_raise(rb_eTypeError, "argument 1 (previous image) should be %s", rb_class2name(cCvMat::rb_class()));
   velx = cCvMat::new_object(cvGetSize(CVARR(self)), CV_MAKETYPE(CV_32F, 1));

ext/cvmat.h

@@ -253,7 +253,7 @@ VALUE rb_cam_shift(VALUE self, VALUE window, VALUE criteria);
 VALUE rb_snake_image(int argc, VALUE *argv, VALUE self);
 /* Optical Flow */
 VALUE rb_optical_flow_hs(int argc, VALUE *argv, VALUE self);
-VALUE rb_optical_flow_lk(int argc, VALUE *argv, VALUE self);
+VALUE rb_optical_flow_lk(VALUE self, VALUE prev, VALUE win_size);
 VALUE rb_optical_flow_bm(int argc, VALUE *argv, VALUE self);
 VALUE rb_optical_flow_pyr_lk(int argc, VALUE *argv, VALUE self);
 

test/test_cvmat_imageprocessing.rb

@@ -1663,6 +1663,40 @@ def test_optical_flow_hs
     velx, vely = curr.optical_flow_hs(prev, velx, vely)
     assert_equal('08b50f3d4cb4cbbe443fada293e6af02', hash_img(velx))
     assert_equal('4d302c8267388995ec85a4a26da5ffcc', hash_img(vely))
+
+    assert_raise(TypeError) {
+      curr.optical_flow_hs('foobar')
+    }
+
+    assert_raise(ArgumentError) {
+      curr.optical_flow_hs(prev, 'foo', 'bar')
+    }
+  end
+
+  def test_optical_flow_lk
+    size = 128
+    prev = create_cvmat(size, size, :cv8u, 1) { |j, i|
+      if ((i - (size / 2)) ** 2 ) + ((j - (size / 2)) ** 2 ) < size
+        CvColor::Black
+      else
+        CvColor::White
+      end
+    }
+    curr = create_cvmat(size, size, :cv8u, 1) { |j, i|
+      if ((i - (size / 2) - 10) ** 2) + ((j - (size / 2) - 7) ** 2 ) < size
+        CvColor::Black
+      else
+        CvColor::White
+      end
+    }
+    
+    velx, vely = curr.optical_flow_lk(prev, CvSize.new(3, 3))
+    assert_equal('bea0c4c2b4b89ed1bb5e9ef5b68b8759', hash_img(velx))
+    assert_equal('aa643584d4eb175ab48896ff44646e06', hash_img(vely))
+
+    assert_raise(TypeError) {
+      curr.optical_flow_lk('foobar', CvSize.new(3, 3))
+    }
   end
 end