ropencv 0.0.11 → 0.0.12

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d2e6aa5a66cdc073f75cbcef5ecdf2754dec1b9c
+  data.tar.gz: 78f996037687e4e836aee3f2ca2f540f79ece752
+SHA512:
+  metadata.gz: b94532ed19232a2bd9a3758cfa13293f999fb94139b51c0b9ee5dbd742c07d82c06516c5465d4439c7d51bb920a82b791dccf9e0232bb5812d1e47b01fa32987
+  data.tar.gz: fd2e2023995003ccfbcd35edfc59c373d2f58dcd998828ab26ac7f21fe79d00f544167c87bb199390e774aad4a9279970ba96be9896f478e1e712e0d7fa93456

data/examples/hough_circles.rb

@@ -0,0 +1,22 @@
+require 'ropencv'
+include OpenCV
+
+img = cv::imread("logo.png")
+gray = cv::Mat.new
+cv::cvtColor(img,gray,CV_BGR2GRAY)
+
+circles = cv::Mat.new
+cv::HoughCircles(gray, circles, CV_HOUGH_GRADIENT, 1, gray.rows/10, 10, 20 );
+circles = circles.reshape(1,circles.cols)
+
+circles.each_row do |circle|
+    center = cv::Point.new(circle[0].round, circle[1].round)
+    radius = circle[2].round
+    # draw the circle center
+    cv::circle( img, center, 3, cv::Scalar.new(0,255,0),-1,8,0)
+    # draw the circle outline
+    cv::circle( img, center, radius, cv::Scalar.new(0,0,255),3, 8,0)
+end
+
+cv::imshow("Circles",img)
+cv::wait_key(-1)

data/examples/match_keypoints.rb

@@ -0,0 +1,33 @@
+require 'ropencv'
+include OpenCV
+
+img1 = cv::imread('tsukuba_l.png',CV_LOAD_IMAGE_GRAYSCALE)
+img2 = cv::imread('tsukuba_r.png',CV_LOAD_IMAGE_GRAYSCALE)
+if (img1.empty() || img2.empty())
+    puts("Can't read one of the images\n")
+    return -1
+end
+
+keypoints1=Vector.new(cv::KeyPoint)
+keypoints2=Vector.new(cv::KeyPoint)
+detector = cv::FeatureDetector::create('SURF')
+detector.detect(img1, keypoints1)
+detector.detect(img2, keypoints2)
+
+# computing descriptors
+extractor=cv::DescriptorExtractor::create('SURF')
+descriptors2=cv::Mat.new(3, 4, cv::CV_64FC1)
+descriptors1=cv::Mat.new(3, 4, cv::CV_64FC1)
+extractor.compute(img1, keypoints1, descriptors1)
+extractor.compute(img2, keypoints2, descriptors2)
+
+# matching descriptors
+matcher= cv::BFMatcher::create('BruteForce-L1')
+matches= Vector.new(cv::DMatch)
+matcher.match(descriptors1, descriptors2, matches)
+
+# drawing the results
+img_matches=cv::Mat.new(3, 4, cv::CV_64FC1)
+cv::drawMatches(img1, keypoints1, img2, keypoints2, matches, img_matches)
+cv::imshow("matches", img_matches)
+cv::waitKey(0)

data/ext/helper.rb

@@ -27,6 +27,36 @@ class OpenCVPtr < Rbind::RTemplateClass
     end
 end
 
+# Template for opencv's new smart pointer
+class OpenCVPtr2 < Rbind::RTemplateClass
+    def initialize(name="cv::Ptr")
+        super
+    end
+
+    def specialize(klass,*parameters)
+        if parameters.size != 1
+            raise ArgumentError,"OpenCVPtr2 does only support one template parameter. Got: #{parameters}}"
+        end
+        ptr_type = parameters.first
+
+        klass.add_operation Rbind::ROperation.new(klass.name,nil,Rbind::RParameter.new("other",klass))
+        klass.add_operation Rbind::ROperation.new(klass.name,nil,Rbind::RParameter.new("p",ptr_type.to_ptr))
+        klass.add_operation Rbind::ROperation.new("release",type("void"))
+        klass.add_operation Rbind::ROperation.new("reset",type("void"),Rbind::RParameter.new("p",ptr_type.to_ptr))
+        klass.add_operation Rbind::ROperation.new("swap",type("void"),Rbind::RParameter.new("other",klass))
+        klass.add_operation Rbind::ROperation.new("get",ptr_type.to_ptr)
+        klass.add_operation Rbind::ROperation.new("empty",type("bool"))
+        klass
+    end
+
+    def specialize_ruby_specialization(klass)
+        "    def method_missing(m,*args)\n"\
+            "        raise \"Ptr #{self} is empty. Cannot call \#{m} on it!\" if empty\n"\
+        "        get.method(m).call(*args)\n"\
+            "    end\n"
+    end
+end
+
 class Vec < Rbind::RClass
     def initialize(name,type,size)
         super(name)

data/ext/opencv.txt

@@ -229,17 +229,17 @@ cv.Size.Size
     int height
 cv.Size.area int
 class cv.Size2f
-    int width  /RW
-    int height /RW
+    float width  /RW
+    float height /RW
 cv.Size2f.Size2f
 cv.Size2f.Size2f
     Size2f sz
 cv.Size2f.Size2f
     Point2f  pt
 cv.Size2f.Size2f
-    int width
-    int height
-cv.Size2f.area int
+    float width
+    float height
+cv.Size2f.area float
 cv.Rect.Rect
 cv.Rect.Rect
     Rect rect

data/ext/rbind.rb

@@ -13,10 +13,11 @@ rbind.includes = opencv_headers
 rbind.parser.type_alias["const_c_string"] = rbind.c_string.to_const
 if opencv_version >= "2.4.9"
     rbind.add_std_types
+    rbind.parser.add_type OpenCVPtr2.new
 else
     rbind.add_std_vector
+    rbind.parser.add_type OpenCVPtr.new
 end
-rbind.parser.add_type OpenCVPtr.new
 
 # add Vec types
 2.upto(6) do |idx|
@@ -36,9 +37,15 @@ rbind.parse_headers
 rbind.parse File.join(File.dirname(__FILE__),"post_opencv244.txt")
 
 # post parsing + patching wrong signatures
-if opencv_version >= "2.4.9"
+if opencv_version >= "2.4.9" && opencv_version < "3.0.0"
+    rbind.parse File.join(File.dirname(__FILE__),"post_opencv249.txt")
+    rbind.cv.randShuffle.parameter(2).remove_const!
+elsif opencv_version >= "3.0.0"
     rbind.parse File.join(File.dirname(__FILE__),"post_opencv249.txt")
     rbind.cv.randShuffle.parameter(2).remove_const!
+    rbind.cv.AlignExposures.process.parameter(1).remove_const!
+    rbind.cv.AlignMTB.process[0].parameter(1).remove_const!
+    rbind.cv.AlignMTB.process[1].parameter(1).remove_const!
 end
 
 rbind.cv.CascadeClassifier.detectMultiScale[1].parameter(2).remove_const!
@@ -82,6 +89,14 @@ if ARGV.include?("--doc")
     end
 end
 
+# replace default parameter values which are template
+# functions and not available on the ruby side
+Rbind::GeneratorRuby.on_normalize_default_value do |parameter|
+    if parameter.default_value =~ /.*makePtr<(.*)>\(\)/
+        "cv::Ptr<#{$1}>(new #{$1})"
+    end
+end
+
 # generate files
 rbind.generator_ruby.file_prefix = "ropencv"
 rbind.generate(File.join(File.dirname(__FILE__),"src"),File.join(File.dirname(__FILE__),"..","lib","ropencv"))

