ropencv 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43dca5584efe05e64809840c56787f1f8415cfa7
-  data.tar.gz: 4c33639a6571e0e340010da849e101ea8eaf4248
+  metadata.gz: a21fadec0688391caa58a3f1f6d0d6cab7a3d3e5
+  data.tar.gz: db8f28e144e303f017162b156cdf78259928180f
 SHA512:
-  metadata.gz: 16b69bef5dc7c8c591d9379e121c2da9b68ccbcb198d9bec7db1c02e144b07bc48dcc70c2537b6b3c84fdea3b69d4c1dd6febf3c8e3a4c3239f3930fefe7cb4a
-  data.tar.gz: d6c39d3ce32aca4cf135a4bb27d5b53017f9670e91a2e8b37b0dfc1d6ec8c7a56ebde25bc7953a990a9ccee495c8e75605b0bbb4a72d8221be76f4658755b2a2
+  metadata.gz: cdc23ed5fa3c1e6e27eeaf4b58bd2f2f4ea3e132ec61c1ffb321882c7c75d8054f7ca0880f219639a50bfd8c4154e3cc8950c1923f4c42b0ac8f331f97569fec
+  data.tar.gz: ae92ab5a3c0c8547755227904f2b11b99b8db366aa46c2ea06a2b6bc3f44bd7ca6e8878195216a83d4d7a4ca351a49238f96d06cb7fbe3c5c338b91850b5b9ab

data/ext/helper.rb

@@ -106,7 +106,7 @@ def find_opencv
                       "opencv2/highgui/highgui_c.h", "opencv2/highgui/highgui.hpp",
                       "opencv2/contrib/contrib.hpp", "opencv2/nonfree/nonfree.hpp",
                       "opencv2/nonfree/features2d.hpp"]
-              elsif opencv_version >= "2.4.9"
+              elsif opencv_version >= "2.4.9" && opencv_version < "3.0.0"
                   ["opencv2/core.hpp", "opencv2/core/types.hpp","opencv2/core/persistence.hpp",
                       "opencv2/core/utility.hpp", "opencv2/core/base.hpp","opencv2/core/core.hpp",
                       "opencv2/contrib.hpp", "opencv2/calib3d.hpp",
@@ -119,9 +119,22 @@ def find_opencv
                       "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"
-    end
+              elsif opencv_version >= "3.0.0"
+                  ["opencv2/core.hpp", "opencv2/core/types.hpp","opencv2/core/persistence.hpp",
+                      "opencv2/core/utility.hpp", "opencv2/core/base.hpp","opencv2/core/core.hpp",
+                      "opencv2/contrib/contrib.hpp", "opencv2/calib3d.hpp",
+                      "opencv2/features2d.hpp", "opencv2/flann.hpp",
+                      "opencv2/highgui.hpp", "opencv2/imgproc.hpp",
+                      "opencv2/ml.hpp", "opencv2/nonfree.hpp",
+                      "opencv2/nonfree/features2d.hpp", "opencv2/objdetect.hpp",
+                      "opencv2/photo.hpp", "opencv2/softcascade/softcascade.hpp",
+                      "opencv2/stitching.hpp", "opencv2/superres.hpp",
+                      "opencv2/video.hpp", "opencv2/legacy/legacy.hpp","opencv2/video/tracking.hpp",
+                      "opencv2/video/background_segm.hpp",
+                      "opencv2/videostab.hpp"]
+              else
+                  raise "OpenCV version #{opencv_version} is not supported"
+              end
 
     temp = paths.clone
     temp.each do |path|

data/ext/opencv.txt

@@ -55,7 +55,7 @@ cv.Range.Range
     int end
 cv.Range.size int
 cv.Range.size bool
-cv.Range.all Range
+cv.Range.all Range /S
 cv.Range.all Range
 cv.Range.operator== bool
     Range r
@@ -328,6 +328,27 @@ cv.Mat.Mat
     int type
     void* data 
     size_t step AUTO_STEP
+cv.Mat.Mat
+    Size size
+    int type
+    void* data 
+    size_t step AUTO_STEP
+cv.Mat.Mat
+    int rows
+    int cols
+    int type
+    Scalar scalar
+cv.Mat.Mat
+    Size size
+    int type
+    Scalar scalar
+cv.Mat.Mat
+    Mat m
+    Range row_range
+    Range col_range Range::all()
+cv.Mat.Mat
+    Mat m
+    Rect roi
 cv.Mat.operator+ Mat
     Mat mat
 cv.Mat.operator+ Mat

data/ext/post_opencv244.txt

@@ -15,4 +15,8 @@ cv.polyfit void
     Mat srcy
     Mat dst /O
     int order
+cv.abs Mat
+    Mat src
+cv.sum Mat
+    Mat src
 

data/ext/post_opencv249.txt

@@ -8,4 +8,11 @@ cv.KeyPoint.convert void /S
     float response
     int octave 0
     int class_id -1
+cv.DescriptorMatcher.radiusMatch void
+    cv::Mat queryDescriptors
+    cv::Mat trainDescriptors
+    vector_vector_DMatch matches /O
+    float maxDistance
+    cv::Mat mask cv::Mat()
+    bool compactResult false
 

data/ext/rbind.rb

@@ -78,6 +78,7 @@ 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<Scalar>")
 rbind.parser.type("std::vector<std::vector<Point2d> >")
 
 # add some extra documentation

data/lib/ropencv/ropencv_ruby.rb

@@ -620,11 +620,11 @@ module OpenCV
             # 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}
+% Created by ropencv, #{Time.now}
+% name: #{variable_name}
+% type: matrix
+% rows: #{rows}
+% columns: #{cols}
 #{to_a.map{|row|row.join(" ")}.join("\n")}
 eos
             end
@@ -653,6 +653,49 @@ eos
                 end
                 result
             end
+
+            def ==(val)
+                compare(val,Cv::CMP_EQ)
+            end
+
+            def >(val)
+                compare(val,Cv::CMP_GT)
+            end
+
+            def >=(val)
+                compare(val,Cv::CMP_GE)
+            end
+
+            def <(val)
+                compare(val,Cv::CMP_LT)
+            end
+
+            def <=(val)
+                compare(val,Cv::CMP_LE)
+            end
+
+            def !=(val)
+                compare(val,Cv::CMP_NE)
+            end
+
+            def ===(val)
+                val = compare(val,Cv::CMP_EQ)
+                count = cv::countNonZero(val)
+                count == val.rows*val.cols
+            end
+
+            def compare(val,type)
+                val = if val.is_a?(Cv::Mat)
+                          val
+                      elsif val.respond_to?(:to_a)
+                          val.to_a
+                      else
+                          [val]
+                      end
+                dst = Cv::Mat.new
+                Cv::compare(self,val,dst,type)
+                dst
+            end
         end
     end
 end

data/ropencv.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name              = 'ropencv'
-    s.version           = '0.0.17'
-    s.date              = '2014-07-11'
+    s.version           = '0.0.18'
+    s.date              = '2014-10-11'
     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.25"
+    s.add_runtime_dependency "rbind", ">= 0.0.26"
     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.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Alexander Duda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-10-11 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.25
+        version: 0.0.26
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.25
+        version: 0.0.26
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement