ropencv 0.0.30 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '064970d324ab983db62a99907d87e7dd39d7112e091c8da867b08017587e328a'
-  data.tar.gz: 9efdc1cfb2e78434ddd18d183870abeb708c2171676242e2349b719eb473123a
+  metadata.gz: 517c1a1959590086a988d260c740237060aaabba70b6ec0613dcf06bd8696698
+  data.tar.gz: 00fe3546915868ee913b92b36f406d67eee89f8256c3fc3c872ba07a1aaacb3a
 SHA512:
-  metadata.gz: e3750392f32e511fec00517ab5277e9b80c541203060d3d68c8612e67db8a441dabad54fee76e3d7b8163dda087437bc5265652736f66f03f3001a722ff73753
-  data.tar.gz: 3ae3875b0fda02d386424e2966ae9ab9040c44d459e2d9e301c92a2b8c8ffef32214ea92fa06c5fe2f91a410a6ff536226c9a8c9983114101abca4a310d99afb
+  metadata.gz: 1fea1adc6931eae8ba8673b570098f74cf8669892a4c94e259d0c6c172827b97a1e0e35c57edcfd76ae1dbe69402aaed8e88ec91ed665609c354b04d14750551
+  data.tar.gz: ac25f63d6f7baefda1c8dc8a73d604dc6e2ad2a83a9f15b50c269c6435e6ddb6b11d2403129c49c18cb05fc66a8230485068767c10397964d9d289bc1a59c4ed

data/ext/helper.rb

@@ -92,26 +92,15 @@ class Vec < Rbind::RClass
 end
 
 # find opencv version and headers needed to be parsed by rbind
-def find_opencv
-    # find opencv4 header path
-
-    pkg = nil
-    paths = nil
-    ["opencv4","opencv"].each do |p|
-        out = IO.popen("pkg-config --cflags-only-I #{p}")
-        paths = out.read.split("-I").delete_if(&:empty?).map do |i|
-            i.gsub("\n","").gsub(" ","")
-        end
-        if !paths.empty?
-            pkg = p
-            break
-        end
+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 #{pkg}")
-    opencv_version = out.read.chomp;
     opencv_version =~ /(\d+).(\d+).(\d+)/
     major = $1.to_i; minor = $2.to_i; revision = $3.to_i
 
@@ -141,28 +130,22 @@ def find_opencv
                    "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
-                  ["opencv2/core.hpp", "opencv2/core/base.hpp", "opencv2/core/mat.hpp", "opencv2/core/ocl.hpp",
+                  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/hist_cost.hpp", "opencv2/shape/shape_distance.hpp", "opencv2/shape/shape_transformer.hpp", "opencv2/stitching.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/rbind.rb

@@ -3,7 +3,8 @@ 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}"
 
@@ -48,6 +49,10 @@ elsif major >= 4
     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
@@ -136,6 +141,10 @@ elsif major >= 4
     # 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
@@ -148,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

@@ -5,11 +5,8 @@ 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)
@@ -42,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/ropencv.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name              = 'ropencv'
-    s.version           = '0.0.30'
-    s.date              = '2019-06-06'
+    s.version           = '0.0.35'
+    s.date              = '2021-02-14'
     s.platform          = Gem::Platform::RUBY
     s.authors           = ['Alexander Duda']
     s.email             = ['Alexander.Duda@me.com']
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
     s.require_path      = 'lib'
     s.required_rubygems_version = ">= 1.3.6"
     s.add_runtime_dependency "rbind", ">= 0.0.30"
-    s.add_runtime_dependency "ffi", "~> 1.9.0"
+    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.30
+  version: 0.0.35
 platform: ruby
 authors:
 - Alexander Duda
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2021-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbind
@@ -28,14 +28,14 @@ dependencies:
   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
@@ -117,7 +117,7 @@ homepage: http://www.ropencv.aduda.eu
 licenses:
 - BSD
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,9 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.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: []