ropencv 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd8ab218b838274f85686f33fbac6b91abd46097
-  data.tar.gz: 7eb519e53bb782f17665dc6f4fc3a90c558cb2f2
+  metadata.gz: ed24be2b4f9b19d2ab4170ad578b3d78d36958e4
+  data.tar.gz: 4d4520ac61ca76f16bf3a7961f6240f2c6cf9f10
 SHA512:
-  metadata.gz: 5cf14edc726ab2dd119bcc804e81f3bafb43538083394afa74d75b7fd7015a988cf08ae1218e995d961416209875806c313a7e66fbd4f6999c637501c57ec046
-  data.tar.gz: f11e563f715217ad25fb7576107f7af949db69cdef3d7b95260eaefe1c123f8ae0bffd26fe4c49aff62028ff448db7e2c9a84b4d5153fbdd8b88a99a3d6fd144
+  metadata.gz: 47aea3c934fe8500236d0ad798dad58d6abaeafe1fe6c0e9fdf47635da080b6549df5ca777ed99a6b68c959c7a64d91db889c17c04a1091487189fe074e88cb9
+  data.tar.gz: b1e32dda67c171d45095c114b0550c0ebdd0c7bb46577636673be39edd95d98c965fbe208df74efa2fb32bcc5b3b4151bd492189e103c1220773d0162232e90b

data/ext/helper.rb

@@ -15,7 +15,7 @@ class OpenCVPtr < Rbind::RTemplateClass
         klass.add_operation Rbind::ROperation.new("release",type("void"))
         klass.add_operation Rbind::ROperation.new("delete_obj",type("void"))
         klass.add_operation Rbind::ROperation.new("empty",type("bool"))
-        klass.add_attribute Rbind::RAttribute.new("obj",ptr_type.to_ptr)
+        klass.add_attribute Rbind::RAttribute.new("obj",ptr_type.to_ptr.to_ownership(false))
         klass
     end
 
@@ -44,7 +44,7 @@ class OpenCVPtr2 < Rbind::RTemplateClass
         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("get",ptr_type.to_ptr.to_ownership(false))
         klass.add_operation Rbind::ROperation.new("empty",type("bool"))
         klass
     end
@@ -99,7 +99,7 @@ def find_opencv
                       "opencv2/core/core.hpp", "opencv2/flann/miniflann.hpp",
                       "opencv2/imgproc/imgproc_c.h", "opencv2/imgproc/types_c.h",
                       "opencv2/imgproc/imgproc.hpp", "opencv2/photo/photo_c.h",
-                      "opencv2/photo/photo.hpp", "opencv2/video/video.hpp",
+                      "opencv2/photo/photo.hpp", "opencv2/video/video.hpp","opencv2/video/tracking.hpp",
                       "opencv2/features2d/features2d.hpp", "opencv2/objdetect/objdetect.hpp",
                       "opencv2/calib3d/calib3d.hpp", "opencv2/ml/ml.hpp",
                       "opencv2/highgui/highgui_c.h", "opencv2/highgui/highgui.hpp",
@@ -115,7 +115,7 @@ def find_opencv
                       "opencv2/nonfree/features2d.hpp", "opencv2/objdetect.hpp",
                       "opencv2/photo.hpp", "opencv2/softcascade.hpp",
                       "opencv2/stitching.hpp", "opencv2/superres.hpp",
-                      "opencv2/video.hpp", "opencv2/legacy.hpp",
+                      "opencv2/video.hpp", "opencv2/legacy.hpp","opencv2/video/tracking.hpp",
                       "opencv2/videostab.hpp"]
     else
         raise "OpenCV version #{opencv_version} is not supported"

data/ext/opencv.txt

@@ -1,3 +1,7 @@
+const cv.CV_LKFLOW_PYR_A_READY       1
+const cv.CV_LKFLOW_PYR_B_READY       2
+const cv.CV_LKFLOW_INITIAL_GUESSES   4
+const cv.CV_LKFLOW_GET_MIN_EIGENVALS 8
 const cv.INT_MAX 2147483647
 const cv.CV_8U 0
 const cv.CV_8S 1
@@ -274,7 +278,6 @@ cv.Rect.size Size
 cv.Rect.area int
 cv.Rect.contains bool
     Point point
-class CvTermCriteria
 class CvDTreeNode
 class CvSlice
 class cvflann.flann_algorithm_t
@@ -291,6 +294,15 @@ cv.RotatedRect.RotatedRect
 cv.RotatedRect.boundingRect Rect
 class cv.FileNode
 class cv.TermCriteria
+cv.TermCriteria.TermCriteria
+    int type /RW
+    int maxCount /RW
+    double epsilon /RW
+cv.TermCriteria.TermCriteria
+    int type
+    int maxCount
+    double epsilon
+class CvTermCriteria
 class cv.flann::IndexParams
 class cv.flann::SearchParams
 class cv.FeatureDetector

data/ext/rbind.rb

@@ -48,6 +48,14 @@ elsif opencv_version >= "3.0.0"
     rbind.cv.AlignMTB.process[1].parameter(1).remove_const!
 end
 
+rbind.cv.calcOpticalFlowSF[0].parameter(0).remove_const!
+rbind.cv.calcOpticalFlowSF[0].parameter(1).remove_const!
+rbind.cv.calcOpticalFlowSF[0].parameter(2).remove_const!
+
+rbind.cv.calcOpticalFlowSF[1].parameter(0).remove_const!
+rbind.cv.calcOpticalFlowSF[1].parameter(1).remove_const!
+rbind.cv.calcOpticalFlowSF[1].parameter(2).remove_const!
+
 rbind.cv.CascadeClassifier.detectMultiScale[1].parameter(2).remove_const!
 rbind.cv.CascadeClassifier.detectMultiScale[1].parameter(3).remove_const!
 

data/lib/ropencv/ropencv_ruby.rb

@@ -25,13 +25,13 @@ module OpenCV
                     if obj.is_a?(Vector::Std_Vector_Cv_Point2f)
                         t = Vector::Cv_Mat.new
                         obj.each do |e|
-                            t << cv::Mat.new(e.size,2,cv::CV_32FC1,e.data,cv::Mat::AUTO_STEP)
+                            t << Cv::Mat.new(e.size,2,Cv::CV_32FC1,e.data,Cv::Mat::AUTO_STEP)
                         end
                         t.__obj_ptr__
                     elsif obj.is_a?(Vector::Std_Vector_Cv_Point)
                         t = Vector::Cv_Mat.new
                         obj.each do |e|
-                            t << cv::Mat.new(e.size,2,cv::CV_32SC1,e.data,cv::Mat::AUTO_STEP)
+                            t << Cv::Mat.new(e.size,2,Cv::CV_32SC1,e.data,Cv::Mat::AUTO_STEP)
                         end
                         t.__obj_ptr__
                     else
@@ -44,6 +44,10 @@ module OpenCV
     include Std
 
     module Cv
+        # reflect some typedefs
+        GoodFeatureToTrackDetector = GFTTDetector if defined? GFTTDetector
+        StarFeatureDetector = StarDetector if defined? StarDetector
+
         def self.min_max_loc(src,min_loc = Point.new,max_loc = Point.new,mask = Mat.new)
             p = FFI::MemoryPointer.new(:double,2)
             Rbind::cv_min_max_loc(src, p[0], p[1], min_loc, max_loc, mask)
@@ -258,7 +262,7 @@ module OpenCV
             def to_mat
                 raise RuntimeError, "FileNode is empty" if empty?
                 raise RuntimeError, "FileNode is not storing a Mat" unless isMap
-                val = cv::Mat.new
+                val = Cv::Mat.new
                 read_mat(val)
                 val
             end
@@ -290,7 +294,7 @@ module OpenCV
             def to_string
                 raise RuntimeError, "FileNode is empty" if empty?
                 raise RuntimeError, "FileNode is not storing a string" unless isString
-                str = cv::String.new
+                str = Cv::String.new
                 read_string(str)
                 str
             end
@@ -321,25 +325,33 @@ module OpenCV
 
             def self.to_native(obj,context)
                 if obj.is_a?(Std::Vector::Cv_Point)
-                    cv::Mat.new(obj.size,1,cv::CV_32SC2,obj.data,cv::Mat::AUTO_STEP).__obj_ptr__
+                    Cv::Mat.new(obj.size,1,Cv::CV_32SC2,obj.data,Cv::Mat::AUTO_STEP).__obj_ptr__
                 elsif obj.is_a?(Std::Vector::Cv_Point2f)
-                    cv::Mat.new(obj.size,1,cv::CV_32FC2,obj.data,cv::Mat::AUTO_STEP).__obj_ptr__
+                    Cv::Mat.new(obj.size,1,Cv::CV_32FC2,obj.data,Cv::Mat::AUTO_STEP).__obj_ptr__
                 elsif obj.is_a?(Std::Vector::Cv_Point3f)
-                    cv::Mat.new(obj.size,1,cv::CV_32FC3,obj.data,cv::Mat::AUTO_STEP).__obj_ptr__
+                    Cv::Mat.new(obj.size,1,Cv::CV_32FC3,obj.data,Cv::Mat::AUTO_STEP).__obj_ptr__
                 elsif obj.is_a?(Std::Vector::Fixnum)
-                    cv::Mat.new(obj.size,1,cv::CV_32SC1,obj.data,cv::Mat::AUTO_STEP).__obj_ptr__
+                    Cv::Mat.new(obj.size,1,Cv::CV_32SC1,obj.data,Cv::Mat::AUTO_STEP).__obj_ptr__
                 elsif obj.is_a?(Array)
                     h,w,e= if obj.first.is_a? Array
-                               [obj.size,obj.first.size,obj.first.first]
+                               if obj.find {|array| array.find(Float)}
+                                   [obj.size,obj.first.size,obj.first.first.to_f]
+                               else
+                                   [obj.size,obj.first.size,obj.first.first]
+                               end
                            else
-                               [obj.size,1,obj.first]
+                               if obj.find(Float)
+                                   [obj.size,1,obj.first.to_f]
+                               else
+                                   [obj.size,1,obj.first]
+                               end
                            end
                     setter,step,type = if e.is_a? Fixnum
                                            [:put_array_of_int32,4*w,CV_32SC1]
                                        elsif e.is_a? Float
                                            [:put_array_of_float64,8*w,CV_64FC1]
                                        else
-                                           raise ArgumentError,"cannot connvert array of #{e.class} to cv::Mat"
+                                           raise ArgumentError,"cannot connvert array of #{e.class} to Cv::Mat"
                                        end
                     mat = Mat.new(h,w,type)
                     ptr = mat.data
@@ -359,10 +371,11 @@ module OpenCV
             end
 
             def -@
-                cv::Mat.zeros(rows,cols,type)-self
+                Cv::Mat.zeros(rows,cols,type)-self
             end
 
-            def at(i,j=nil)
+            def at(i,j=nil,k=0)
+                raise ArgumentError,"channel #{k} out of bound" if k >= channels
                 i,j = if j == nil
                           if i.is_a?(Cv::Point)
                               [i.y,i.x]
@@ -377,6 +390,7 @@ module OpenCV
                 if i >= rows || i < 0 || j >= cols || j <0
                     raise ArgumentError,"out of bound #{i}/#{j} #{rows}/#{cols}"
                 end
+                j = j*channels+k
                 case type & 7
                 when CV_8U
                     data.get_uint8(i*step+j)
@@ -422,7 +436,14 @@ module OpenCV
                 end
             end
 
-            def set(i,j,val=nil)
+            def set(i,j,k=nil,val=nil)
+                k,val = if val == nil
+                            [val,k]
+                        else
+                            [k,val]
+                        end
+                k ||= 0
+                raise ArgumentError,"channel #{k} out of bound" if k >= channels
                 i,j,val = if val == nil
                               if i.is_a?(Cv::Point)
                                   [i.y,i.x,j]
@@ -437,6 +458,7 @@ module OpenCV
                 if i >= rows || i < 0 || j >= cols || j <0
                     raise ArgumentError,"out of bound #{i}/#{j}"
                 end
+                j = j*channels+k
                 case type & 7
                 when CV_8U
                     data.put_uint8(i*step+j,val)
@@ -455,12 +477,12 @@ module OpenCV
                 end
             end
 
-            def [](i,j=nil)
-                at(i,j)
+            def [](i,j=nil,k=0)
+                at(i,j,k)
             end
 
-            def []=(i,j,val=nil)
-                set(i,j,val)
+            def []=(i,j,k=nil,val=nil)
+                set(i,j,k,val)
             end
 
             def -(val)
@@ -573,6 +595,18 @@ module OpenCV
                 end
             end
 
+            # returns a string compatible to matlab's MAT-file
+            def to_MAT(variable_name)
+<<eos
+# Created by ropencv, #{Time.now}
+# name: #{variable_name}
+# type: matrix
+# rows: #{rows}
+# columns: #{cols}
+#{to_a.map{|row|row.join(" ")}.join("\n")}
+eos
+            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.13'
-    s.date              = '2013-12-12'
+    s.version           = '0.0.14'
+    s.date              = '2014-02-16'
     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.23"
+    s.add_runtime_dependency "rbind", ">= 0.0.24"
     s.add_runtime_dependency "ffi", "~> 1.9.0"
     s.extensions = ['ext/extconf.rb']
     s.license = 'BSD'

data/test/test_mat.rb

@@ -127,6 +127,17 @@ describe Cv::Mat do
             mat = cv::Mat.new([1,2,3],[3,3,3],[5,6,7])
             assert_equal 6, mat[2,1]
         end
+
+        it "can access different channels" do
+            mats = std::Vector.new(cv::Mat)
+            mats.push_back(cv::Mat::zeros(10,10,cv::CV_8UC1))
+            mats.push_back(cv::Mat::ones(10,10,cv::CV_8UC1))
+            mat = cv::Mat.new
+            cv::merge(mats,mat)
+
+            assert_equal 0, mat[9,9]
+            assert_equal 1, mat[8,8,1]
+        end
     end
 
     describe "[]=" do
@@ -136,5 +147,19 @@ describe Cv::Mat do
             mat[1,2] = 4
             assert_equal [[1,2,3],[3,3,4],[5,6,7]], mat.to_a
         end
+
+        it "can change different channels" do
+            mats = std::Vector.new(cv::Mat)
+            mat = cv::Mat::zeros(10,10,cv::CV_32FC3)
+
+            mat[9,9,0] = 123
+            mat[9,9,1] = 130
+            mat[9,9,2] = 140
+
+            cv::split(mat,mats)
+            assert_equal 123.0, mats[0][9,9]
+            assert_equal 130.0, mats[1][9,9]
+            assert_equal 140.0, mats[2][9,9]
+        end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ropencv
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Alexander Duda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbind
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.23
+        version: 0.0.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.23
+        version: 0.0.24
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement