ropencv 0.0.15 → 0.0.16

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 39055e33e22c2615099251a767b83f5b97e948ff
+  data.tar.gz: 392dcbf781cfa6323b5029274e411ebd3f4a9d45
+SHA512:
+  metadata.gz: 375174256aeba9a7a90819635759a0a83a82340d05926c22b89d921a7f8044565f20a0e2d5b7a18975a2a1e1b04620962acca7e7dc9f0735b4b99d119b1d30b1
+  data.tar.gz: 782e554b59894e2af9f706710b84952a705a5308c4dd554bab1176a80cc5bbc903871b6b71e69c58d7790b81c2ec73d622a5bf92b3338c296bf4776f1f85ff1f

data/examples/polyfit.rb

@@ -0,0 +1,23 @@
+require 'ropencv'
+require 'pp'
+
+include OpenCV
+
+# values do not have to be ordered
+# y = 3x^2-2x+1
+x = [2.0,4.0,0.0,1.0,10]
+y = x.map do |val|
+    3.0*val*val-2.0*val+1
+end
+
+# only CV_32F is supported by opencv for now
+x = cv::Mat.new(x)
+x.convert_to(x,cv::CV_32F)
+y = cv::Mat.new(y)
+y.convert_to(y,cv::CV_32F)
+
+# out has to be created by the user as well
+out = cv::Mat.new(3,1,cv::CV_32FC1)
+
+cv::polyfit(x,y,out,2)
+pp out

data/ext/helper.rb

@@ -100,6 +100,7 @@ def find_opencv
                       "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/video/tracking.hpp",
+                      "opencv2/video/background_segm.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",
@@ -107,7 +108,7 @@ def find_opencv
                       "opencv2/nonfree/features2d.hpp"]
               elsif opencv_version >= "2.4.9"
                   ["opencv2/core.hpp", "opencv2/core/types.hpp","opencv2/core/persistence.hpp",
-                      "opencv2/core/utility.hpp", "opencv2/core/base.hpp",
+                      "opencv2/core/utility.hpp", "opencv2/core/base.hpp","opencv2/core/core.hpp",
                       "opencv2/contrib.hpp", "opencv2/calib3d.hpp",
                       "opencv2/features2d.hpp", "opencv2/flann.hpp",
                       "opencv2/highgui.hpp", "opencv2/imgproc.hpp",
@@ -116,6 +117,7 @@ def find_opencv
                       "opencv2/photo.hpp", "opencv2/softcascade.hpp",
                       "opencv2/stitching.hpp", "opencv2/superres.hpp",
                       "opencv2/video.hpp", "opencv2/legacy.hpp","opencv2/video/tracking.hpp",
+                      "opencv2/video/background_segm.hpp",
                       "opencv2/videostab.hpp"]
     else
         raise "OpenCV version #{opencv_version} is not supported"

data/ext/post_opencv244.txt

@@ -10,4 +10,9 @@ cv.drawMatches void
     vector_char matchesMask std::vector<char>()
     int flags DrawMatchesFlags::DEFAULT
 cv.morphologyDefaultBorderValue Scalar
+cv.polyfit void 
+    Mat srcx
+    Mat srcy
+    Mat dst /O
+    int order
 

data/ext/post_opencv249.txt

@@ -1,19 +1,11 @@
-cv.findEssentialMat Mat 
-    Mat points1 
-    Mat points2 
-    double focal 1.0
-    Point2d pp Point2d(0, 0)
-    int method RANSAC
-    double prob 0.999
-    double threshold 1.0
-    Mat mask Mat()/O; /O
-cv.recoverPose int 
-    Mat E 
-    Mat points1 
-    Mat points2 
-    Mat R /O; /O
-    Mat t /O; /O
-    double focal 1.0
-    Point2d pp Point2d(0, 0)
-    Mat mask Mat()/IO; /IO
+cv.KeyPoint.convert void /S
+    vector<KeyPoint> keypoints
+    vector<Point2f> points2f /O
+cv.KeyPoint.convert void /S
+    vector<Point2f> points2f
+    vector<KeyPoint> keypoints /O
+    float size 1
+    float response
+    int octave 0
+    int class_id -1
 

data/ext/post_opencv300.txt

@@ -0,0 +1,19 @@
+cv.findEssentialMat Mat 
+    Mat points1 
+    Mat points2 
+    double focal 1.0
+    Point2d pp Point2d(0, 0)
+    int method RANSAC
+    double prob 0.999
+    double threshold 1.0
+    Mat mask Mat()/O; /O
+cv.recoverPose int 
+    Mat E 
+    Mat points1 
+    Mat points2 
+    Mat R /O; /O
+    Mat t /O; /O
+    double focal 1.0
+    Point2d pp Point2d(0, 0)
+    Mat mask Mat()/IO; /IO
+

data/ext/rbind.rb

@@ -11,7 +11,7 @@ rbind.includes = opencv_headers
 
 # add some templates and alias
 rbind.parser.type_alias["const_c_string"] = rbind.c_string.to_const
-if opencv_version >= "2.4.9"
+if opencv_version >= "3.0.0"
     rbind.add_std_types
     rbind.parser.add_type OpenCVPtr2.new
 else
@@ -39,9 +39,9 @@ rbind.parse File.join(File.dirname(__FILE__),"post_opencv244.txt")
 # post parsing + patching wrong signatures
 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.parse File.join(File.dirname(__FILE__),"post_opencv300.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!
@@ -70,9 +70,15 @@ rbind.cv.chamerMatching.parameter(1).remove_const!
 rbind.cv.chamerMatching.parameter(2).remove_const!
 
 # add some more vector types
+rbind.parser.type("std::vector<Point2d>")
 rbind.parser.type("std::vector<Point3f>")
 rbind.parser.type("std::vector<Point3d>")
 rbind.parser.type("std::vector<Vec4i>")
+rbind.parser.type("std::vector<uint32_t>")
+rbind.parser.type("std::vector<uint64_t>")
+rbind.parser.type("std::vector<int8_t>")
+rbind.parser.type("std::vector<int64_t>")
+rbind.parser.type("std::vector<std::vector<Point2d> >")
 
 # add some extra documentation
 rbind.parser.doc = "ROpenCV API Documentation for OpenCV #{opencv_version}"

data/lib/ropencv/ropencv_ruby.rb

@@ -28,6 +28,12 @@ module OpenCV
                             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_Point2d)
+                        t = Vector::Cv_Mat.new
+                        obj.each do |e|
+                            t << Cv::Mat.new(e.size,2,Cv::CV_64FC1,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|
@@ -39,6 +45,7 @@ module OpenCV
                     end
                 end
             end
+            Fixnum = Int
         end
     end
     include Std
@@ -331,9 +338,13 @@ module OpenCV
                     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__
+                elsif obj.is_a?(Std::Vector::Cv_Point2d)
+                    Cv::Mat.new(obj.size,1,Cv::CV_64FC2,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__
-                elsif obj.is_a?(Std::Vector::Fixnum)
+                elsif obj.is_a?(Std::Vector::Cv_Point3d)
+                    Cv::Mat.new(obj.size,1,Cv::CV_64FC3,obj.data,Cv::Mat::AUTO_STEP).__obj_ptr__
+                elsif obj.is_a?(Std::Vector::Int)
                     Cv::Mat.new(obj.size,1,Cv::CV_32SC1,obj.data,Cv::Mat::AUTO_STEP).__obj_ptr__
                 elsif obj.is_a?(Std::Vector::Float)
                     Cv::Mat.new(obj.size,1,Cv::CV_32FC1,obj.data,Cv::Mat::AUTO_STEP).__obj_ptr__
@@ -364,7 +375,7 @@ module OpenCV
                     ptr = mat.data
                     setter = ptr.method(setter)
                     if h == 1 || w == 1
-                        setter.call(0,obj)
+                        setter.call(0,obj.flatten)
                     else
                         obj.each_with_index do |row,i|
                             raise ArgumentError, "number of row elements must be equal for each row" if row.size != w

data/manifest.xml

@@ -7,6 +7,6 @@
   <url>http://</url>
   <logo>http://</logo>
 
-  <depend package="external/opencv" />
+  <depend package="opencv" />
   <depend package="tools/rbind" />
 </package>

data/ropencv.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name              = 'ropencv'
-    s.version           = '0.0.15'
-    s.date              = '2014-03-12'
+    s.version           = '0.0.16'
+    s.date              = '2014-07-06'
     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.24"
+    s.add_runtime_dependency "rbind", ">= 0.0.25"
     s.add_runtime_dependency "ffi", "~> 1.9.0"
     s.extensions = ['ext/extconf.rb']
     s.license = 'BSD'

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: ropencv
 version: !ruby/object:Gem::Version
-  version: 0.0.15
-  prerelease: 
+  version: 0.0.16
 platform: ruby
 authors:
 - Alexander Duda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbind
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.24
+        version: 0.0.25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.24
+        version: 0.0.25
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,6 +65,7 @@ files:
 - examples/hog_descriptor.rb
 - examples/hough_circles.rb
 - examples/match_keypoints.rb
+- examples/polyfit.rb
 - ext/CMakeLists.txt
 - ext/extconf.rb
 - ext/helper.rb
@@ -78,6 +74,7 @@ files:
 - ext/parser_out.txt
 - ext/post_opencv244.txt
 - ext/post_opencv249.txt
+- ext/post_opencv300.txt
 - ext/pre_opencv244.txt
 - ext/rbind.rb
 - ext/src/CMakeLists.txt
@@ -99,27 +96,26 @@ files:
 homepage: http://www.ropencv.aduda.eu
 licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
 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
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby bindings for opencv 2.4.4 and higher
 test_files: []
 has_rdoc: