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 CvMat, and added some tests

Browse source
This commit is contained in:
ser1zw 2011-01-06 01:16:10 +09:00
parent 5ddfc1fa45
commit 7e068bc34b
3 changed files with 53 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ext/cvmat.cpp
View file

@ -417,11 +417,13 @@ rb_allocate(VALUE klass)
* Number of channel is set by <i>channel</i>. <i>channel</i> should be 1..4.
*
*/
#include <stdio.h>
VALUE
rb_initialize(int argc, VALUE *argv, VALUE self)
{
VALUE row, column, depth, channel;
rb_scan_args(argc, argv, "22", &row, &column, &depth, &channel);
DATA_PTR(self) = cvCreateMat(FIX2INT(row), FIX2INT(column),
CV_MAKETYPE(CVMETHOD("DEPTH", depth, CV_8U), argc < 4 ? 3 : FIX2INT(channel)));
return self;
@ -1633,7 +1635,7 @@ rb_add(int argc, VALUE *argv, VALUE self)
{
VALUE val, mask, dest;
rb_scan_args(argc, argv, "11", &val, &mask);
dest = new_object(cvGetSize(CVARR(self)), cvGetElemType(CVARR(self)));
dest = copy(self);
if (rb_obj_is_kind_of(val, rb_klass))
cvAdd(CVARR(self), CVARR(val), CVARR(dest), MASK(mask));
else
@ -1657,11 +1659,14 @@ rb_sub(int argc, VALUE *argv, VALUE self)
{
VALUE val, mask, dest;
rb_scan_args(argc, argv, "11", &val, &mask);
dest = new_object(cvGetSize(CVARR(self)), cvGetElemType(CVARR(self)));
if (rb_obj_is_kind_of(val, rb_klass))
dest = copy(self);
if (rb_obj_is_kind_of(val, rb_klass)) {
cvSub(CVARR(self), CVARR(val), CVARR(dest), MASK(mask));
else
}
else {
cvSubS(CVARR(self), VALUE_TO_CVSCALAR(val), CVARR(dest), MASK(mask));
}
return dest;
}

39
test/test_cvmat.rb
View file

@ -15,9 +15,28 @@ class TestCvMat < OpenCVTestCase
assert_equal(20, m.cols)
assert_equal(:cv8u, m.depth)
assert_equal(3, m.channel)
# assert_each_cvscalar(m) {
# CvScalar.new(0, 0, 0, 0)
# }
depth_table = {
CV_8U => :cv8u,
CV_8S => :cv8s,
CV_16U => :cv16u,
CV_16S => :cv16s,
CV_32S => :cv32s,
CV_32F => :cv32f,
CV_64F => :cv64f
}
[CV_8U, CV_8S, CV_16U, CV_16S, CV_32S, CV_32F, CV_64F,
:cv8u, :cv8s, :cv16u, :cv16s, :cv32s, :cv32f, :cv64f].each { |depth|
[1, 2, 3, 4].each { |ch|
m = CvMat.new(10, 20, depth, ch)
assert_equal(10, m.rows)
assert_equal(20, m.cols)
depth = depth_table[depth] unless depth.is_a? Symbol
assert_equal(depth, m.depth)
assert_equal(ch, m.channel)
}
}
end
def test_DRAWING_OPTION
@ -855,7 +874,6 @@ class TestCvMat < OpenCVTestCase
(i < 3 and j < 2) ? 1 : 0
}
flunk('FIXME: Tests of CvMat + CvMat with Mask often (but not always) fails. Is initializing required...?')
m4 = m1.add(m2, mask)
assert_equal(m1.height, m4.height)
assert_equal(m1.width, m4.width)
@ -865,14 +883,13 @@ class TestCvMat < OpenCVTestCase
if i < 3 and j < 2
s = CvScalar.new(n * 1.1, n * 2.2, n * 3.3, n * 4.4)
else
s = CvScalar.new(0)
s = m1[j, i]
end
assert_in_delta(s, m4[j, i], 0.001)
n += 1
}
}
flunk('FIXME: Tests of CvMat + CvScalar with Mask often (but not always) fails. Is initializing required...?')
# CvMat + CvScalar with Mask
m4 = m1.add(s1, mask)
assert_equal(m1.height, m4.height)
@ -883,7 +900,7 @@ class TestCvMat < OpenCVTestCase
if i < 3 and j < 2
s = CvScalar.new(n * 0.1 + 1, n * 0.2 + 2, n * 0.3 + 3, n * 0.4 + 4)
else
s = CvScalar.new(0)
s = m1[j, i]
end
assert_in_delta(s, m4[j, i], 0.001)
n += 1
@ -943,7 +960,6 @@ class TestCvMat < OpenCVTestCase
(i < 3 and j < 2) ? 1 : 0
}
flunk('FIXME: Tests of CvMat - CvMat with Mask often (but not always) fails. Is initializing required...?')
# CvMat - CvMat with Mask
m4 = m1.sub(m2, mask)
assert_equal(m1.height, m4.height)
@ -954,16 +970,15 @@ class TestCvMat < OpenCVTestCase
if i < 3 and j < 2
s = CvScalar.new(-n * 0.9, -n * 1.8, -n * 2.7, -n * 3.6)
else
s = CvScalar.new(0)
s = m1[j, i]
end
assert_in_delta(s, m4[j, i], 0.001)
n += 1
}
}
flunk('FIXME: Tests of CvMat - CvScalar with Mask often (but not always) fails. Is initializing required...?')
# CvMat - CvScalar with Mask
m4 = m1.add(s1, mask)
m4 = m1.sub(s1, mask)
assert_equal(m1.height, m4.height)
assert_equal(m1.width, m4.width)
n = 0
@ -972,7 +987,7 @@ class TestCvMat < OpenCVTestCase
if i < 3 and j < 2
s = CvScalar.new(n * 0.1 - 1, n * 0.2 - 2, n * 0.3 - 3, n * 0.4 - 4)
else
s = CvScalar.new(0)
s = m1[j, i]
end
assert_in_delta(s, m4[j, i], 0.001)
n += 1

17
test/test_cvscalar.rb
View file

@ -8,6 +8,23 @@ include OpenCV
# Tests for OpenCV::CvScalar
class TestCvScalar < OpenCVTestCase
def test_initialize
s = CvScalar.new
assert_in_delta([0, 0, 0, 0], s, 0.01)
s = CvScalar.new(1.1)
assert_in_delta([1.1, 0, 0, 0], s, 0.01)
s = CvScalar.new(1.1, 2.2)
assert_in_delta([1.1, 2.2, 0, 0], s, 0.01)
s = CvScalar.new(1.1, 2.2, 3.3)
assert_in_delta([1.1, 2.2, 3.3, 0], s, 0.01)
s = CvScalar.new(1.1, 2.2, 3.3, 4.4)
assert_in_delta([1.1, 2.2, 3.3, 4.4], s, 0.01)
end
def test_aref
assert_in_delta([0, 0, 0, 0], CvScalar.new, 0.01)
assert_in_delta([10, 20, 30, 40], CvScalar.new(10, 20, 30, 40), 0.01)