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

renamed CvMat#row -> CvMat#get_rows, CvMat#col -> CvMat#get_cols

Browse source
This commit is contained in:
ser1zw 2011-07-09 11:26:04 +09:00
parent 53fd238569
commit 87b6f885b1
3 changed files with 18 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ext/opencv/cvmat.cpp
View file

@ -187,9 +187,8 @@ void define_ruby_class()
rb_define_method(rb_klass, "to_CvMat", RUBY_METHOD_FUNC(rb_to_CvMat), 0); rb_define_method(rb_klass, "to_CvMat", RUBY_METHOD_FUNC(rb_to_CvMat), 0);
rb_define_method(rb_klass, "sub_rect", RUBY_METHOD_FUNC(rb_sub_rect), -2); rb_define_method(rb_klass, "sub_rect", RUBY_METHOD_FUNC(rb_sub_rect), -2);
rb_define_alias(rb_klass, "subrect", "sub_rect"); rb_define_alias(rb_klass, "subrect", "sub_rect");
rb_define_method(rb_klass, "row", RUBY_METHOD_FUNC(rb_row), -2); rb_define_method(rb_klass, "get_rows", RUBY_METHOD_FUNC(rb_get_rows), -2);
rb_define_method(rb_klass, "col", RUBY_METHOD_FUNC(rb_col), -2); rb_define_method(rb_klass, "get_cols", RUBY_METHOD_FUNC(rb_get_cols), -2);
rb_define_alias(rb_klass, "column", "col");
rb_define_method(rb_klass, "each_row", RUBY_METHOD_FUNC(rb_each_row), 0); rb_define_method(rb_klass, "each_row", RUBY_METHOD_FUNC(rb_each_row), 0);
rb_define_method(rb_klass, "each_col", RUBY_METHOD_FUNC(rb_each_col), 0); rb_define_method(rb_klass, "each_col", RUBY_METHOD_FUNC(rb_each_col), 0);
rb_define_alias(rb_klass, "each_column", "each_col"); rb_define_alias(rb_klass, "each_column", "each_col");
@ -914,14 +913,14 @@ rb_sub_rect(VALUE self, VALUE args)
/* /*
* call-seq: * call-seq:
* row(<i>n</i>) -> Return row * get_rows(<i>n</i>) -> Return row
* row(<i>n1, n2, ...</i>) -> Return Array of row * get_rows(<i>n1, n2, ...</i>) -> Return Array of row
* *
* Return row(or rows) of matrix. * Return row(or rows) of matrix.
* argument should be Fixnum or CvSlice compatible object. * argument should be Fixnum or CvSlice compatible object.
*/ */
VALUE VALUE
rb_row(VALUE self, VALUE args) rb_get_rows(VALUE self, VALUE args)
{ {
int len = RARRAY_LEN(args); int len = RARRAY_LEN(args);
if (len < 1) if (len < 1)
@ -943,14 +942,14 @@ rb_row(VALUE self, VALUE args)
/* /*
* call-seq: * call-seq:
* col(<i>n</i>) -> Return column * get_cols(<i>n</i>) -> Return column
* col(<i>n1, n2, ...</i>) -> Return Array of columns * get_cols(<i>n1, n2, ...</i>) -> Return Array of columns
* *
* Return column(or columns) of matrix. * Return column(or columns) of matrix.
* argument should be Fixnum or CvSlice compatible object. * argument should be Fixnum or CvSlice compatible object.
*/ */
VALUE VALUE
rb_col(VALUE self, VALUE args) rb_get_cols(VALUE self, VALUE args)
{ {
int len = RARRAY_LEN(args); int len = RARRAY_LEN(args);
if (len < 1) if (len < 1)

4
ext/opencv/cvmat.h
View file

@ -56,8 +56,8 @@ VALUE rb_square_q(VALUE self);
VALUE rb_to_CvMat(VALUE self); VALUE rb_to_CvMat(VALUE self);
VALUE rb_to_IplImage(VALUE self); VALUE rb_to_IplImage(VALUE self);
VALUE rb_sub_rect(VALUE self, VALUE args); VALUE rb_sub_rect(VALUE self, VALUE args);
VALUE rb_row(VALUE self, VALUE args); VALUE rb_get_rows(VALUE self, VALUE args);
VALUE rb_col(VALUE self, VALUE args); VALUE rb_get_cols(VALUE self, VALUE args);
VALUE rb_each_row(VALUE self); VALUE rb_each_row(VALUE self);
VALUE rb_each_col(VALUE self); VALUE rb_each_col(VALUE self);
VALUE rb_diag(int argc, VALUE *argv, VALUE self); VALUE rb_diag(int argc, VALUE *argv, VALUE self);

25
test/test_cvmat.rb
View file

@ -320,17 +320,17 @@ class TestCvMat < OpenCVTestCase
} }
end end
def test_row def test_get_rows
m1 = create_cvmat(10, 20) m1 = create_cvmat(10, 20)
m2 = m1.row(2) m2 = m1.get_rows(2)
assert_equal(1, m2.height) assert_equal(1, m2.height)
assert_equal(m1.width, m2.width) assert_equal(m1.width, m2.width)
m1.width.times { |i| m1.width.times { |i|
assert_cvscalar_equal(m1[2, i], m2[i]) assert_cvscalar_equal(m1[2, i], m2[i])
} }
m2, m3 = m1.row(1, 2) m2, m3 = m1.get_rows(1, 2)
[m2, m3].each { |m| [m2, m3].each { |m|
assert_equal(1, m.height) assert_equal(1, m.height)
assert_equal(m1.width, m.width) assert_equal(m1.width, m.width)
@ -341,25 +341,21 @@ class TestCvMat < OpenCVTestCase
} }
assert_raise(TypeError) { assert_raise(TypeError) {
m1.row(DUMMY_OBJ) m1.get_rows(DUMMY_OBJ)
} }
flunk('FIXME: Not handle out of range error yet')
# assert_raise(ArgumentError) {
# m1.row(-1)
# }
end end
def test_col def test_get_cols
m1 = create_cvmat(10, 20) m1 = create_cvmat(10, 20)
m2 = m1.col(2) m2 = m1.get_cols(2)
assert_equal(1, m2.width) assert_equal(1, m2.width)
assert_equal(m1.height, m2.height) assert_equal(m1.height, m2.height)
m1.height.times { |j| m1.height.times { |j|
assert_cvscalar_equal(m1[j, 2], m2[j]) assert_cvscalar_equal(m1[j, 2], m2[j])
} }
m2, m3 = m1.col(1, 2) m2, m3 = m1.get_cols(1, 2)
[m2, m3].each { |m| [m2, m3].each { |m|
assert_equal(1, m.width) assert_equal(1, m.width)
assert_equal(m1.height, m.height) assert_equal(m1.height, m.height)
@ -370,13 +366,8 @@ class TestCvMat < OpenCVTestCase
} }
assert_raise(TypeError) { assert_raise(TypeError) {
m1.col(DUMMY_OBJ) m1.get_cols(DUMMY_OBJ)
} }
flunk('FIXME: Not handle out of range error yet')
# assert_raise(ArgumentError) {
# m1.col(-1)
# }
end end
def test_each_row def test_each_row