ropencv 0.0.21 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ddadd3f34d029333f0b75d6daf43c9530d9eb3ce
-  data.tar.gz: 64055d27486efc056af1a403885ab76985351df1
+SHA256:
+  metadata.gz: c842553bd3ca40b7bcb15f243acc3f6ada1143860cfa16a5db3c50f1e4beff1c
+  data.tar.gz: 04f366816d0f9b3d7cd76326abc274e4aac26ec1bc286fa6e1c027f4f3408ad0
 SHA512:
-  metadata.gz: 3f9bd2767f57f0181b02b361ebf134efdb3bddc641f8bfacdcd83c9fc93a7f3d199cda1a4ef8f419e1d370145834b541957e2a91860fb2445635c23ef2190232
-  data.tar.gz: b07b8f0000084df1c053521ec527c4992419f4cb04011d197cf6062cf21aca22427cf7c50230f73a0774ffbc0031afe3928d20c4aba8c178d5dfa3945c5d2e9b
+  metadata.gz: d5cc960770be1942e19366cbdec9edcef2370e25ead34f089bd70b4d8230a87db8e6428f347198d8161ae0ce61ead782d7d5d057e48185dfdaa58a6bd32e0b15
+  data.tar.gz: e7efa8a6897910e53dffcabaea50e3abc07162940bd3bb79c800ba592e19c10fac3983f60a3909e63bcb5a1bb351166088e1effc369089b035729afdca2a5ae3

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))
@@ -81,17 +92,16 @@ class Vec < Rbind::RClass
 end
 
 # find opencv version and headers needed to be parsed by rbind
-def find_opencv
-    # find opencv header path
-    out = IO.popen("pkg-config --cflags-only-I opencv")
-    paths = out.read.split("-I").delete_if(&:empty?).map do |i|
-        i.gsub("\n","").gsub(" ","")
+def find_opencv(hint)
+    hint =~ /\[(.*)\]\[v(.*)\(\)\]/
+    paths = [$1]
+    opencv_version = $2
+    if !opencv_version || !paths
+        raise "hint #{hint} is not encoding opencv loaction and version. It must have the format [PATH][vMAJOR.MINRO.REVISION()]"
     end
-    raise "Cannot find OpenCV" if paths.empty?
+    paths << File.join(paths.first,"include")
 
-    #check opencv version
-    out = IO.popen("pkg-config --modversion opencv")
-    out.read.chomp =~ /(\d+).(\d+).(\d+)/
+    opencv_version =~ /(\d+).(\d+).(\d+)/
     major = $1.to_i; minor = $2.to_i; revision = $3.to_i
 
     ##add opencv headers
@@ -119,19 +129,23 @@ def find_opencv
                    "opencv2/stitching/detail/blenders.hpp", "opencv2/stitching/detail/exposure_compensate.hpp", "opencv2/stitching/detail/motion_estimators.hpp",
                    "opencv2/stitching/detail/seam_finders.hpp", "opencv2/stitching/detail/timelapsers.hpp", "opencv2/videostab/motion_core.hpp",
                    "opencv2/viz/types.hpp", "opencv2/viz/widgets.hpp"]
+              elsif major == 4
+                  headers = ["opencv2/core.hpp", "opencv2/core/base.hpp", "opencv2/core/mat.hpp", "opencv2/core/ocl.hpp",
+                   "opencv2/core/opengl.hpp", "opencv2/core/optim.hpp", "opencv2/core/persistence.hpp", "opencv2/core/types.hpp",
+                   "opencv2/core/utility.hpp", "opencv2/imgproc.hpp", "opencv2/imgcodecs.hpp", "opencv2/videoio.hpp",
+                   "opencv2/highgui.hpp", "opencv2/video/background_segm.hpp", "opencv2/video/tracking.hpp", "opencv2/flann/miniflann.hpp",
+                   "opencv2/ml.hpp", "opencv2/features2d.hpp", "opencv2/calib3d.hpp", "opencv2/objdetect.hpp", "opencv2/photo.hpp",
+                   "opencv2/shape/shape_distance.hpp", "opencv2/shape/shape_transformer.hpp", "opencv2/stitching.hpp",
+                   "opencv2/stitching/detail/blenders.hpp", "opencv2/stitching/detail/exposure_compensate.hpp", "opencv2/stitching/detail/motion_estimators.hpp",
+                   "opencv2/stitching/detail/seam_finders.hpp", "opencv2/stitching/detail/timelapsers.hpp", "opencv2/videostab/motion_core.hpp",
+                   "opencv2/viz/types.hpp", "opencv2/viz/widgets.hpp"]
+                  headers.map do |h|
+                      File.join("opencv4",h)
+                  end
               else
                   raise "OpenCV version #{opencv_version} is currently not supported"
               end
 
-    temp = paths.clone
-    temp.each do |path|
-	if path =~ /(.*)opencv$/
-	    paths << $1
-	elsif path =~ /(.*)opencv2$/
-	    paths << $1
-        end
-    end
-
     # check that all headers are available
     headers = headers.map do |i|
 	path = paths.find do |p|

data/ext/opencv.txt

@@ -11,6 +11,7 @@ const cv.CV_16S 3
 const cv.CV_32S 4
 const cv.CV_32F 5
 const cv.CV_64F 6
+const cv.CV_16F 7
 const cv.CV_8UC1 (1-1)*8 + CV_8U
 const cv.CV_8UC2 (2-1)*8 + CV_8U
 const cv.CV_8UC3 (3-1)*8 + CV_8U
@@ -48,6 +49,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
@@ -68,24 +75,6 @@ cv.Range.operator+ Range
     int delta
 cv.Range.operator- Range
     int delta
-class cv.String
-cv.String.String
-cv.String.String
-    c_string str
-    size_t length
-cv.String.String
-    String other
-cv.String.size size_t
-cv.String.length size_t
-cv.String.operator[] char
-    size_t idx
-cv.String.c_str const_c_string
-cv.String.empty bool
-cv.String.clear void
-cv.String.compare int
-    String str
-cv.String.swap void
-    String str /IO
 class cv.Scalar
     double* val
 cv.Scalar.Scalar
@@ -316,6 +305,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
@@ -474,13 +478,6 @@ cv.Mat.ptr uchar*
     int i2
 cv.Mat.operator () Mat =block
     Rect rect
-const cv.Mat.MAGIC_VAL 0x42FF0000
-const cv.Mat.AUTO_STEP 0
-const cv.Mat.CONTINUOUS_FLAG CV_MAT_CONT_FLAG
-const cv.Mat.SUBMATRIX_FLAG CV_SUBMAT_FLAG
-const cv.Mat.MAGIC_MASK 0xFFFF0000
-const cv.Mat.TYPE_MASK 0x00000FFF
-const cv.Mat.DEPTH_MASK 7
 class cv.RNG
     uint64 state
 cv.RNG.RNG
@@ -643,13 +640,127 @@ 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
-cv.FileNodeIterator.operator-- FileNodeIterator
 cv.FileNodeIterator.operator* FileNode =to_node
 cv.FileNodeIterator.operator== bool
     FileNodeIterator other
 cv.FileNodeIterator.operator!= bool
     FileNodeIterator other
-
+class cv.UMat
+    int flags
+    int rows
+    int cols
+    size_t step
+cv.UMat.UMat
+cv.UMat.UMat
+    UMat m
+cv.UMat.UMat
+    vector_Point vec
+    bool copy false
+cv.UMat.UMat
+    vector_Point2f vec
+    bool copy false
+cv.UMat.UMat
+    vector_Point2d vec
+    bool copy false
+cv.UMat.UMat
+    vector_Point3f vec
+    bool copy false
+cv.UMat.UMat
+    vector_Point3d vec
+    bool copy false
+cv.UMat.row UMat
+    int y
+cv.UMat.col UMat
+    int c
+cv.UMat.rowRange UMat
+    int startrow
+    int endrow
+cv.UMat.rowRange UMat
+        Range r
+cv.UMat.colRange UMat
+    int startcol
+    int endcol
+cv.UMat.colRange UMat
+    Range r
+cv.UMat.diag UMat
+    int d 0
+cv.UMat.clone UMat
+cv.UMat.copyTo void
+    UMat m /O
+cv.UMat.copyTo void
+    UMat m /O
+    UMat mask /IO
+cv.UMat.convertTo void
+    UMat m /O
+    int rtype
+    double alpha 1
+    double beta 0
+cv.UMat.assignTo void
+    UMat m /O
+    int type -1
+cv.UMat.reshape UMat
+    int cn
+    int rows 0
+cv.UMat.t UMat
+cv.UMat.inv UMat
+    int method DECOMP_LU
+cv.UMat.mul UMat
+    UMat m
+    double scale 1
+cv.UMat.dot double
+    UMat m
+cv.UMat.diag UMat /S
+    UMat d
+cv.UMat.zeros UMat /S
+    int rows
+    int cols
+    int type
+cv.UMat.zeros UMat /S
+    Size size
+    int type
+cv.UMat.ones UMat /S
+    int rows
+    int cols
+    int type
+cv.UMat.ones UMat /S
+    Size size
+    int type
+cv.UMat.eye UMat /S
+    int rows
+    int cols
+    int type
+cv.UMat.eye UMat /S
+    Size size
+    int type
+cv.UMat.create void
+    int rows
+    int cols
+    int type
+cv.UMat.create void
+    Size size
+    int type
+cv.UMat.isContinuous bool
+cv.UMat.isSubmatrix bool
+cv.UMat.elemSize size_t
+cv.UMat.elemSize1 size_t
+cv.UMat.size Size
+cv.UMat.type int
+cv.UMat.depth int
+cv.UMat.channels int
+cv.UMat.step1 size_t
+    int i 0
+cv.UMat.empty bool
+cv.UMat.total size_t
+cv.UMat.checkVector int
+    int elemChannels
+    int depth -1
+    bool requireContinuous true
+cv.UMat.operator () UMat =block
+    Rect rect

data/ext/post_opencv244.txt

@@ -1,14 +1,3 @@
-cv.drawMatches void 
-    Mat img1 
-    vector_KeyPoint keypoints1 
-    Mat img2 
-    vector_KeyPoint keypoints2 
-    vector_DMatch matches1to2 
-    Mat outImg /O
-    Scalar matchColor Scalar::all(-1)
-    Scalar singlePointColor Scalar::all(-1)
-    vector_char matchesMask std::vector<char>()
-    int flags DrawMatchesFlags::DEFAULT
 cv.morphologyDefaultBorderValue Scalar
 cv.polyfit void 
     Mat srcx
@@ -19,4 +8,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_opencv300a.txt

@@ -0,0 +1,19 @@
+class cv.String
+cv.String.String
+cv.String.String
+    c_string str
+    size_t length
+cv.String.String
+    String other
+cv.String.size size_t
+cv.String.length size_t
+cv.String.operator[] char
+    size_t idx
+cv.String.c_str const_c_string
+cv.String.empty bool
+cv.String.clear void
+cv.String.compare int
+    String str
+cv.String.swap void
+    String str /IO
+

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/post_opencv400.txt

@@ -0,0 +1,30 @@
+cv.UMat.getMat Mat
+    AccessFlag flags
+cv.UMat.UMat
+    Size size
+    int type
+    UMatUsageFlags usageFlags USAGE_DEFAULT
+cv.UMat.UMat
+    int rows
+    int cols
+    int type
+    UMatUsageFlags usageFlags USAGE_DEFAULT
+cv.UMat.UMat
+    int rows
+    int cols
+    int type
+    Scalar scalar
+    UMatUsageFlags usageFlags USAGE_DEFAULT
+cv.UMat.UMat
+    Size size
+    int type
+    Scalar scalar
+    UMatUsageFlags usageFlags USAGE_DEFAULT
+cv.UMat.UMat
+    UMat m
+    Range row_range
+    Range col_range Range::all()
+cv.UMat.UMat
+    UMat m
+    Rect roi
+

data/ext/pre_opencv244.txt

@@ -45,4 +45,8 @@ 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
+const cv.CV_CALIB_CB_ADAPTIVE_THRESH 1
+const cv.CV_CALIB_CB_NORMALIZE_IMAGE 2
+const cv.CV_CALIB_CB_FILTER_QUADS 4
+const cv.CV_CALIB_CB_FAST_CHECK 8

data/ext/rbind.rb

@@ -3,12 +3,12 @@ require 'pp'
 require 'yaml'
 
 require File.join(File.dirname(__FILE__),'helper.rb')
-major,minor,revision,opencv_headers = find_opencv
+
+major,minor,revision,opencv_headers = find_opencv(ARGV[0])
 opencv_version = "#{major}.#{minor}.#{revision}"
 Rbind.log.warn "found opencv #{opencv_version}"
 
 rbind = Rbind::Rbind.new("OpenCV")
-rbind.pkg_config << "opencv"
 rbind.includes = opencv_headers
 
 # add Vec types
@@ -21,30 +21,53 @@ end
 
 # add some templates and alias
 rbind.parser.type_alias["const_c_string"] = rbind.c_string.to_const
-if major >= 3
+if major >= 3 && major < 4
+    rbind.pkg_config << "opencv"
     rbind.add_std_types
+    rbind.cv.add_type(Rbind::RClass.new("String"))
+    rbind.cv.type_alias["string"] = rbind.cv.String
     rbind.parser.add_type OpenCVPtr2.new
     rbind.cv.add_type(Rbind::RClass.new("ShapeTransformer"))
     rbind.cv.add_type(Rbind::RClass.new("Feature2D"))
+    rbind.cv.add_type(Rbind::RClass.new("KeyPoint"))
+    rbind.cv.add_type(Rbind::RClass.new("DMatch"))
+    rbind.cv.type_alias["FeatureDetector"] = rbind.cv.Feature2D
+    rbind.cv.type_alias["DescriptorExtractor"] = rbind.cv.Feature2D
+elsif major >= 4
+    rbind.pkg_config << "opencv4"
+    rbind.add_std_types
+    rbind.cv.type_alias["string"] = rbind.std.string
+    rbind.cv.type_alias["String"] = rbind.std.string
+    rbind.parser.add_type OpenCVPtr2.new
+    rbind.cv.add_type(Rbind::RClass.new("Feature2D"))
+    rbind.cv.add_type(Rbind::RClass.new("KeyPoint"))
+    rbind.cv.add_type(Rbind::RClass.new("DMatch"))
     rbind.cv.type_alias["FeatureDetector"] = rbind.cv.Feature2D
     rbind.cv.type_alias["DescriptorExtractor"] = rbind.cv.Feature2D
-    # add missing enum values
-    rbind.cv.add_type(Rbind::RClass.new("Stitcher"))
-    rbind.cv.Stitcher.add_type(Rbind::REnum.new("Status"))
-    rbind.cv.Stitcher.Status.values = {:OK => 0, :ERR_NEED_MORE_IMGS => 1,:ERR_HOMOGRAPHY_EST_FAIL => 2,:ERR_CAMERA_PARAMS_ADJUST_FAIL => 3}
+    rbind.cv.add_namespace("detail")
+    rbind.cv.detail.add_type(Rbind::RClass.new("GraphCutSeamFinderBase"))
+    rbind.cv.detail.add_type(Rbind::RClass.new("ImageFeatures"))
+    rbind.cv.detail.add_type(Rbind::RClass.new("CameraParams"))
+    rbind.cv.detail.add_type(Rbind::RClass.new("MatchesInfo"))
+    if(minor >= 5)
+        rbind.cv.add_type(Rbind::RClass.new("HistogramCostExtractor"))
+        rbind.cv.add_type(Rbind::RClass.new("ShapeTransformer"))
+    end
 else
+    rbind.pkg_config << "opencv"
     rbind.add_std_vector
     rbind.parser.add_type OpenCVPtr.new
 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
@@ -69,11 +92,14 @@ if major == 2 && minor == 4 && revision>= 9
     rbind.cv.BRISK.operation("BRISK")[1].parameter(0).remove_const!
     rbind.cv.BRISK.operation("BRISK")[1].parameter(1).remove_const!
     rbind.cv.putText.parameter(0).remove_const!
-elsif major >= 3
+elsif major == 3 
     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.parse File.join(File.dirname(__FILE__),"post_opencv300a.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!
     rbind.cv.AlignMTB.process[1].parameter(1).remove_const!
     rbind.CvDTreeNode.ignore = true
@@ -87,6 +113,39 @@ elsif major >= 3
     # is removed on opencv master
     # mark none polymorphic class
     rbind.ml.DTrees.Params.polymorphic = false if(rbind.ml.DTrees.type?("Params"))
+elsif major >= 4
+    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_opencv400.txt")
+
+    rbind.cv.AlignMTB.process[0].parameter(1).remove_const!
+    rbind.cv.AlignMTB.process[1].parameter(1).remove_const!
+    rbind.CvDTreeNode.ignore = true
+    rbind.CvSlice.ignore = true
+    rbind.CvTermCriteria.ignore = true
+    rbind.cv.polyfit.ignore = true
+    rbind.cv.FlannBasedMatcher.write[0].ignore = true
+    rbind.cv.FlannBasedMatcher.write[1].ignore = true
+    rbind.cv.FlannBasedMatcher.read[0].ignore = true
+    # issues with UMat
+    rbind.detail.NoExposureCompensator.feed.ignore = true
+    rbind.detail.GainCompensator.feed.ignore = true
+    rbind.detail.BlocksGainCompensator.feed.ignore = true
+
+    # issues with enum using full namespace name
+    rbind.cv.HOGDescriptor.ignore = true
+
+    # is removed on opencv master
+    rbind.ml.StatModel.getParams.ignore = true if(rbind.ml.StatModel.operation?('getParams'))
+
+    # is removed on opencv master
+    # mark none polymorphic class
+    rbind.ml.DTrees.Params.polymorphic = false if(rbind.ml.DTrees.type?("Params"))
+
+    if minor >= 5
+        puts "Here"
+        rbind.cv.createShapeContextDistanceExtractor.ignore = true
+    end
 end
 
 # add some more vector types
@@ -99,6 +158,7 @@ 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<Range>")
 rbind.parser.type("std::vector<std::vector<Point2d> >")
 
 # add some extra documentation

data/ext/src/CMakeLists.txt

@@ -2,11 +2,36 @@ cmake_minimum_required(VERSION 2.6)
 PROJECT(rbind_opencv CXX)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+
 include(FindPkgConfig)
-pkg_check_modules(OPENCV REQUIRED opencv)
-add_definitions(${OPENCV_CFLAGS})
+find_package(OpenCV REQUIRED)
 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"
@@ -14,10 +39,9 @@ SET(RBIND_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/conversions.cc")
 
 add_custom_command(OUTPUT ${RBIND_SRC}
-       COMMAND ruby "${CMAKE_CURRENT_SOURCE_DIR}/../rbind.rb")
-
+    COMMAND ruby "${CMAKE_CURRENT_SOURCE_DIR}/../rbind.rb" ARGS "\"${FIND_PACKAGE_MESSAGE_DETAILS_OpenCV}\"")
 ADD_LIBRARY(rbind_opencv SHARED ${RBIND_SRC})
-TARGET_LINK_LIBRARIES(rbind_opencv ${OPENCV_LIBS} ${OPENCV_LDFLAGS_OTHER} ${OPENCV_LIBRARIES})
+TARGET_LINK_LIBRARIES(rbind_opencv ${OpenCV_LIBS})
 
 set(ROOT_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/../..)
 install(TARGETS rbind_opencv LIBRARY DESTINATION ${ROOT_FOLDER}/lib/ropencv)

data/lib/ropencv/ropencv_ruby.rb

@@ -206,13 +206,19 @@ module OpenCV
             end
 
             def <<(val)
-                if val.is_a?(Fixnum)
+                if val.is_a?(1.class)
                     write_int(val)
                 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 +280,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 +314,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 +328,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]
@@ -364,7 +394,7 @@ module OpenCV
                                    [obj.size,1,obj.first]
                                end
                            end
-                    setter,step,type = if e.is_a? Fixnum
+                    setter,step,type = if e.is_a? 1.class
                                            [:put_array_of_int32,4*w,CV_32SC1]
                                        elsif e.is_a? Float
                                            [:put_array_of_float64,8*w,CV_64FC1]
@@ -398,12 +428,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}"
@@ -431,7 +461,7 @@ module OpenCV
                 case other
                 when Float
                     [other,to_f]
-                when Fixnum 
+                when 1.class 
                     [other,to_i]
                 else
                     raise TypeError, "#{self.class} can't be coerced into #{other.class}"
@@ -461,17 +491,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 +536,9 @@ module OpenCV
 
             def -(val)
                 if val.is_a? Float
-                    Rbind::cv_mat_operator_minus2( self, val)
-                elsif val.is_a? Fixnum
-                    Rbind::cv_mat_operator_minus3( self, val)
+                    Rbind::cv_mat_operator_minus__2( self, val)
+                elsif val.is_a? 1.class
+                    Rbind::cv_mat_operator_minus__3( self, val)
                 else
                     Rbind::cv_mat_operator_minus( self, val)
                 end
@@ -515,9 +546,9 @@ module OpenCV
 
             def +(val)
                 if val.is_a? Float
-                    Rbind::cv_mat_operator_plus2( self, val)
-                elsif val.is_a? Fixnum
-                    Rbind::cv_mat_operator_plus3( self, val)
+                    Rbind::cv_mat_operator_plus__2( self, val)
+                elsif val.is_a? 1.class
+                    Rbind::cv_mat_operator_plus__3( self, val)
                 else
                     Rbind::cv_mat_operator_plus( self, val)
                 end
@@ -525,9 +556,9 @@ module OpenCV
 
             def /(val)
                 if val.is_a? Float
-                    Rbind::cv_mat_operator_div2( self, val)
-                elsif val.is_a? Fixnum
-                    Rbind::cv_mat_operator_div3( self, val)
+                    Rbind::cv_mat_operator_div__2( self, val)
+                elsif val.is_a? 1.class
+                    Rbind::cv_mat_operator_div__3( self, val)
                 else
                     Rbind::cv_mat_operator_div( self, val)
                 end
@@ -535,9 +566,9 @@ module OpenCV
 
             def *(val)
                 if val.is_a? Float
-                    Rbind::cv_mat_operator_mult2( self, val)
-                elsif val.is_a? Fixnum
-                    Rbind::cv_mat_operator_mult3( self, val)
+                    Rbind::cv_mat_operator_mult__2( self, val)
+                elsif val.is_a? 1.class
+                    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,18 +1,18 @@
 Gem::Specification.new do |s|
     s.name              = 'ropencv'
-    s.version           = '0.0.21'
-    s.date              = '2015-04-14'
+    s.version           = '0.0.33'
+    s.date              = '2021-02-08'
     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 "ffi", "~> 1.9.0"
+    s.add_runtime_dependency "rbind", ">= 0.0.30"
+    s.add_runtime_dependency "ffi", ">= 1.9.0"
     s.add_development_dependency 'minitest', '~> 5.5'
     s.extensions = ['ext/extconf.rb']
     s.license = 'BSD'

metadata

@@ -1,68 +1,68 @@
 --- !ruby/object:Gem::Specification
 name: ropencv
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.33
 platform: ruby
 authors:
 - Alexander Duda
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2021-02-08 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.30
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.27
+        version: 0.0.30
 - !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,16 @@ files:
 - ext/post_opencv244.txt
 - ext/post_opencv249.txt
 - ext/post_opencv300.txt
+- ext/post_opencv300a.txt
+- ext/post_opencv310.txt
+- ext/post_opencv400.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,30 +113,27 @@ 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
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 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
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Ruby bindings for opencv 2.4.4 and higher
 test_files: []
-has_rdoc: