ropencv 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddadd3f34d029333f0b75d6daf43c9530d9eb3ce
-  data.tar.gz: 64055d27486efc056af1a403885ab76985351df1
+  metadata.gz: d6203505aa5f31b21ee520787dd576ea0180121f
+  data.tar.gz: ffd25c6e69b0a2454859b08f7c325dd598e56eb5
 SHA512:
-  metadata.gz: 3f9bd2767f57f0181b02b361ebf134efdb3bddc641f8bfacdcd83c9fc93a7f3d199cda1a4ef8f419e1d370145834b541957e2a91860fb2445635c23ef2190232
-  data.tar.gz: b07b8f0000084df1c053521ec527c4992419f4cb04011d197cf6062cf21aca22427cf7c50230f73a0774ffbc0031afe3928d20c4aba8c178d5dfa3945c5d2e9b
+  metadata.gz: f54f387cf82bc8e34bbbfdb37d91903947397340dbe5ac1008ab143e81a08f4be14e8d9bd46ae49d77a5c45b51836f5bbba3266650e95f972e8a8d14f63a6e08
+  data.tar.gz: 85318f33655792d822309aaf4805b42e86bd5e3aafb3decb0645be8eb44172f480f70ec7303f8a2aa6b9a126255eeec294a33d18c14ace5f4f6f034b809e0529

data/ext/helper.rb

@@ -4,7 +4,7 @@ class OpenCVPtr < Rbind::RTemplateClass
         super
     end
 
-    def specialize(klass,*parameters)
+    def specialize(klass,parameters)
         if parameters.size != 1
             raise ArgumentError,"OpenCVPtr does only support one template parameter. Got: #{parameters}}"
         end
@@ -33,14 +33,25 @@ class OpenCVPtr2 < Rbind::RTemplateClass
         super
     end
 
-    def specialize(klass,*parameters)
+    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)
         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("owner",klass),Rbind::RParameter.new("p",ptr_type.to_ptr))
         klass.add_operation Rbind::ROperation.new(klass.name,nil,Rbind::RParameter.new("p",ptr_type.to_ptr))
+
+        # add some magic for casting into parent ptr
+        if ptr_type.respond_to? :parent_classes
+            ptr_type.parent_classes.each do |k|
+                t = type("cv::Ptr<#{k.full_name}>")
+                klass.add_operation Rbind::ROperation.new(klass.name,nil,Rbind::RParameter.new("owner",t),Rbind::RParameter.new("p",ptr_type.to_ptr))
+            end
+        end
+
         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))

data/ext/opencv.txt

@@ -48,6 +48,12 @@ const cv.CV_MAT_CONT_FLAG_SHIFT 14
 const cv.CV_MAT_CONT_FLAG (1 << CV_MAT_CONT_FLAG_SHIFT)
 const cv.CV_SUBMAT_FLAG_SHIFT 15
 const cv.CV_SUBMAT_FLAG (1 << CV_SUBMAT_FLAG_SHIFT)
+const cv.CV_LOAD_IMAGE_UNCHANGED -1
+const cv.CV_LOAD_IMAGE_GRAYSCALE 0
+const cv.CV_LOAD_IMAGE_COLOR 1
+const cv.CV_LOAD_IMAGE_ANYDEPTH 2
+const cv.CV_LOAD_IMAGE_ANYCOLOR 4
+const cv.CV_LOAD_IMAGE_IGNORE_ORIENTATION 128
 class cv.Range
     int start /RW
     int end   /RW
@@ -80,6 +86,8 @@ cv.String.length size_t
 cv.String.operator[] char
     size_t idx
 cv.String.c_str const_c_string
+cv.String.begin char =str_begin
+cv.String.end char =str_end
 cv.String.empty bool
 cv.String.clear void
 cv.String.compare int
@@ -316,6 +324,21 @@ class cv.Mat
 cv.Mat.Mat
 cv.Mat.Mat
     Mat m
+cv.Mat.Mat
+    vector_Point vec
+    bool copy false
+cv.Mat.Mat
+    vector_Point2f vec
+    bool copy false
+cv.Mat.Mat
+    vector_Point2d vec
+    bool copy false
+cv.Mat.Mat
+    vector_Point3f vec
+    bool copy false
+cv.Mat.Mat
+    vector_Point3d vec
+    bool copy false
 cv.Mat.Mat
     Size size
     int type
@@ -643,6 +666,10 @@ cv.FileNode.operator>> void =read_string
     String val /IO
 cv.FileNode.operator>> void =read_mat
     Mat val /IO
+cv.FileNode.operator>> void =read_vector_mat
+    vector_Mat val /IO
+cv.FileNode.operator>> void =read_vector_string
+    vector_String val /IO
 cv.FileNode.begin FileNodeIterator
 cv.FileNode.end FileNodeIterator
 cv.FileNodeIterator.operator++ FileNodeIterator

data/ext/post_opencv244.txt

@@ -19,4 +19,13 @@ cv.abs Mat
     Mat src
 cv.sum Mat
     Mat src
-
+cv.norm double
+    Point3f pt
+cv.norm double
+    Point3d pt
+cv.norm double
+    Vec3f vec
+cv.norm double
+    Vec3d vec
+cv.FileNode.operator>> void =read_vector_keypoint
+    vector_KeyPoint val /IO

data/ext/post_opencv300.txt

@@ -16,4 +16,9 @@ cv.recoverPose int
     double focal 1.0
     Point2d pp Point2d(0, 0)
     Mat mask Mat()/IO; /IO
+class cv.FileStorage
+cv.FileStorage.operator<< FileStorage =write_std_cv_keypoint /O
+    vector_KeyPoint val
+cv.FileStorage.operator<< FileStorage =write_std_cv_dmatch /O
+    vector_DMatch val
 

data/ext/post_opencv310.txt

@@ -0,0 +1,8 @@
+cv.FlannBasedMatcher.write void
+    FileStorage storage
+cv.FlannBasedMatcher.read void
+    FileNode storage /IO
+cv.FileStorage.operator[] FileNode
+    String  nodename
+
+

data/ext/pre_opencv244.txt

@@ -45,4 +45,4 @@ const cv.CV_WND_PROP_AUTOSIZE 1
 const cv.CV_WND_PROP_ASPECT_RATIO 2 
 const cv.CV_WND_PROP_OPENGL 3 
 const cv.InputArray.KINDSHIFT 16
-
+const cv.DBL_EPSILON Float::EPSILON

data/ext/rbind.rb

@@ -38,13 +38,15 @@ else
 end
 
 # parsing
+rbind.use_namespace rbind.std
 rbind.parse File.join(File.dirname(__FILE__),"pre_opencv244.txt")
 rbind.parse File.join(File.dirname(__FILE__),"opencv.txt")
 rbind.use_namespace rbind.cv
-rbind.use_namespace rbind.std
 rbind.cv.type_alias["string"] = rbind.cv.String
 rbind.parse_headers
 rbind.parse File.join(File.dirname(__FILE__),"post_opencv244.txt")
+rbind.cv.String.begin.return_type = rbind.cv.String.begin.return_type.to_const.to_ptr
+rbind.cv.String.end.return_type = rbind.cv.String.end.return_type.to_const.to_ptr
 
 # post parsing + patching wrong signatures
 if major == 2 && minor == 4 && revision>= 9
@@ -72,6 +74,8 @@ if major == 2 && minor == 4 && revision>= 9
 elsif major >= 3
     rbind.parse File.join(File.dirname(__FILE__),"post_opencv249.txt")
     rbind.parse File.join(File.dirname(__FILE__),"post_opencv300.txt")
+    rbind.parse File.join(File.dirname(__FILE__),"post_opencv310.txt") if minor >= 1
+
     rbind.cv.randShuffle.parameter(2).remove_const!
     rbind.cv.AlignExposures.process.parameter(1).remove_const!
     rbind.cv.AlignMTB.process[0].parameter(1).remove_const!

data/ext/src/CMakeLists.txt

@@ -8,6 +8,32 @@ add_definitions(${OPENCV_CFLAGS})
 include_directories(${OPENCV_INCLUDE_DIRS})
 link_directories(${OPENCV_LIBRARY_DIRS})
 
+
+# use, i.e. don't skip the full RPATH for the build tree
+SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+
+# when building, don't use the install RPATH already
+# (but later on when installing)
+SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
+
+# the RPATH to be used when installing
+SET(CMAKE_INSTALL_RPATH ${ROOT_FOLDER}/lib/ropencv)
+
+# add the automatically determined parts of the RPATH
+# which point to directories outside the build tree to the insgall RPATH
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+if(APPLE)
+    SET(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_RPATH})
+    Set(CMAKE_MACOSX_RPATH ON)
+endif(APPLE)
+
+#do not add if system directory
+list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${install_rpath}" isSystemDir)
+if("${isSystemDir}" STREQUAL "-1")
+    set(CMAKE_INSTALL_RPATH "${install_rpath}")
+endif()
+
 SET(RBIND_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/types.cc"
     "${CMAKE_CURRENT_SOURCE_DIR}/operations.cc"

data/lib/ropencv/ropencv_ruby.rb

@@ -82,7 +82,9 @@ module OpenCV
                 end
             end
             def to_s
-                c_str
+                s = size()
+                return "" if s == 0
+                str_begin.read_string_length(s)
             end
         end
 
@@ -211,8 +213,14 @@ module OpenCV
                 elsif val.is_a?(Float)
                     write_double(val)
                 else
-                    name = val.class.name.split("::").last.downcase
-                    send("write_#{name}",val)
+                    if val.is_a? Std::Vector::Cv_DMatch
+                        write_std_cv_dmatch(val)
+                    elsif val.is_a? Std::Vector::Cv_KeyPoint
+                        write_std_cv_keypoint(val)
+                    else
+                        name = val.class.name.split("::").last.downcase
+                        send("write_#{name}",val)
+                    end
                 end
             end
 
@@ -274,6 +282,22 @@ module OpenCV
                 val
             end
 
+            def to_vector_mat
+                raise RuntimeError, "FileNode is empty" if empty?
+                raise RuntimeError, "FileNode is not storing a vector" unless isSeq
+                val = Std::Vector.new(Cv::Mat)
+                read_vector_mat(val)
+                val
+            end
+
+            def to_vector_string
+                raise RuntimeError, "FileNode is empty" if empty?
+                raise RuntimeError, "FileNode is not storing a vector" unless isSeq
+                val = Std::Vector.new(Cv::String)
+                read_vector_string(val)
+                val
+            end
+
             def to_float
                 raise RuntimeError, "FileNode is empty" if empty?
                 raise RuntimeError, "FileNode is not storing a float" unless isReal
@@ -292,7 +316,7 @@ module OpenCV
 
             def to_int
                 raise RuntimeError, "FileNode is empty" if empty?
-                raise RuntimeError, "FileNode is not storing a double" unless isInt
+                raise RuntimeError, "FileNode is not storing an int" unless isInt
                 p = FFI::MemoryPointer.new(:int,1)
                 read_int(p)
                 p.get_int32 0
@@ -306,6 +330,14 @@ module OpenCV
                 str
             end
 
+            def to_vector_keypoint
+                raise RuntimeError, "FileNode is empty" if empty?
+                raise RuntimeError, "FileNode is not storing a string" unless isSeq
+                val = Std::Vector.new(Cv::KeyPoint)
+                read_vector_keypoint(val)
+                val
+            end
+
             def method_missing(m,*args)
                 if args.empty? && map?
                     self[m.to_s]
@@ -398,12 +430,12 @@ module OpenCV
                           if i.is_a?(Cv::Point)
                               [i.y,i.x]
                           elsif rows == 1
-                              [0,i]
+                              [0,i.to_i]
                           else
-                              [i,0]
+                              [i.to_i,0]
                           end
                       else
-                          [i,j]
+                          [i.to_i,j.to_i]
                       end
                 if i >= rows || i < 0 || j >= cols || j <0
                     raise ArgumentError,"out of bound #{i}/#{j} #{rows}/#{cols}"
@@ -461,17 +493,18 @@ module OpenCV
                             [k,val]
                         end
                 k ||= 0
+		k = k.to_i
                 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]
                               elsif rows == 1
-                                  [0,i,j]
+                                  [0,i.to_i,j]
                               else
-                                  [i,0,j]
+                                  [i.to_i,0,j]
                               end
                           else
-                              [i,j,val]
+                              [i.to_i,j.to_i,val]
                           end
                 if i >= rows || i < 0 || j >= cols || j <0
                     raise ArgumentError,"out of bound #{i}/#{j}"
