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

Merge branch 'master' into documentation

Browse source 
Conflicts:
	.gitignore
This commit is contained in:
ser1zw 2012-05-01 01:45:17 +09:00
commit 6898c452e1
11 changed files with 31 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -20,4 +20,5 @@ doc/
log.txt
videowriter_result.avi
examples/contours/rotated-boxes-with-detected-bounding-rectangles.jpg
Gemfile.lock
.yardoc

28
Gemfile.lock
View file

@ -1,28 +0,0 @@
GEM
remote: http://rubygems.org/
specs:
diff-lcs (1.1.3)
hoe (2.12.5)
rake (~> 0.8)
hoe-gemspec (1.0.0)
hoe (>= 2.2.0)
rake (0.9.2.2)
rake-compiler (0.7.9)
rake
rspec (2.7.0)
rspec-core (~> 2.7.0)
rspec-expectations (~> 2.7.0)
rspec-mocks (~> 2.7.0)
rspec-core (2.7.1)
rspec-expectations (2.7.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.7.0)
PLATFORMS
ruby
DEPENDENCIES
hoe
hoe-gemspec
rake-compiler
rspec

1
Manifest.txt
View file

@ -1,6 +1,5 @@
.gitignore
Gemfile
Gemfile.lock
History.txt
License.txt
Manifest.txt

2
Rakefile
View file

@ -32,7 +32,7 @@ EOF
p.test_globs = ['test/test_*.rb']
p.clean_globs << 'lib/*.so' << 'tmp'
p.url = 'http://blueruby.mydns.jp/opencv'
p.urls = ['http://blueruby.mydns.jp/opencv']
p.extra_dev_deps << ['rake-compiler', '>= 0'] << ['hoe-gemspec'] << ['rspec']

2
ext/opencv/cvavgcomp.cpp
View file

@ -56,7 +56,7 @@ rb_allocate(VALUE klass)
VALUE
rb_neighbors(VALUE self)
{
return INT2FIX(CVAVGCOMP(self)->neighbors);
return INT2NUM(CVAVGCOMP(self)->neighbors);
}
__NAMESPACE_END_AVGCOMP

6
ext/opencv/cvcondensation.cpp
View file

@ -58,7 +58,7 @@ define_ruby_class()
VALUE
rb_dp(VALUE self)
{
return INT2FIX(CVCONDENSATION(self)->DP);
return INT2NUM(CVCONDENSATION(self)->DP);
}
/*
@ -70,7 +70,7 @@ rb_dp(VALUE self)
VALUE
rb_mp(VALUE self)
{
return INT2FIX(CVCONDENSATION(self)->MP);
return INT2NUM(CVCONDENSATION(self)->MP);
}
/*
@ -162,7 +162,7 @@ rb_state(VALUE self)
VALUE
rb_samples_num(VALUE self)
{
return INT2FIX(CVCONDENSATION(self)->SamplesNum);
return INT2NUM(CVCONDENSATION(self)->SamplesNum);
}
/*

10
ext/opencv/cvmat.cpp
View file

@ -569,7 +569,7 @@ rb_create_mask(VALUE self)
VALUE
rb_width(VALUE self)
{
return INT2FIX(CVMAT(self)->width);
return INT2NUM(CVMAT(self)->width);
}
/*
@ -581,7 +581,7 @@ rb_width(VALUE self)
VALUE
rb_height(VALUE self)
{
return INT2FIX(CVMAT(self)->height);
return INT2NUM(CVMAT(self)->height);
}
/*
@ -1132,7 +1132,7 @@ rb_dims(VALUE self)
}
VALUE ary = rb_ary_new2(dims);
for (int i = 0; i < dims; ++i) {
rb_ary_store(ary, i, INT2FIX(size[i]));
rb_ary_store(ary, i, INT2NUM(size[i]));
}
return ary;
}
@ -1155,7 +1155,7 @@ rb_dim_size(VALUE self, VALUE index)
catch (cv::Exception& e) {
raise_cverror(e);
}
return INT2FIX(dimsize);
return INT2NUM(dimsize);
}
/*
@ -2269,7 +2269,7 @@ rb_count_non_zero(VALUE self)
catch (cv::Exception& e) {
raise_cverror(e);
}
return INT2FIX(n);
return INT2NUM(n);
}
/*

4
ext/opencv/cvpoint.cpp
View file

@ -131,7 +131,7 @@ rb_initialize(int argc, VALUE *argv, VALUE self)
VALUE
rb_x(VALUE self)
{
return INT2FIX(CVPOINT(self)->x);
return INT2NUM(CVPOINT(self)->x);
}
/*
@ -159,7 +159,7 @@ rb_set_x(VALUE self, VALUE x)
VALUE
rb_y(VALUE self)
{
return INT2FIX(CVPOINT(self)->y);
return INT2NUM(CVPOINT(self)->y);
}
/*

8
ext/opencv/cvrect.cpp
View file

@ -167,7 +167,7 @@ rb_initialize(int argc, VALUE *argv, VALUE self)
VALUE
rb_x(VALUE self)
{
return INT2FIX(CVRECT(self)->x);
return INT2NUM(CVRECT(self)->x);
}
/*
@ -190,7 +190,7 @@ rb_set_x(VALUE self, VALUE x)
VALUE
rb_y(VALUE self)
{
return INT2FIX(CVRECT(self)->y);
return INT2NUM(CVRECT(self)->y);
}
/*
@ -213,7 +213,7 @@ rb_set_y(VALUE self, VALUE y)
VALUE
rb_width(VALUE self)
{
return INT2FIX(CVRECT(self)->width);
return INT2NUM(CVRECT(self)->width);
}
/*
@ -236,7 +236,7 @@ rb_set_width(VALUE self, VALUE x)
VALUE
rb_height(VALUE self)
{
return INT2FIX(CVRECT(self)->height);
return INT2NUM(CVRECT(self)->height);
}
/*

4
ext/opencv/cvsize.cpp
View file

@ -131,7 +131,7 @@ rb_initialize(int argc, VALUE *argv, VALUE self)
VALUE
rb_width(VALUE self)
{
return INT2FIX(CVSIZE(self)->width);
return INT2NUM(CVSIZE(self)->width);
}
/*
@ -154,7 +154,7 @@ rb_set_width(VALUE self, VALUE x)
VALUE
rb_height(VALUE self)
{
return INT2FIX(CVSIZE(self)->height);
return INT2NUM(CVSIZE(self)->height);
}
/*

24
opencv.gemspec
View file

File diff suppressed because one or more lines are too long