ropencv 0.0.22 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d6203505aa5f31b21ee520787dd576ea0180121f
-  data.tar.gz: ffd25c6e69b0a2454859b08f7c325dd598e56eb5
+SHA256:
+  metadata.gz: 663872452e7ff2563896ccf1c3ae0d215d646f8f4175c26c0e5d1ac101be3f7e
+  data.tar.gz: a6deabc2ae5c6a0f47174e9d3cb577a446f5d9b0d7cc7181f5f47b92b5787f68
 SHA512:
-  metadata.gz: f54f387cf82bc8e34bbbfdb37d91903947397340dbe5ac1008ab143e81a08f4be14e8d9bd46ae49d77a5c45b51836f5bbba3266650e95f972e8a8d14f63a6e08
-  data.tar.gz: 85318f33655792d822309aaf4805b42e86bd5e3aafb3decb0645be8eb44172f480f70ec7303f8a2aa6b9a126255eeec294a33d18c14ace5f4f6f034b809e0529
+  metadata.gz: f147a1682fdf6ec36504ab2a98b273933ed58ba98c9f2690b1087d4dd153f6938b2e60a8e4c1b43c122c6054430b6dd2240015ccf9ed6764e91651f98a453ede
+  data.tar.gz: a1d115dd6ef68373dfff24e5461d11ba2cda39a512d2f17f15173ed230cf6a3b589eb4bbdf9df681b180ab74c8fafed6b0df962c88aac757bcc3194005f5aa23

data/ext/helper.rb

@@ -92,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
@@ -130,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
@@ -74,26 +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.begin char =str_begin
-cv.String.end char =str_end
-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
@@ -497,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
@@ -673,10 +647,120 @@ cv.FileNode.operator>> void =read_vector_string
 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

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_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

@@ -46,3 +46,7 @@ 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,18 +21,40 @@ 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
-    # 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}
+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
+    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
@@ -42,11 +64,10 @@ 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.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
+#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
@@ -71,19 +92,48 @@ 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.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.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
+    rbind.CvSlice.ignore = true
+    rbind.CvTermCriteria.ignore = true
+    rbind.cv.polyfit.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"))
+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'))
@@ -91,6 +141,10 @@ elsif major >= 3
     # is removed on opencv master
     # mark none polymorphic class
     rbind.ml.DTrees.Params.polymorphic = false if(rbind.ml.DTrees.type?("Params"))
+
+    if minor > 5
+        rbind.cv.createShapeContextDistanceExtractor.ignore = true
+    end
 end
 
 # add some more vector types
@@ -103,6 +157,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,12 +2,11 @@ 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)
@@ -40,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

@@ -82,9 +82,7 @@ module OpenCV
                 end
             end
             def to_s
-                s = size()
-                return "" if s == 0
-                str_begin.read_string_length(s)
+                c_str
             end
         end
 
@@ -208,7 +206,7 @@ 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)
@@ -396,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]
@@ -463,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}"
@@ -539,7 +537,7 @@ module OpenCV
             def -(val)
                 if val.is_a? Float
                     Rbind::cv_mat_operator_minus__2( self, val)
-                elsif val.is_a? Fixnum
+                elsif val.is_a? 1.class
                     Rbind::cv_mat_operator_minus__3( self, val)
                 else
                     Rbind::cv_mat_operator_minus( self, val)
@@ -549,7 +547,7 @@ module OpenCV
             def +(val)
                 if val.is_a? Float
                     Rbind::cv_mat_operator_plus__2( self, val)
-                elsif val.is_a? Fixnum
+                elsif val.is_a? 1.class
                     Rbind::cv_mat_operator_plus__3( self, val)
                 else
                     Rbind::cv_mat_operator_plus( self, val)
@@ -559,7 +557,7 @@ module OpenCV
             def /(val)
                 if val.is_a? Float
                     Rbind::cv_mat_operator_div__2( self, val)
-                elsif val.is_a? Fixnum
+                elsif val.is_a? 1.class
                     Rbind::cv_mat_operator_div__3( self, val)
                 else
                     Rbind::cv_mat_operator_div( self, val)
@@ -569,7 +567,7 @@ module OpenCV
             def *(val)
                 if val.is_a? Float
                     Rbind::cv_mat_operator_mult__2( self, val)
-                elsif val.is_a? Fixnum
+                elsif val.is_a? 1.class
                     Rbind::cv_mat_operator_mult__3( self, val)
                 else
                     Rbind::cv_mat_operator_mult( self, val)

data/ropencv.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name              = 'ropencv'
-    s.version           = '0.0.22'
-    s.date              = '2018-07-10'
+    s.version           = '0.0.34'
+    s.date              = '2021-02-14'
     s.platform          = Gem::Platform::RUBY
     s.authors           = ['Alexander Duda']
     s.email             = ['Alexander.Duda@me.com']
@@ -11,8 +11,8 @@ 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.28"
-    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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ropencv
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.34
 platform: ruby
 authors:
 - Alexander Duda
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2021-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbind
@@ -16,26 +16,26 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.28
+        version: 0.0.30
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.28
+        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
@@ -92,7 +92,9 @@ 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
@@ -115,7 +117,7 @@ homepage: http://www.ropencv.aduda.eu
 licenses:
 - BSD
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -130,9 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Ruby bindings for opencv 2.4.4 and higher
 test_files: []