kotovalexarian-likes-github/ruby-opencv
1
0
Fork 0
mirror of https://github.com/ruby-opencv/ruby-opencv synced 2023-03-27 23:22:12 -04:00
Code Releases Activity

modified CvSeq to include Enumerable

Browse source
This commit is contained in:
ser1zw 2011-02-07 00:24:59 +09:00
parent 4fccb2ea28
commit f7234628f5
3 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ext/cvseq.cpp
View file

@ -68,6 +68,7 @@ define_ruby_class()
*/ */
VALUE opencv = rb_module_opencv(); VALUE opencv = rb_module_opencv();
rb_klass = rb_define_class_under(opencv, "CvSeq", rb_cObject); rb_klass = rb_define_class_under(opencv, "CvSeq", rb_cObject);
rb_include_module(rb_klass, rb_mEnumerable);
rb_define_alloc_func(rb_klass, rb_allocate); rb_define_alloc_func(rb_klass, rb_allocate);
rb_define_private_method(rb_klass, "initialize", RUBY_METHOD_FUNC(rb_initialize), -1); rb_define_private_method(rb_klass, "initialize", RUBY_METHOD_FUNC(rb_initialize), -1);
rb_define_method(rb_klass, "total", RUBY_METHOD_FUNC(rb_total), 0); rb_define_method(rb_klass, "total", RUBY_METHOD_FUNC(rb_total), 0);
@ -92,12 +93,10 @@ define_ruby_class()
rb_define_alias(rb_klass, "pop_front", "shift"); rb_define_alias(rb_klass, "pop_front", "shift");
rb_define_method(rb_klass, "each", RUBY_METHOD_FUNC(rb_each), 0); rb_define_method(rb_klass, "each", RUBY_METHOD_FUNC(rb_each), 0);
rb_define_method(rb_klass, "each_index", RUBY_METHOD_FUNC(rb_each_index), 0); rb_define_method(rb_klass, "each_index", RUBY_METHOD_FUNC(rb_each_index), 0);
rb_define_method(rb_klass, "each_with_index", RUBY_METHOD_FUNC(rb_each_with_index), 0);
rb_define_method(rb_klass, "insert", RUBY_METHOD_FUNC(rb_insert), 2); rb_define_method(rb_klass, "insert", RUBY_METHOD_FUNC(rb_insert), 2);
rb_define_method(rb_klass, "remove", RUBY_METHOD_FUNC(rb_remove), 1); rb_define_method(rb_klass, "remove", RUBY_METHOD_FUNC(rb_remove), 1);
rb_define_method(rb_klass, "clear", RUBY_METHOD_FUNC(rb_clear), 0);
rb_define_alias(rb_klass, "delete_at", "remove"); rb_define_alias(rb_klass, "delete_at", "remove");
rb_define_method(rb_klass, "clear", RUBY_METHOD_FUNC(rb_clear), 0);
} }
VALUE VALUE
@ -447,21 +446,6 @@ rb_each_index(VALUE self)
return self; return self;
} }
/*
* call-seq:
* each_with_index{|obj, i| ... } -> self
*
* Calls block with two arguments, the sequence-block and its index, for each sequence-block in sequence.
*/
VALUE
rb_each_with_index(VALUE self)
{
CvSeq *seq = CVSEQ(self);
VALUE klass = seqblock_class(seq);
for(int i = 0; i < seq->total; i++)
rb_yield_values(2, REFER_OBJECT(klass, cvGetSeqElem(seq, i), self), INT2FIX(i));
return self;
}
/* /*
* call-seq: * call-seq:

1
ext/cvseq.h
View file

@ -43,7 +43,6 @@ VALUE rb_unshift(VALUE self, VALUE args);
VALUE rb_shift(VALUE self); VALUE rb_shift(VALUE self);
VALUE rb_each(VALUE self); VALUE rb_each(VALUE self);
VALUE rb_each_index(VALUE self); VALUE rb_each_index(VALUE self);
VALUE rb_each_with_index(VALUE self);
VALUE rb_insert(VALUE self, VALUE index, VALUE object); VALUE rb_insert(VALUE self, VALUE index, VALUE object);
VALUE rb_remove(VALUE self, VALUE index); VALUE rb_remove(VALUE self, VALUE index);
VALUE rb_clear(VALUE self); VALUE rb_clear(VALUE self);

2
test/test_cvseq.rb
View file

@ -13,6 +13,8 @@ class TestCvSeq < OpenCVTestCase
assert_not_nil(CvSeq.new(CvPoint)) assert_not_nil(CvSeq.new(CvPoint))
assert_not_nil(CvSeq.new(CvPoint2D32f)) assert_not_nil(CvSeq.new(CvPoint2D32f))
assert_not_nil(CvSeq.new(CvPoint3D32f)) assert_not_nil(CvSeq.new(CvPoint3D32f))
assert(CvSeq.new(CvPoint).is_a? Enumerable)
end end
def test_total def test_total