@@ -505,9 +538,9 @@ module OpenCV
 
             def -(val)
                 if val.is_a? Float
-                    Rbind::cv_mat_operator_minus2( self, val)
+                    Rbind::cv_mat_operator_minus__2( self, val)
                 elsif val.is_a? Fixnum
-                    Rbind::cv_mat_operator_minus3( self, val)
+                    Rbind::cv_mat_operator_minus__3( self, val)
                 else
                     Rbind::cv_mat_operator_minus( self, val)
                 end
@@ -515,9 +548,9 @@ module OpenCV
 
             def +(val)
                 if val.is_a? Float
-                    Rbind::cv_mat_operator_plus2( self, val)
+                    Rbind::cv_mat_operator_plus__2( self, val)
                 elsif val.is_a? Fixnum
-                    Rbind::cv_mat_operator_plus3( self, val)
+                    Rbind::cv_mat_operator_plus__3( self, val)
                 else
                     Rbind::cv_mat_operator_plus( self, val)
                 end
@@ -525,9 +558,9 @@ module OpenCV
 
             def /(val)
                 if val.is_a? Float
-                    Rbind::cv_mat_operator_div2( self, val)
+                    Rbind::cv_mat_operator_div__2( self, val)
                 elsif val.is_a? Fixnum
-                    Rbind::cv_mat_operator_div3( self, val)
+                    Rbind::cv_mat_operator_div__3( self, val)
                 else
                     Rbind::cv_mat_operator_div( self, val)
                 end
@@ -535,9 +568,9 @@ module OpenCV
 
             def *(val)
                 if val.is_a? Float
-                    Rbind::cv_mat_operator_mult2( self, val)
+                    Rbind::cv_mat_operator_mult__2( self, val)
                 elsif val.is_a? Fixnum
-                    Rbind::cv_mat_operator_mult3( self, val)
+                    Rbind::cv_mat_operator_mult__3( self, val)
                 else
                     Rbind::cv_mat_operator_mult( self, val)
                 end

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,17 +1,17 @@
 Gem::Specification.new do |s|
     s.name              = 'ropencv'
-    s.version           = '0.0.21'
-    s.date              = '2015-04-14'
+    s.version           = '0.0.22'
+    s.date              = '2018-07-10'
     s.platform          = Gem::Platform::RUBY
     s.authors           = ['Alexander Duda']
-    s.email             = ['Alexander.Duda@dfki.de']
+    s.email             = ['Alexander.Duda@me.com']
     s.homepage          = 'http://www.ropencv.aduda.eu'
     s.summary           = 'Ruby bindings for opencv 2.4.4 and higher'
     s.description       = 'ROpenCV is a ffi ruby binding for the Open Source Computer Vision Library OpenCV 2.4.4 and higher'
     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.27"
+    s.add_runtime_dependency "rbind", ">= 0.0.28"
     s.add_runtime_dependency "ffi", "~> 1.9.0"
     s.add_development_dependency 'minitest', '~> 5.5'
     s.extensions = ['ext/extconf.rb']

metadata

@@ -1,68 +1,68 @@
 --- !ruby/object:Gem::Specification
 name: ropencv
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Alexander Duda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2018-07-10 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.27
+        version: 0.0.28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.27
+        version: 0.0.28
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
 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
+- Alexander.Duda@me.com
 executables: []
 extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .yardopts
+- ".gitignore"
+- ".yardopts"
 - CMakeLists.txt
 - Gemfile
 - Gemfile.lock
@@ -92,12 +92,14 @@ files:
 - ext/post_opencv244.txt
 - ext/post_opencv249.txt
 - ext/post_opencv300.txt
+- ext/post_opencv310.txt
 - ext/pre_opencv244.txt
 - ext/rbind.rb
 - ext/src/CMakeLists.txt
 - ext/src/cmake/FindRuby.cmake
 - lib/ropencv.rb
 - lib/ropencv/ropencv_ruby.rb
+- lib/ropencv/ropencv_types.rb
 - manifest.xml
 - ropencv.gemspec
 - test/suite.rb
@@ -109,7 +111,6 @@ files:
 - 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:
 - BSD
@@ -120,19 +121,18 @@ require_paths:
 - lib
 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: 2.0.14
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for opencv 2.4.4 and higher
 test_files: []
-has_rdoc: