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

add Mat#diag

Browse source
This commit is contained in:
ser1zw 2016-04-10 03:22:00 +09:00
parent 2221af91a1
commit a354bc3625
2 changed files with 53 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
ext/opencv/mat.cpp
View file

@ -716,6 +716,26 @@ namespace rubyopencv {
return mat2obj(retptr, CLASS_OF(self));
}
VALUE rb_diag(int argc, VALUE *argv, VALUE self) {
VALUE d;
rb_scan_args(argc, argv, "01", &d);
int d_value = NIL_P(d) ? 0 : NUM2INT(d);
cv::Mat* selfptr = obj2mat(self);
cv::Mat* retptr = NULL;
try {
retptr = new cv::Mat();
cv::Mat tmp = selfptr->diag(d_value);
tmp.copyTo(*retptr);
}
catch (cv::Exception& e) {
delete retptr;
Error::raise(e);
}
return mat2obj(retptr, CLASS_OF(self));
}
/*
* Sets all or some of the array elements to the specified value.
*
@ -858,7 +878,8 @@ namespace rubyopencv {
rb_define_method(rb_klass, "-", RUBY_METHOD_FUNC(rb_sub), 1);
rb_define_method(rb_klass, "*", RUBY_METHOD_FUNC(rb_mul), 1);
rb_define_method(rb_klass, "/", RUBY_METHOD_FUNC(rb_div), 1);
rb_define_method(rb_klass, "diag", RUBY_METHOD_FUNC(rb_diag), -1);
rb_define_method(rb_klass, "clone", RUBY_METHOD_FUNC(rb_clone), 0);
rb_define_method(rb_klass, "rows", RUBY_METHOD_FUNC(rb_rows), 0);

31
test/test_mat.rb
View file

@ -322,6 +322,37 @@ class TestMat < OpenCVTestCase
}
end
def test_diag
m0 = Mat.new(3, 3, CV_8U)
i = 1
m0.rows.times { |r|
m0.cols.times { |c|
m0[r, c] = Scalar.new(i)
i += 1
}
}
m1 = m0.diag
elems = m1.to_s.scan(/(\[[^\]]+\])/m).flatten[0]
assert_equal("[ 1;\n 5;\n 9]", elems)
m2 = m0.diag(0)
elems = m2.to_s.scan(/(\[[^\]]+\])/m).flatten[0]
assert_equal("[ 1;\n 5;\n 9]", elems)
m3 = m0.diag(1)
elems = m3.to_s.scan(/(\[[^\]]+\])/m).flatten[0]
assert_equal("[ 2;\n 6]", elems)
m4 = m0.diag(-1)
elems = m4.to_s.scan(/(\[[^\]]+\])/m).flatten[0]
assert_equal("[ 4;\n 8]", elems)
assert_raise(TypeError) {
m0.diag(DUMMY_OBJ)
}
end
def test_cvt_color
m = Mat.new(1, 1, CV_32FC3)
m[0, 0] = Scalar.new(1.0, 2.0, 3.0)