data/lib/ropencv/ropencv_ruby.rb

@@ -1,9 +1,12 @@
 module OpenCV
     def self.included(obj)
-        obj.class_eval do 
+        obj.class_eval do
             def cv
                 Cv
             end
+            def std
+                Std
+            end
         end
     end
 
@@ -68,6 +71,44 @@ module OpenCV
             end
         end
 
+        module Vec2x
+            def self.included base
+                base.instance_eval do
+                    def to_native(obj,context)
+                        if obj.is_a? ::OpenCV::Cv::Point
+                            self.new(obj.x,obj.y).__obj_ptr__
+                        elsif obj.is_a? ::OpenCV::Cv::Point2f
+                            self.new(obj.x,obj.y).__obj_ptr__
+                        elsif obj.is_a? ::OpenCV::Cv::Point2d
+                            self.new(obj.x,obj.y).__obj_ptr__
+                        elsif obj.is_a?(::OpenCV::Cv::Mat) && obj.rows == 2 && obj.cols == 1
+                            self.new(obj[0],obj[1]).__obj_ptr__
+                        else
+                            rbind_to_native(obj,context)
+                        end
+                    end
+                end
+            end
+        end
+
+        module Vec3x
+            def self.included base
+                base.instance_eval do
+                    def to_native(obj,context)
+                        if obj.is_a? ::OpenCV::Cv::Point3f
+                            self.new(obj.x,obj.y,obj.z).__obj_ptr__
+                        elsif obj.is_a? ::OpenCV::Cv::Point3d
+                            self.new(obj.x,obj.y,obj.z).__obj_ptr__
+                        elsif obj.is_a?(::OpenCV::Cv::Mat) && obj.rows == 3 && obj.cols == 1
+                            self.new(obj[0],obj[1],obj[2]).__obj_ptr__
+                        else
+                            rbind_to_native(obj,context)
+                        end
+                    end
+                end
+            end
+        end
+
         module Vecxd
             def [](i)
                 raise "Out of bound #{i}" if i < 0 || i >= self.class::SIZE
@@ -110,13 +151,13 @@ module OpenCV
             end
         end
 
-        class Vec2d;include Vecxd; SIZE=2;end
-        class Vec2f;include Vecxf; SIZE=2;end
-        class Vec2i;include Vecxi; SIZE=2;end
+        class Vec2d;include Vecxd;include Vec2x; SIZE=2;end
+        class Vec2f;include Vecxf;include Vec2x; SIZE=2;end
+        class Vec2i;include Vecxi;include Vec2x; SIZE=2;end
 
-        class Vec3d;include Vecxd; SIZE=3;end
-        class Vec3f;include Vecxf; SIZE=3;end
-        class Vec3i;include Vecxi; SIZE=3;end
+        class Vec3d;include Vecxd;include Vec3x; SIZE=3;end
+        class Vec3f;include Vecxf;include Vec3x; SIZE=3;end
+        class Vec3i;include Vecxi;include Vec3x; SIZE=3;end
 
         class Vec4d;include Vecxd; SIZE=4;end
         class Vec4f;include Vecxf; SIZE=4;end
@@ -160,7 +201,7 @@ module OpenCV
                                        elsif e.is_a? Float
                                            [:put_array_of_float64,8*w,CV_64FC1]
                                        else
-                                           raise "cannot connvert arrays of #{e.class} to array"
+                                           raise ArgumentError,"cannot connvert array of #{e.class} to cv::Mat"
                                        end
                     mat = Mat.new(h,w,type)
                     ptr = mat.data
@@ -169,7 +210,7 @@ module OpenCV
                         setter.call(0,obj)
                     else
                         obj.each_with_index do |row,i|
-                            raise "number of row elements must be equal for each row" if row.size != w
+                            raise ArgumentError, "number of row elements must be equal for each row" if row.size != w
                             setter.call(i*step,row)
                         end
                     end
@@ -340,6 +381,48 @@ module OpenCV
                     pp.text str
             end
 
+            def each_row_with_index(&block)
+                if block_given?
+                    r = rows
+                    0.upto(r-1) do |i|
+                        yield(row(i),i)
+                    end
+                else
+                    to_enum(:each_row_with_index)
+                end
+            end
+
+            def each_col_with_index(&block)
+                if block_given?
+                    c = cols
+                    0.upto(c-1) do |i|
+                        yield(col(i),i)
+                    end
+                else
+                    to_enum(:each_col_with_index)
+                end
+            end
+
+            def each_row(&block)
+                if block_given?
+                    each_row_with_index do |r,i|
+                        yield(r)
+                    end
+                else
+                    to_enum(:each_row)
+                end
+            end
+
+            def each_col(&block)
+                if block_given?
+                    each_col_with_index do |c,i|
+                        yield(c)
+                    end
+                else
+                    to_enum(:each_col)
+                end
+            end
+
             def to_a
                 h,w,c,s,ptr = [rows,cols,channels,step,data]
                 getter = case type & 7

data/ropencv.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name              = 'ropencv'
-    s.version           = '0.0.11'
-    s.date              = '2013-08-21'
+    s.version           = '0.0.12'
+    s.date              = '2013-10-29'
     s.platform          = Gem::Platform::RUBY
     s.authors           = ['Alexander Duda']
     s.email             = ['Alexander.Duda@dfki.de']
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
     s.files             = `git ls-files`.split("\n") + ["lib/ropencv/ropencv_types.rb","lib/ropencv/ropencv_ruby.rb"]
     s.require_path      = 'lib'
     s.required_rubygems_version = ">= 1.3.6"
-    s.add_runtime_dependency "rbind", "~> 0.0.21"
+    s.add_runtime_dependency "rbind", ">= 0.0.22"
     s.add_runtime_dependency "ffi", "~> 1.9.0"
     s.extensions = ['ext/extconf.rb']
     s.license = 'BSD'

data/test/suite.rb

@@ -2,4 +2,5 @@ require './test_mat'
 require './test_vec'
 require './test_vector'
 require './test_scalar'
+require './test_opencv'
 require './test_triangulate_points'

data/test/test_mat.rb

@@ -49,6 +49,79 @@ describe Cv::Mat do
         end
     end
 
+    describe "each_row" do
+        it "iterators over each row" do
+            mat = cv::Mat.new([1,2,3],[3,3,3],[5,6,7])
+            result = []
+            mat.each_row do |r|
+                result << r
+            end
+            assert_equal [1,2,3], result[0].to_a.flatten!
+            assert_equal [3,3,3], result[1].to_a.flatten!
+            assert_equal [5,6,7], result[2].to_a.flatten!
+        end
+        it "returns an enumerator if no block is given" do
+            mat = cv::Mat.new([1,2,3],[3,3,3],[5,6,7])
+            result = mat.each_row.to_a
+            assert_equal [1,2,3], result[0].to_a.flatten!
+            assert_equal [3,3,3], result[1].to_a.flatten!
+            assert_equal [5,6,7], result[2].to_a.flatten!
+        end
+    end
+
+    describe "each_row_with_index" do
+        it "iterators over each row" do
+            mat = cv::Mat.new([1,2,3],[3,3,3],[5,6,7])
+            result = []
+            result_i = []
+            mat.each_row_with_index do |r,i|
+                result << r
+                result_i << i
+            end
+            assert_equal [1,2,3], result[0].to_a.flatten!
+            assert_equal [3,3,3], result[1].to_a.flatten!
+            assert_equal [5,6,7], result[2].to_a.flatten!
+            assert_equal [0,1,2], result_i
+        end
+    end
+
+    describe "each_col" do
+        it "iterators over each col" do
+            mat = cv::Mat.new([1,2,3],[3,3,3],[5,6,7])
+            result = []
+            mat.each_col do |r|
+                result << r
+            end
+            assert_equal [1,3,5], result[0].to_a.flatten!
+            assert_equal [2,3,6], result[1].to_a.flatten!
+            assert_equal [3,3,7], result[2].to_a.flatten!
+        end
+        it "returns an enumerator if no block is given" do
+            mat = cv::Mat.new([1,2,3],[3,3,3],[5,6,7])
+            result = mat.each_col.to_a
+            assert_equal [1,3,5], result[0].to_a.flatten!
+            assert_equal [2,3,6], result[1].to_a.flatten!
+            assert_equal [3,3,7], result[2].to_a.flatten!
+        end
+    end
+
+    describe "each_col_with_index" do
+        it "iterators over each col" do
+            mat = cv::Mat.new([1,2,3],[3,3,3],[5,6,7])
+            result = []
+            result_i = []
+            mat.each_col_with_index do |c,i|
+                result << c
+                result_i << i
+            end
+            assert_equal [1,3,5], result[0].to_a.flatten!
+            assert_equal [2,3,6], result[1].to_a.flatten!
+            assert_equal [3,3,7], result[2].to_a.flatten!
+            assert_equal [0,1,2], result_i
+        end
+    end
+
+
     describe "[]" do
         it "can return a specific value" do
             mat = cv::Mat.new([1,2,3],[3,3,3],[5,6,7])

data/test/test_opencv.rb

@@ -0,0 +1,28 @@
+require 'minitest/spec'
+require 'ropencv'
+require 'pp'
+include OpenCV
+
+MiniTest::Unit.autorun
+describe OpenCV::Cv do
+    before do
+    end
+
+    after do
+    end
+
+    describe "perspectiveTransfrom" do
+        it "can be called from ruby" do
+            t = cv::Mat::eye(3,3, cv::CV_64FC1)
+            points = std::Vector.new(cv::Point2f)
+            0.upto 10 do |i|
+                points << cv::Point2f.new(i,i)
+            end
+            mat = cv::Mat.new(points).reshape(2,points.size)
+            out = cv::Mat.new
+            cv::perspectiveTransform(mat,out,t)
+            assert_equal points.size, out.rows
+        end
+    end
+end
+

metadata

@@ -1,56 +1,63 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ropencv
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.0.11
+version: !ruby/object:Gem::Version
+  version: 0.0.12
 platform: ruby
-authors: 
+authors:
 - Alexander Duda
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-08-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-10-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rbind
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.22
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.22
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.0.21
+      - !ruby/object:Gem::Version
+        version: 1.9.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ffi
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.9.0
-  type: :runtime
-  version_requirements: *id002
-description: ROpenCV is a ffi ruby binding for the Open Source Computer Vision Library OpenCV 2.4.4 and higher
-email: 
+description: ROpenCV is a ffi ruby binding for the Open Source Computer Vision Library
+  OpenCV 2.4.4 and higher
+email:
 - Alexander.Duda@dfki.de
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .yardopts
 - CMakeLists.txt
 - License.txt
 - README.md
 - examples/find_keypoints.rb
+- examples/hough_circles.rb
 - examples/logo.png
+- examples/match_keypoints.rb
+- examples/tsukuba_l.png
+- examples/tsukuba_r.png
 - ext/CMakeLists.txt
 - ext/extconf.rb
 - ext/helper.rb
@@ -71,38 +78,34 @@ files:
 - ropencv.gemspec
 - test/suite.rb
 - test/test_mat.rb
+- test/test_opencv.rb
 - test/test_scalar.rb
 - test/test_triangulate_points.rb
 - test/test_vec.rb
 - test/test_vector.rb
 - lib/ropencv/ropencv_types.rb
 homepage: http://www.ropencv.aduda.eu
-licenses: 
+licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby bindings for opencv 2.4.4 and higher
 test_files: []
-
-has_rdoc: