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

fixed a bug of CvMat#copy

Browse source
This commit is contained in:
ser1zw 2011-01-02 06:25:38 +09:00
parent 817f57df86
commit 3b36804879
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/cvmat.cpp
View file

@ -675,7 +675,7 @@ rb_clone(VALUE self)
VALUE VALUE
rb_copy(int argc, VALUE *argv, VALUE self) rb_copy(int argc, VALUE *argv, VALUE self)
{ {
VALUE value, copied; VALUE value, copied, tmp;
CvMat *src = CVMAT(self); CvMat *src = CVMAT(self);
rb_scan_args(argc, argv, "01", &value); rb_scan_args(argc, argv, "01", &value);
if (argc == 0) { if (argc == 0) {
@ -692,7 +692,9 @@ rb_copy(int argc, VALUE *argv, VALUE self)
if (n > 0) { if (n > 0) {
copied = rb_ary_new2(n); copied = rb_ary_new2(n);
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
rb_ary_store(copied, i, new_object(src->rows, src->cols, cvGetElemType(src))); tmp = new_object(src->rows, src->cols, cvGetElemType(src));
cvCopy(src, CVMAT(tmp));
rb_ary_store(copied, i, tmp);
} }
return copied; return copied;
}else{ }else{

3
test/test_cvmat.rb
View file

@ -145,7 +145,10 @@ class TestCvMat < OpenCVTestCase
a = m1.copy(2) a = m1.copy(2)
assert_equal(2, a.size) assert_equal(2, a.size)
a.each { |m| a.each { |m|
assert_equal(m1.height, m.height)
assert_equal(m1.width, m.width)
m1.height.times { |j| m1.height.times { |j|
m1.width.times { |i| m1.width.times { |i|
assert_cvscalar_equal(m1[i, j], m[i, j]) assert_cvscalar_equal(m1[i, j], m[i, j])