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 'develop' into feature/add_FaceRecognizer

Browse source 
Conflicts:
	ruby-opencv.gemspec
This commit is contained in:
ser1zw 2013-09-30 02:49:26 +09:00
commit 014f121a22
6 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -3,7 +3,7 @@
An OpenCV wrapper for Ruby.
* Web site: <https://github.com/ruby-opencv/ruby-opencv>
* Ruby 1.9.3, 2.0.0 and OpenCV 2.4.5 are supported.
* Ruby 1.9.3, 2.0.0 and OpenCV 2.4.6.1 are supported.
## Requirement

4
ext/opencv/cvmat.cpp
View file

@ -3945,9 +3945,9 @@ rb_resize(int argc, VALUE *argv, VALUE self)
VALUE
rb_warp_affine(int argc, VALUE *argv, VALUE self)
{
VALUE map_matrix, flags_val, option, fill_value;
VALUE map_matrix, flags_val, fill_value;
VALUE dest = Qnil;
if (rb_scan_args(argc, argv, "13", &map_matrix, &flags_val, &option, &fill_value) < 4)
if (rb_scan_args(argc, argv, "12", &map_matrix, &flags_val, &fill_value) < 3)
fill_value = INT2FIX(0);
CvArr* self_ptr = CVARR(self);
int flags = NIL_P(flags_val) ? (CV_INTER_LINEAR | CV_WARP_FILL_OUTLIERS) : NUM2INT(flags_val);

5
ext/opencv/opencv.cpp
View file

@ -166,6 +166,11 @@ define_ruby_module()
rb_define_const(rb_module, "CV_MINOR_VERSION", INT2FIX(CV_MINOR_VERSION));
rb_define_const(rb_module, "CV_SUBMINOR_VERSION", INT2FIX(CV_SUBMINOR_VERSION));
rb_define_const(rb_module, "CV_VERSION_EPOCH", INT2FIX(CV_VERSION_EPOCH));
rb_define_const(rb_module, "CV_VERSION_MAJOR", INT2FIX(CV_VERSION_MAJOR));
rb_define_const(rb_module, "CV_VERSION_MINOR", INT2FIX(CV_VERSION_MINOR));
rb_define_const(rb_module, "CV_VERSION_REVISION", INT2FIX(CV_VERSION_REVISION));
/* 0: 8bit unsigned */
rb_define_const(rb_module, "CV_8U", INT2FIX(CV_8U));
/* 1: 8bit signed */

2
lib/opencv/version.rb
View file

@ -1,3 +1,3 @@
module OpenCV
VERSION = '0.0.9'
VERSION = '0.0.10'
end

13
ruby-opencv.gemspec
View file

@ -1,12 +1,13 @@
# -*- encoding: utf-8 -*-
# stub: ruby-opencv 0.0.10.20130930024902 ruby lib
Gem::Specification.new do |s|
s.name = "ruby-opencv"
s.version = "0.0.9.20130707061345"
s.version = "0.0.10.20130930024902"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["lsxi", "ser1zw", "pcting"]
s.date = "2013-07-06"
s.date = "2013-09-29"
s.description = "ruby-opencv is a wrapper of OpenCV for Ruby. It helps you to write computer vision programs (e.g. detecting faces from pictures) with Ruby."
s.email = ["masakazu.yonekura@gmail.com", "azariahsawtikes@gmail.com", "pcting@gmail.com"]
s.extensions = ["ext/opencv/extconf.rb"]
@ -17,7 +18,7 @@ Gem::Specification.new do |s|
s.rdoc_options = ["--main", "README.md"]
s.require_paths = ["lib"]
s.rubyforge_project = "ruby-opencv"
s.rubygems_version = "2.0.3"
s.rubygems_version = "2.1.4"
s.summary = "OpenCV wrapper for Ruby"
s.test_files = ["test/test_cvhistogram.rb", "test/test_cvconnectedcomp.rb", "test/test_mouseevent.rb", "test/test_opencv.rb", "test/test_cvmat_imageprocessing.rb", "test/test_cvmat.rb", "test/test_cvfeaturetree.rb", "test/test_iplconvkernel.rb", "test/test_cvchain.rb", "test/test_cvmat_drawing.rb", "test/test_cvpoint.rb", "test/test_trackbar.rb", "test/test_cvsize2d32f.rb", "test/test_cvsurfparams.rb", "test/test_cvscalar.rb", "test/test_cverror.rb", "test/test_cvhumoments.rb", "test/test_iplimage.rb", "test/test_cvslice.rb", "test/test_cvtwopoints.rb", "test/test_cvfont.rb", "test/test_eigenfaces.rb", "test/test_cvseq.rb", "test/test_cvcontour.rb", "test/test_curve.rb", "test/test_cvsize.rb", "test/test_window.rb", "test/test_cvbox2d.rb", "test/test_cvpoint2d32f.rb", "test/test_cvcapture.rb", "test/test_pointset.rb", "test/test_cvcontourtree.rb", "test/test_cvavgcomp.rb", "test/test_cvsurfpoint.rb", "test/test_cvrect.rb", "test/test_cvline.rb", "test/test_cvvideowriter.rb", "test/test_cvpoint3d32f.rb", "test/test_cvmat_matching.rb", "test/test_cvcircle32f.rb", "test/test_preliminary.rb", "test/test_cvmat_dxt.rb", "test/test_cvmoments.rb", "test/test_cvtermcriteria.rb", "test/test_cvhaarclassifiercascade.rb"]
@ -28,17 +29,17 @@ Gem::Specification.new do |s|
s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
s.add_development_dependency(%q<rake-compiler>, [">= 0"])
s.add_development_dependency(%q<hoe-gemspec>, [">= 0"])
s.add_development_dependency(%q<hoe>, ["~> 3.6"])
s.add_development_dependency(%q<hoe>, ["~> 3.7"])
else
s.add_dependency(%q<rdoc>, ["~> 4.0"])
s.add_dependency(%q<rake-compiler>, [">= 0"])
s.add_dependency(%q<hoe-gemspec>, [">= 0"])
s.add_dependency(%q<hoe>, ["~> 3.6"])
s.add_dependency(%q<hoe>, ["~> 3.7"])
end
else
s.add_dependency(%q<rdoc>, ["~> 4.0"])
s.add_dependency(%q<rake-compiler>, [">= 0"])
s.add_dependency(%q<hoe-gemspec>, [">= 0"])
s.add_dependency(%q<hoe>, ["~> 3.6"])
s.add_dependency(%q<hoe>, ["~> 3.7"])
end
end

9
test/test_opencv.rb
View file

@ -9,10 +9,15 @@ include OpenCV
class TestOpenCV < OpenCVTestCase
def test_constants
# OpenCV version
assert_equal('2.4.3', CV_VERSION)
assert_equal('2.4.6.1', CV_VERSION)
assert_equal(2, CV_MAJOR_VERSION)
assert_equal(4, CV_MINOR_VERSION)
assert_equal(3, CV_SUBMINOR_VERSION)
assert_equal(6, CV_SUBMINOR_VERSION)
assert_equal(2, CV_VERSION_EPOCH)
assert_equal(4, CV_VERSION_MAJOR)
assert_equal(6, CV_VERSION_MINOR)
assert_equal(1, CV_VERSION_REVISION)
# Depths
assert_equal(0, CV_8U)