ropencv 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2e6aa5a66cdc073f75cbcef5ecdf2754dec1b9c
-  data.tar.gz: 78f996037687e4e836aee3f2ca2f540f79ece752
+  metadata.gz: dd8ab218b838274f85686f33fbac6b91abd46097
+  data.tar.gz: 7eb519e53bb782f17665dc6f4fc3a90c558cb2f2
 SHA512:
-  metadata.gz: b94532ed19232a2bd9a3758cfa13293f999fb94139b51c0b9ee5dbd742c07d82c06516c5465d4439c7d51bb920a82b791dccf9e0232bb5812d1e47b01fa32987
-  data.tar.gz: fd2e2023995003ccfbcd35edfc59c373d2f58dcd998828ab26ac7f21fe79d00f544167c87bb199390e774aad4a9279970ba96be9896f478e1e712e0d7fa93456
+  metadata.gz: 5cf14edc726ab2dd119bcc804e81f3bafb43538083394afa74d75b7fd7015a988cf08ae1218e995d961416209875806c313a7e66fbd4f6999c637501c57ec046
+  data.tar.gz: f11e563f715217ad25fb7576107f7af949db69cdef3d7b95260eaefe1c123f8ae0bffd26fe4c49aff62028ff448db7e2c9a84b4d5153fbdd8b88a99a3d6fd144

data/examples/file_storage.rb

@@ -0,0 +1,26 @@
+require 'ropencv'
+require 'pp'
+
+include OpenCV
+
+#writing
+fs = cv::FileStorage.new("test.yml",cv::FileStorage::WRITE)
+fs << "mat" << cv::Mat.ones(10,10,cv::CV_32FC1)
+fs << "int" << 10
+fs << "seq" << "[" << 10 << 2 << "]"
+fs << "map1" << "{" <<"element1" << 2 << "}"
+fs.release
+
+# reading
+fs = cv::FileStorage.new("test.yml",cv::FileStorage::READ)
+fs.each do |e|
+    puts "got node #{e.name}"
+end
+
+pp "seq: #{fs["seq"].to_array_of_int}"
+pp "mat: #{fs["mat"].to_mat}"
+pp "int: #{fs["int"].to_int}"
+pp "map.element1: #{fs["map1"]["element1"].to_int}"
+pp "map.element1: #{fs.map1.element1.to_int}"
+
+fs.release

data/examples/find_homography.rb

@@ -0,0 +1,18 @@
+require 'ropencv'
+require 'pp'
+
+include OpenCV
+
+points1 = std::Vector.new(cv::Point2f)
+points2 = std::Vector.new(cv::Point2f)
+
+points1.push_back(cv::Point2f.new(1,1))
+points1.push_back(cv::Point2f.new(3,1))
+points1.push_back(cv::Point2f.new(4,2))
+points1.push_back(cv::Point2f.new(10,1))
+
+points1.each do |pt|
+    points2.push_back(pt*0.2)
+end
+
+pp cv::find_homography(points1,points2)

data/ext/helper.rb

@@ -94,7 +94,7 @@ def find_opencv
     opencv_version = out.read.chomp
 
     ##add opencv headers
-    headers = if opencv_version >= "2.4.4" && opencv_version <= "2.4.6.1"
+    headers = if opencv_version >= "2.4.4" && opencv_version < "2.4.7.0"
                   ["opencv2/core/core_c.h", "opencv2/core/types_c.h",
                       "opencv2/core/core.hpp", "opencv2/flann/miniflann.hpp",
                       "opencv2/imgproc/imgproc_c.h", "opencv2/imgproc/types_c.h",
@@ -106,7 +106,7 @@ def find_opencv
                       "opencv2/contrib/contrib.hpp", "opencv2/nonfree/nonfree.hpp",
                       "opencv2/nonfree/features2d.hpp"]
               elsif opencv_version >= "2.4.9"
-                  ["opencv2/core.hpp", "opencv2/core/types.hpp",
+                  ["opencv2/core.hpp", "opencv2/core/types.hpp","opencv2/core/persistence.hpp",
                       "opencv2/core/utility.hpp", "opencv2/core/base.hpp",
                       "opencv2/contrib.hpp", "opencv2/calib3d.hpp",
                       "opencv2/features2d.hpp", "opencv2/flann.hpp",

data/ext/opencv.txt

@@ -122,8 +122,12 @@ cv.Point.cross double
     Point pt
 cv.Point.inside bool
     Rect rect
-cv.Point.operator+ void
+cv.Point.operator+ Point
     Point pt
+cv.Point.operator- Point
+    Point pt
+cv.Point.operator* Point
+    int val
 cv.Point.operator== bool
     Point pt
 cv.Point.operator!= bool
@@ -143,8 +147,12 @@ cv.Point2f.dot double
     Point2f pt
 cv.Point2f.cross double
     Point2f pt
-cv.Point2f.operator+ void
+cv.Point2f.operator+ Point2f
     Point2f pt
+cv.Point2f.operator- Point2f
+    Point2f pt
+cv.Point2f.operator* Point2f
+    float val
 cv.Point2f.operator== bool
     Point2f pt
 cv.Point2f.operator!= bool
@@ -156,8 +164,12 @@ cv.Point2d.Point2d
 cv.Point2d.Point2d
     double x
     double y
-cv.Point2d.operator+ void
+cv.Point2d.operator+ Point2d
+    Point2d pt
+cv.Point2d.operator- Point2d
     Point2d pt
+cv.Point2d.operator* Point2d
+    double val
 cv.Point2d.Point2d
     Point2d pt
 cv.Point2d.dot double
@@ -187,8 +199,12 @@ cv.Point3f.ddot double
     Point3f pt
 cv.Point3f.cross Point3f
     Point3f pt
-cv.Point3f.operator+ void
+cv.Point3f.operator+ Point3f
+    Point3f pt
+cv.Point3f.operator- Point3f
     Point3f pt
+cv.Point3f.operator* Point3f
+    float val
 cv.Point3f.operator== bool
     Point3f pt
 cv.Point3f.operator!= bool
@@ -210,8 +226,12 @@ cv.Point3d.ddot double
     Point3d pt
 cv.Point3d.cross Point3d
     Point3d pt
-cv.Point3d.operator+ void
+cv.Point3d.operator+ Point3d
+    Point3d pt
+cv.Point3d.operator- Point3d
     Point3d pt
+cv.Point3d.operator* Point3d
+    double val
 cv.Point3d.operator== bool
     Point3d pt
 cv.Point3d.operator!= bool
@@ -449,4 +469,153 @@ cv.RNG.fill void
     bool saturateRange false
 cv.RNG.gaussian double
     double sigma
+class cv.FileStorage
+cv.write void =write_scalar_int
+    FileStorage fs /IO
+    int val
+cv.write void =write_scalar_float
+    FileStorage fs /IO
+    float val
+cv.write void =write_scalar_double
+    FileStorage fs /IO
+    double val
+cv.write void =write_scalar_string
+    FileStorage fs /IO
+    String val
+cv.write void =write_int
+    FileStorage fs /IO
+    String name
+    int val
+cv.write void =write_float
+    FileStorage fs /IO
+    String name
+    float val
+cv.write void =write_double
+    FileStorage fs /IO
+    String name
+    double val
+cv.write void =write_string
+    FileStorage fs /IO
+    String name
+    String val
+cv.write void =write_mat
+    FileStorage fs /IO
+    String name
+    Mat val
+cv.write void =write_point
+    FileStorage fs /IO
+    String name
+    Point val
+cv.write void =write_point2f
+    FileStorage fs /IO
+    String name
+    Point2f val
+cv.write void =write_point3f
+    FileStorage fs /IO
+    String name
+    Point3f val
+cv.write void =write_point2d
+    FileStorage fs /IO
+    String name
+    Point2d val
+cv.write void =write_point3d
+    FileStorage fs /IO
+    String name
+    Point3d val
+cv.write void =write_rect
+    FileStorage fs /IO
+    String name
+    Rect val
+cv.write void =write_range
+    FileStorage fs /IO
+    String name
+    Range val
+cv.write void =write_scalar
+    FileStorage fs /IO
+    String name
+    Scalar val
+cv.write void =write_size
+    FileStorage fs /IO
+    String name
+    Size val
+cv.write void =write_vec2f
+    FileStorage fs /IO
+    String name
+    Vec2f val
+cv.write void =write_vec3f
+    FileStorage fs /IO
+    String name
+    Vec3f val
+cv.write void =write_vec2d
+    FileStorage fs /IO
+    String name
+    Vec2d val
+cv.write void =write_vec3d
+    FileStorage fs /IO
+    String name
+    Vec3d val
+cv.read void =read_int
+    FileNode fn /IO
+    int val /O
+    int default_val
+cv.read void =read_float
+    FileNode fn /IO
+    float val /O
+    float default_val
+cv.read void =read_double
+    FileNode fn /IO
+    double val /O
+    double default_val
+cv.read void =read_string
+    FileNode fn /IO
+    String val /O
+    String default_val
+cv.read void =read_mat
+    FileNode fn /IO
+    Mat val /O
+    Mat default_val
+cv.FileStorage.operator<< FileStorage =write_int /O
+    int val
+cv.FileStorage.operator<< FileStorage =write_float /O
+    float val
+cv.FileStorage.operator<< FileStorage =write_double /O
+    double val
+cv.FileStorage.operator<< FileStorage =write_string /O
+    String val
+cv.FileStorage.operator<< FileStorage =write_size /O
+    Size val
+cv.FileStorage.operator<< FileStorage =write_point /O
+    Point val
+cv.FileStorage.operator<< FileStorage =write_point2f /O
+    Point2f val
+cv.FileStorage.operator<< FileStorage =write_point3f /O
+    Point3f val
+cv.FileStorage.operator<< FileStorage =write_point2d /O
+    Point2d val
+cv.FileStorage.operator<< FileStorage =write_point3d /O
+    Point3d val
+cv.FileStorage.operator<< FileStorage =write_rect /O
+    Rect val
+cv.FileStorage.operator<< FileStorage =write_mat /O
+    Mat val
+class cv.FileNodeIterator
+cv.FileNode.operator>> void =read_int
+    int val /IO
+cv.FileNode.operator>> void =read_float
+    float val /IO
+cv.FileNode.operator>> void =read_double
+    double val /IO
+cv.FileNode.operator>> void =read_string
+    String val /IO
+cv.FileNode.operator>> void =read_mat
+    Mat val /IO
+cv.FileNode.begin FileNodeIterator
+cv.FileNode.end FileNodeIterator
+cv.FileNodeIterator.operator++ FileNodeIterator
+cv.FileNodeIterator.operator-- FileNodeIterator
+cv.FileNodeIterator.operator* FileNode =to_node
+cv.FileNodeIterator.operator== bool
+    FileNodeIterator other
+cv.FileNodeIterator.operator!= bool
+    FileNodeIterator other
 

data/lib/ropencv/ropencv_ruby.rb

@@ -10,6 +10,14 @@ module OpenCV
         end
     end
 
+    def self.std
+        Std
+    end
+
+    def self.cv
+        Cv
+    end
+
     module Std
         class Vector
             class Cv_Mat
@@ -36,6 +44,12 @@ module OpenCV
     include Std
 
     module Cv
+        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)
+            [p[0].read_double,p[1].read_double]
+        end
+
         class Size
             def *(val)
                 Size.new(width*val,height*val)
@@ -169,7 +183,129 @@ module OpenCV
 
         class Scalar; include Vecxd; SIZE=4;end
 
+        class FileStorage
+            include Enumerable
+
+            def each(&block)
+                if block_given?
+                    root.each(&block)
+                else
+                    to_enum(:each)
+                end
+            end
+
+            def <<(val)
+                if val.is_a?(Fixnum)
+                    write_int(val)
+                elsif val.is_a?(Float)
+                    write_double(val)
+                else
+                    name = val.class.name.split("::").last.downcase
+                    send("write_#{name}",val)
+                end
+            end
+
+            def method_missing(m,*args)
+                if args.empty?
+                    self[m.to_s]
+                else
+                    super
+                end
+            end
+        end
+
+        class FileNode
+            include Enumerable
+            alias :empty? :empty
+            alias :int? :isInt
+            alias :real? :isReal
+            alias :string? :isString
+            alias :map? :isMap
+            alias :seq? :isSeq
+
+            def each(&block)
+                if block_given?
+                    iter = self.begin()
+                    while(iter != self.end())
+                        yield(iter.to_node)
+                        iter.plusplus_operator
+                    end
+                else
+                    to_enum(:each)
+                end
+            end
+
+            def to_array_of_int
+                raise RuntimeError, "FileNode is not the root node of a sequence" unless seq?
+                map(&:to_int)
+            end
+
+            def to_array_of_float
+                raise RuntimeError, "FileNode is not the root node of a sequence" unless seq?
+                map(&:to_float)
+            end
+
+            def to_array_of_double
+                raise RuntimeError, "FileNode is not the root node of a sequence" unless seq?
+                map(&:to_double)
+            end
+
+            def to_array_of_string
+                raise RuntimeError, "FileNode is not the root node of a sequence" unless seq?
+                map(&:to_string)
+            end
+
+            def to_mat
+                raise RuntimeError, "FileNode is empty" if empty?
+                raise RuntimeError, "FileNode is not storing a Mat" unless isMap
+                val = cv::Mat.new
+                read_mat(val)
+                val
+            end
+
+            def to_float
+                raise RuntimeError, "FileNode is empty" if empty?
+                raise RuntimeError, "FileNode is not storing a float" unless isReal
+                p = FFI::MemoryPointer.new(:float,1)
+                read_float(p)
+                p.get_float32 0
+            end
+
+            def to_double
+                raise RuntimeError, "FileNode is empty" if empty?
+                raise RuntimeError, "FileNode is not storing a double" unless isReal
+                p = FFI::MemoryPointer.new(:uchar,8)
+                read_double(p)
+                p.get_float64 0
+            end
+
+            def to_int
+                raise RuntimeError, "FileNode is empty" if empty?
+                raise RuntimeError, "FileNode is not storing a double" unless isInt
+                p = FFI::MemoryPointer.new(:int,1)
+                read_int(p)
+                p.get_int32 0
+            end
+
+            def to_string
+                raise RuntimeError, "FileNode is empty" if empty?
+                raise RuntimeError, "FileNode is not storing a string" unless isString
+                str = cv::String.new
+                read_string(str)
+                str
+            end
+
+            def method_missing(m,*args)
+                if args.empty? && map?
+                    self[m.to_s]
+                else
+                    super
+                end
+            end
+        end
+
         class Mat
+            include Enumerable
             class << self
                 alias :rbind_new :new
 
@@ -185,11 +321,13 @@ module OpenCV
 
             def self.to_native(obj,context)
                 if obj.is_a?(Std::Vector::Cv_Point)
-                    cv::Mat.new(obj.size,2,cv::CV_32SC1,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,2,cv::CV_32FC1,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,3,cv::CV_32FC1,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__
                 elsif obj.is_a?(Array)
                     h,w,e= if obj.first.is_a? Array
                                [obj.size,obj.first.size,obj.first.first]
@@ -381,6 +519,18 @@ module OpenCV
                     pp.text str
             end
 
+            def each
+                if block_given?
+                    0.upto(rows-1) do |row|
+                        0.upto(cols-1) do |col|
+                            yield at(row,col)
+                        end
+                    end
+                else
+                    to_enum(:each)
+                end
+            end
+
             def each_row_with_index(&block)
                 if block_given?
                     r = rows

data/ropencv.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name              = 'ropencv'
-    s.version           = '0.0.12'
-    s.date              = '2013-10-29'
+    s.version           = '0.0.13'
+    s.date              = '2013-12-12'
     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.22"
+    s.add_runtime_dependency "rbind", ">= 0.0.23"
     s.add_runtime_dependency "ffi", "~> 1.9.0"
     s.extensions = ['ext/extconf.rb']
     s.license = 'BSD'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ropencv
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Alexander Duda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-12-12 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.22
+        version: 0.0.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.22
+        version: 0.0.23
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,8 @@ files:
 - CMakeLists.txt
 - License.txt
 - README.md
+- examples/file_storage.rb
+- examples/find_homography.rb
 - examples/find_keypoints.rb
 - examples/hough_circles.rb
 - examples/logo.png
@@ -109,3 +111,4 @@ signing_key:
 specification_version: 4
 summary: Ruby bindings for opencv 2.4.4 and higher
 test_files: []
+has_rdoc: