ropencv 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a21fadec0688391caa58a3f1f6d0d6cab7a3d3e5
-  data.tar.gz: db8f28e144e303f017162b156cdf78259928180f
+  metadata.gz: 1650b14ec2a2ce44837bf1975ecdd677c4bae996
+  data.tar.gz: 0ffe7a2c605e9ade443040e70a307fc17a16de78
 SHA512:
-  metadata.gz: cdc23ed5fa3c1e6e27eeaf4b58bd2f2f4ea3e132ec61c1ffb321882c7c75d8054f7ca0880f219639a50bfd8c4154e3cc8950c1923f4c42b0ac8f331f97569fec
-  data.tar.gz: ae92ab5a3c0c8547755227904f2b11b99b8db366aa46c2ea06a2b6bc3f44bd7ca6e8878195216a83d4d7a4ca351a49238f96d06cb7fbe3c5c338b91850b5b9ab
+  metadata.gz: 6bae2f59f42f6ae007c8cfe7e7b19de02e73ece1c5c47ff6a073192333b4fc5d31dbf2236355990a9f45940757ffee25174c8057f9c7821e567d46960bc92b28
+  data.tar.gz: c1d4d40884066d282ef9325cd5c1aea5d9fa8bb9b10da7d3b6e3b716b66ced06849884fd4bf2f8d04a0a18821cffa48dc8af2ebea30074ea453c5faba01ecfce

data/examples/match_keypoints.rb

@@ -1,8 +1,8 @@
 require 'ropencv'
 include OpenCV
 
-img1 = cv::imread(File.join('data','tsukuba_l.png'),CV_LOAD_IMAGE_GRAYSCALE)
-img2 = cv::imread(File.join('data','tsukuba_r.png'),CV_LOAD_IMAGE_GRAYSCALE)
+img1 = cv::imread(File.join('data','tsukuba_l.png'),cv::IMREAD_GRAYSCALE)
+img2 = cv::imread(File.join('data','tsukuba_r.png'),cv::IMREAD_GRAYSCALE)
 if (img1.empty() || img2.empty())
     puts("Can't read one of the images\n")
     return -1
@@ -10,12 +10,12 @@ end
 
 keypoints1=Vector.new(cv::KeyPoint)
 keypoints2=Vector.new(cv::KeyPoint)
-detector = cv::FeatureDetector::create('SURF')
+detector = cv::FastFeatureDetector::create
 detector.detect(img1, keypoints1)
 detector.detect(img2, keypoints2)
 
 # computing descriptors
-extractor=cv::DescriptorExtractor::create('SURF')
+extractor = cv::ORB.create
 descriptors2=cv::Mat.new(3, 4, cv::CV_64FC1)
 descriptors1=cv::Mat.new(3, 4, cv::CV_64FC1)
 extractor.compute(img1, keypoints1, descriptors1)

data/examples/video2images.rb

@@ -0,0 +1,14 @@
+# writes a video as single images"
+
+require 'ropencv'
+include OpenCV
+
+video_file = cv::VideoCapture.new(ARGV[0])
+frame = cv::Mat.new
+id = 0
+puts "writing video as single images"
+while video_file.read(frame)
+    cv::imwrite "name_#{"%05d" % id}.png",frame
+    id+=1
+end
+puts "all done"

data/ext/helper.rb

@@ -92,9 +92,13 @@ def find_opencv
     #check opencv version
     out = IO.popen("pkg-config --modversion opencv")
     opencv_version = out.read.chomp
+    opencv_version =~ /(\d+).(\d+).(\d+)/
+    major = $1.to_i
+    minor1 = $2.to_i
+    minor2= $3.to_i
 
     ##add opencv headers
-    headers = if opencv_version >= "2.4.4" && opencv_version < "2.4.9.0"
+    headers = if major >= 2 && major < 3
                   ["opencv2/core/core_c.h", "opencv2/core/types_c.h",
                       "opencv2/core/core.hpp", "opencv2/flann/miniflann.hpp",
                       "opencv2/imgproc/imgproc_c.h", "opencv2/imgproc/types_c.h",
@@ -106,36 +110,19 @@ 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" && 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",
-                      "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.hpp",
-                      "opencv2/stitching.hpp", "opencv2/superres.hpp",
-                      "opencv2/video.hpp", "opencv2/legacy.hpp","opencv2/video/tracking.hpp",
-                      "opencv2/video/background_segm.hpp",
-                      "opencv2/videostab.hpp"]
-              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"]
+              elsif major >= 3
+                  ["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/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"]
               else
                   raise "OpenCV version #{opencv_version} is not supported"
               end
-
     temp = paths.clone
     temp.each do |path|
 	if path =~ /(.*)opencv$/
@@ -158,6 +145,6 @@ def find_opencv
             nil
 	end
     end.compact
-    Rbind.log.info "found opencv #{opencv_version}: #{paths[0]}"
+    Rbind.log.warn "found opencv #{opencv_version}: #{paths[0]}"
     [opencv_version,headers]
 end

data/ext/rbind.rb

@@ -9,24 +9,32 @@ rbind = Rbind::Rbind.new("OpenCV")
 rbind.pkg_config << "opencv"
 rbind.includes = opencv_headers
 
+# add Vec types
+2.upto(6) do |idx|
+    next if idx == 5
+    rbind.parser.add_type Vec.new("cv::Vec#{idx}d",rbind.double,idx)
+    rbind.parser.add_type Vec.new("cv::Vec#{idx}f",rbind.float,idx)
+    rbind.parser.add_type Vec.new("cv::Vec#{idx}i",rbind.int,idx)
+end
+
 # add some templates and alias
 rbind.parser.type_alias["const_c_string"] = rbind.c_string.to_const
 if opencv_version >= "3.0.0"
     rbind.add_std_types
     rbind.parser.add_type OpenCVPtr2.new
+    rbind.cv.add_type(Rbind::RClass.new("ShapeTransformer"))
+    rbind.cv.add_type(Rbind::RClass.new("Feature2D"))
+    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}
 else
     rbind.add_std_vector
     rbind.parser.add_type OpenCVPtr.new
 end
 
-# add Vec types
-2.upto(6) do |idx|
-    next if idx == 5
-    rbind.parser.add_type Vec.new("cv::Vec#{idx}d",rbind.double,idx)
-    rbind.parser.add_type Vec.new("cv::Vec#{idx}f",rbind.float,idx)
-    rbind.parser.add_type Vec.new("cv::Vec#{idx}i",rbind.int,idx)
-end
-
 # parsing
 rbind.parse File.join(File.dirname(__FILE__),"pre_opencv244.txt")
 rbind.parse File.join(File.dirname(__FILE__),"opencv.txt")
@@ -39,6 +47,26 @@ rbind.parse File.join(File.dirname(__FILE__),"post_opencv244.txt")
 # post parsing + patching wrong signatures
 if opencv_version >= "2.4.9" && opencv_version < "3.0.0"
     rbind.parse File.join(File.dirname(__FILE__),"post_opencv249.txt")
+
+    rbind.cv.calcOpticalFlowSF[0].parameter(0).remove_const!
+    rbind.cv.calcOpticalFlowSF[0].parameter(1).remove_const!
+    rbind.cv.calcOpticalFlowSF[0].parameter(2).remove_const!
+
+    rbind.cv.calcOpticalFlowSF[1].parameter(0).remove_const!
+    rbind.cv.calcOpticalFlowSF[1].parameter(1).remove_const!
+    rbind.cv.calcOpticalFlowSF[1].parameter(2).remove_const!
+
+    rbind.cv.chamerMatching.parameter(0).remove_const!
+    rbind.cv.chamerMatching.parameter(1).remove_const!
+    rbind.cv.chamerMatching.parameter(2).remove_const!
+
+    rbind.cv.CascadeClassifier.detectMultiScale[1].parameter(2).remove_const!
+    rbind.cv.CascadeClassifier.detectMultiScale[1].parameter(3).remove_const!
+    rbind.cv.BRISK.generateKernel.parameter(0).remove_const!
+    rbind.cv.BRISK.generateKernel.parameter(1).remove_const!
+    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 opencv_version >= "3.0.0"
     rbind.parse File.join(File.dirname(__FILE__),"post_opencv249.txt")
     rbind.parse File.join(File.dirname(__FILE__),"post_opencv300.txt")
@@ -46,28 +74,18 @@ elsif opencv_version >= "3.0.0"
     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!
-end
-
-rbind.cv.calcOpticalFlowSF[0].parameter(0).remove_const!
-rbind.cv.calcOpticalFlowSF[0].parameter(1).remove_const!
-rbind.cv.calcOpticalFlowSF[0].parameter(2).remove_const!
-
-rbind.cv.calcOpticalFlowSF[1].parameter(0).remove_const!
-rbind.cv.calcOpticalFlowSF[1].parameter(1).remove_const!
-rbind.cv.calcOpticalFlowSF[1].parameter(2).remove_const!
+    rbind.CvDTreeNode.ignore = true
+    rbind.CvSlice.ignore = true
+    rbind.CvTermCriteria.ignore = true
+    rbind.cv.polyfit.ignore = true
 
-rbind.cv.CascadeClassifier.detectMultiScale[1].parameter(2).remove_const!
-rbind.cv.CascadeClassifier.detectMultiScale[1].parameter(3).remove_const!
+    # is removed on opencv master
+    rbind.ml.StatModel.getParams.ignore = true if(rbind.ml.StatModel.operation?('getParams'))
 
-rbind.cv.BRISK.generateKernel.parameter(0).remove_const!
-rbind.cv.BRISK.generateKernel.parameter(1).remove_const!
-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!
-rbind.cv.chamerMatching.parameter(0).remove_const!
-rbind.cv.chamerMatching.parameter(1).remove_const!
-rbind.cv.chamerMatching.parameter(2).remove_const!
+    # is removed on opencv master
+    # mark none polymorphic class
+    rbind.ml.DTrees.Params.polymorphic = false if(rbind.ml.DTrees.type?("Params"))
+end
 
 # add some more vector types
 rbind.parser.type("std::vector<Point2d>")

data/ext/src/CMakeLists.txt

@@ -9,7 +9,6 @@ include_directories(${OPENCV_INCLUDE_DIRS})
 link_directories(${OPENCV_LIBRARY_DIRS})
 
 
-
 SET(RBIND_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/types.cc"
     "${CMAKE_CURRENT_SOURCE_DIR}/operations.cc"
@@ -19,31 +18,19 @@ add_custom_command(OUTPUT ${RBIND_SRC}
        COMMAND ruby "${CMAKE_CURRENT_SOURCE_DIR}/../rbind.rb")
 
 ADD_LIBRARY(rbind_opencv SHARED ${RBIND_SRC})
-TARGET_LINK_LIBRARIES(rbind_opencv ${OPENCV_LIBS} ${OPENCV_LDFLAGS}  ${GEM_LIBRARIES})
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rbind.pc.in ${CMAKE_CURRENT_BINARY_DIR}/rbind_opencv.pc @ONLY)
+TARGET_LINK_LIBRARIES(rbind_opencv ${OPENCV_LIBS} ${OPENCV_LDFLAGS_OTHER} )
 
 set(ROOT_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/../..)
-if(GEM_INSTALL)
-    # local install
-    install(TARGETS rbind_opencv LIBRARY DESTINATION ${ROOT_FOLDER}/lib)
-    install(FILES types.h operations.h conversions.hpp DESTINATION ${ROOT_FOLDER}/include)
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/extern.rbind DESTINATION ${ROOT_FOLDER}/include)
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.rbind DESTINATION ${ROOT_FOLDER}/include)
-else()
-    # global install
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/rbind_opencv.pc DESTINATION lib/pkgconfig)
-    install(TARGETS rbind_opencv LIBRARY DESTINATION lib)
-    install(FILES types.h operations.h conversions.hpp DESTINATION include/${PROJECT_NAME})
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/extern.rbind DESTINATION include/${PROJECT_NAME})
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.rbind DESTINATION include/${PROJECT_NAME})
+install(TARGETS rbind_opencv LIBRARY DESTINATION ${ROOT_FOLDER}/lib/ropencv)
 
+# global install
+if(NOT GEM_INSTALL)
     FIND_PACKAGE(Ruby)
     IF(NOT RUBY_INCLUDE_PATH)
         MESSAGE(STATUS "Ruby library not found. Cannot install ruby extensions")
     ELSE(NOT RUBY_INCLUDE_PATH)
-        STRING(REGEX REPLACE ".*lib(32|64)?/?" "lib/" RUBY_LIBRARY_INSTALL_DIR ${RUBY_RUBY_LIB_PATH})
+        STRING(REGEX REPLACE ".*lib(32|64)?/?" "lib/" RUBY_LIBRARY_INSTALL_DIR ${RUBY_RUBY_LIB_DIR})
         INSTALL(DIRECTORY ${ROOT_FOLDER}/lib/ DESTINATION ${RUBY_LIBRARY_INSTALL_DIR}
-            FILES_MATCHING PATTERN "*.rb")
+            FILES_MATCHING PATTERN "*.rb" PATTERN "*.rbind" PATTERN "*.so" PATTERN "*.dylib")
     ENDIF(NOT RUBY_INCLUDE_PATH)
-endif()
+ENDIF(NOT GEM_INSTALL)

data/ext/src/cmake/FindRuby.cmake

@@ -77,6 +77,8 @@ IF(RUBY_EXECUTABLE  AND NOT  RUBY_MAJOR_VERSION)
 
   EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir']"
       OUTPUT_VARIABLE RUBY_HDR_DIR)
+  EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyarchhdrdir']"
+      OUTPUT_VARIABLE RUBY_ARCH_HDR_DIR)
 
   EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']"
       OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_DIR)
@@ -114,6 +116,7 @@ IF(RUBY_EXECUTABLE  AND NOT  RUBY_MAJOR_VERSION)
    SET(RUBY_VERSION_PATCH    ${RUBY_VERSION_PATCH}    CACHE PATH "The Ruby patch version" FORCE)
    SET(RUBY_ARCH_DIR         ${RUBY_ARCH_DIR}         CACHE PATH "The Ruby arch dir" FORCE)
    SET(RUBY_HDR_DIR          ${RUBY_HDR_DIR}          CACHE PATH "The Ruby header dir (1.9)" FORCE)
+   SET(RUBY_ARCH_HDR_DIR     ${RUBY_ARCH_HDR_DIR}     CACHE PATH "The Ruby header dir for architecture-specific files (1.9)" FORCE)
    SET(RUBY_POSSIBLE_LIB_DIR ${RUBY_POSSIBLE_LIB_DIR} CACHE PATH "The Ruby lib dir" FORCE)
    SET(RUBY_RUBY_LIB_DIR     ${RUBY_RUBY_LIB_DIR}     CACHE PATH "The Ruby ruby-lib dir" FORCE)
    SET(RUBY_SITEARCH_DIR     ${RUBY_SITEARCH_DIR}     CACHE PATH "The Ruby site arch dir" FORCE)
@@ -178,27 +181,26 @@ FIND_PATH(RUBY_INCLUDE_DIR
    NAMES ruby.h
    HINTS
    ${RUBY_HDR_DIR}
-   ${RUBY_ARCH_DIR}
-   /usr/lib/ruby/${_RUBY_VERSION_SHORT}/i586-linux-gnu/ )
-
-SET(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIR} )
+   ${RUBY_ARCH_DIR})
+set(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIR})
 
 # if ruby > 1.8 is required or if ruby > 1.8 was found, search for the config.h dir
 IF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18  OR  ${_RUBY_VERSION_SHORT_NODOT} GREATER 18  OR  RUBY_HDR_DIR)
-   message(STATUS "lookign for config.h")
+   message(STATUS "FindRuby: looking for config.h")
    FIND_PATH(RUBY_CONFIG_INCLUDE_DIR
      NAMES ruby/config.h  config.h
      HINTS 
      ${RUBY_HDR_DIR}/${RUBY_ARCH}
+     ${RUBY_ARCH_HDR_DIR}
      ${RUBY_ARCH_DIR} 
      )
 
-   SET(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIRS} ${RUBY_CONFIG_INCLUDE_DIR} )
+   list(APPEND RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIRS} ${RUBY_CONFIG_INCLUDE_DIR})
 ENDIF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18  OR  ${_RUBY_VERSION_SHORT_NODOT} GREATER 18  OR  RUBY_HDR_DIR)
 
 
 # Determine the list of possible names for the ruby library
-SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ${RUBY_RUBY_LIBRARY})
+SET(_RUBY_POSSIBLE_LIB_NAMES ruby${_RUBY_VERSION_SHORT} ${RUBY_RUBY_LIBRARY} ruby ruby-static)
 
 IF(WIN32)
    SET( _RUBY_MSVC_RUNTIME "" )
@@ -225,7 +227,10 @@ IF(WIN32)
                "msvcrt-ruby${RUBY_NODOT_VERSION}-static" )
 ENDIF(WIN32)
 
-FIND_LIBRARY(RUBY_LIBRARY NAMES ${_RUBY_POSSIBLE_LIB_NAMES} HINTS ${RUBY_POSSIBLE_LIB_DIR} )
+FIND_LIBRARY(RUBY_LIBRARY NAMES ${_RUBY_POSSIBLE_LIB_NAMES} HINTS ${RUBY_POSSIBLE_LIB_DIR} NO_DEFAULT_PATH)
+if(NOT RUBY_LIBRARY)
+    FIND_LIBRARY(RUBY_LIBRARY NAMES ${_RUBY_POSSIBLE_LIB_NAMES} HINTS ${RUBY_POSSIBLE_LIB_DIR})
+endif()
 
 INCLUDE(FindPackageHandleStandardArgs)
 SET(_RUBY_REQUIRED_VARS RUBY_EXECUTABLE RUBY_INCLUDE_DIR RUBY_LIBRARY)
@@ -236,7 +241,9 @@ ENDIF(_RUBY_VERSION_SHORT_NODOT GREATER 18)
 IF(_RUBY_DEBUG_OUTPUT)
    MESSAGE(STATUS "--------FindRuby.cmake debug------------")
    MESSAGE(STATUS "_RUBY_POSSIBLE_EXECUTABLE_NAMES: ${_RUBY_POSSIBLE_EXECUTABLE_NAMES}")
+   MESSAGE(STATUS "RUBY_POSSIBLE_LIB_DIR: ${RUBY_POSSIBLE_LIB_DIR}")
    MESSAGE(STATUS "_RUBY_POSSIBLE_LIB_NAMES: ${_RUBY_POSSIBLE_LIB_NAMES}")
+   MESSAGE(STATUS "RUBY_LIBRARY: ${RUBY_LIBRARY}")
    MESSAGE(STATUS "RUBY_ARCH_DIR: ${RUBY_ARCH_DIR}")
    MESSAGE(STATUS "RUBY_HDR_DIR: ${RUBY_HDR_DIR}")
    MESSAGE(STATUS "RUBY_POSSIBLE_LIB_DIR: ${RUBY_POSSIBLE_LIB_DIR}")

data/lib/ropencv/ropencv_ruby.rb

@@ -352,13 +352,13 @@ module OpenCV
                     Cv::Mat.new(obj.size,1,Cv::CV_64FC1,obj.data,Cv::Mat::AUTO_STEP).__obj_ptr__
                 elsif obj.is_a?(Array)
                     h,w,e= if obj.first.is_a? Array
-                               if obj.find {|array| array.find(Float)}
+                               if obj.find {|array| array.find{|o| o.is_a?(Float) }}
                                    [obj.size,obj.first.size,obj.first.first.to_f]
                                else
                                    [obj.size,obj.first.size,obj.first.first]
                                end
                            else
-                               if obj.find(Float)
+                               if obj.find{|o| o.is_a?(Float) }
                                    [obj.size,1,obj.first.to_f]
                                else
                                    [obj.size,1,obj.first]

data/ropencv.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name              = 'ropencv'
-    s.version           = '0.0.18'
-    s.date              = '2014-10-11'
+    s.version           = '0.0.19'
+    s.date              = '2015-03-13'
     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.26"
+    s.add_runtime_dependency "rbind", ">= 0.0.27"
     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.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Alexander Duda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-11 00:00:00.000000000 Z
+date: 2015-03-13 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.26
+        version: 0.0.27
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.26
+        version: 0.0.27
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,7 @@ files:
 - examples/hough_circles.rb
 - examples/match_keypoints.rb
 - examples/polyfit.rb
+- examples/video2images.rb
 - ext/CMakeLists.txt
 - ext/extconf.rb
 - ext/helper.rb
@@ -78,9 +79,7 @@ files:
 - ext/pre_opencv244.txt
 - ext/rbind.rb
 - ext/src/CMakeLists.txt
-- ext/src/cmake/FindGem.cmake
 - ext/src/cmake/FindRuby.cmake
-- ext/src/rbind.pc.in
 - lib/ropencv.rb
 - lib/ropencv/ropencv_ruby.rb
 - manifest.xml
@@ -118,4 +117,3 @@ signing_key:
 specification_version: 4
 summary: Ruby bindings for opencv 2.4.4 and higher
 test_files: []
-has_rdoc: 

data/ext/src/cmake/FindGem.cmake

@@ -1,155 +0,0 @@
-# Author thomas.roehr@dfki.de
-#
-# Version 0.3 2013-07-02
-#       - rely on `gem content` to find library and header
-#       - introduce GEM_OS_PKG to allow search via pkgconfig
-# Version 0.2 2010-01-14
-#       - add support for searching for multiple gems
-# Version 0.1 2010-12-15
-# 	- support basic search functionality 
-#       - tested to find rice
-#
-# OUTPUT:
-#
-# GEM_INCLUDE_DIRS	After successful search contains the include directores
-#
-# GEM_LIBRARIES		After successful search contains the full path of each found library
-#
-#
-# Usage: 
-# set(GEM_DEBUG TRUE)
-# find_package(Gem COMPONENTS rice hoe)
-# include_directories(${GEM_INCLUDE_DIRS})
-# target_link_libraries(${GEM_LIBRARIES}
-#
-# in case pkg-config should be used to search for the os pkg, set GEM_OS_PKG, i.e.
-# set(GEM_OS_PKG TRUE)
-#
-# Check for how 'gem' should be called
-find_program(GEM_EXECUTABLE
-    NAMES "gem${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}"
-        "gem${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}"
-        "gem-${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}"
-        "gem-${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}"
-        "gem${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}${RUBY_VERSION_PATCH}"
-        "gem${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}"
-        "gem-${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}${RUBY_VERSION_PATCH}"
-        "gem-${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}"
-        "gem")
-
-# Making backward compatible
-if(Gem_DEBUG)
-    set(GEM_DEBUG TRUE)
-endif()
-
-if(NOT GEM_EXECUTABLE)
-	MESSAGE(FATAL_ERROR "Could not find the gem executable - install 'gem' first")
-endif()
-
-if(NOT Gem_FIND_COMPONENTS)
-	MESSAGE(FATAL_ERROR "If searching for a Gem you have to provide COMPONENTS with the name of the gem")
-endif()
-
-set(GEM_FOUND TRUE)
-foreach(Gem_NAME ${Gem_FIND_COMPONENTS})
-    # If the gem is installed as a gem
-    if(NOT GEM_OS_PKG)
-	    set(GEM_HOME ENV{GEM_HOME})
-
-        # Use `gem content <gem-name>` to extract current information about installed gems
-        # Store the information into ${GEM_LOCAL_INFO}
-        EXECUTE_PROCESS(COMMAND ${GEM_EXECUTABLE} content ${Gem_NAME} OUTPUT_VARIABLE GEM_LOCAL_INFO)
-
-	    if("${GEM_LOCAL_INFO}" STREQUAL "")
-	    	MESSAGE(FATAL_ERROR "No local gem found. Check your GEM_HOME setting!")
-	    else()
-            set(_library_NAME_PATTERN lib${Gem_NAME}.a
-	        		   lib${Gem_NAME}.so
-	        		   lib${Gem_NAME}.dylib
-	        		   ${Gem_NAME}.a
-	        		   ${Gem_NAME}.so
-	        		   ${Gem_NAME}.dylib
-                       .*.a
-                       .*.so
-                       .*.dylib
-	        )
-
-            set(_header_SUFFIX_PATTERN
-                        .h
-                        .hh
-                        .hpp
-            )
-
-            # Create a list from the output results of the gem command
-            string(REPLACE "\n" ";" GEM_CONTENT_LIST ${GEM_LOCAL_INFO})
-            foreach(_gem_CONTENT_PATH ${GEM_CONTENT_LIST})
-                
-                # Convert so that only '/' Unix path separator are being using
-                # needed to do proper regex matching
-                FILE(TO_CMAKE_PATH ${_gem_CONTENT_PATH} gem_CONTENT_PATH)
-
-                # Identify library -- checking for a library in the gems 'lib' (sub)directory
-                # Search for an existing library, but only within the gems folder
-                foreach(_library_NAME ${_library_NAME_PATTERN})
-                    STRING(REGEX MATCH ".*${Gem_NAME}.*/lib/.*${_library_NAME}$" GEM_PATH_INFO "${gem_CONTENT_PATH}")
-                    if(NOT "${GEM_PATH_INFO}" STREQUAL "")
-                        list(APPEND GEM_LIBRARIES ${GEM_PATH_INFO})
-                        break()
-                    endif()
-                endforeach()
-
-                # Identify headers
-                # Checking for available headers in an include directory
-                foreach(_header_PATTERN ${_header_SUFFIX_PATTERN})
-                    STRING(REGEX MATCH ".*${Gem_NAME}.*/include/.*${_header_PATTERN}$" GEM_PATH_INFO "${gem_CONTENT_PATH}")
-                    if(NOT "${GEM_PATH_INFO}" STREQUAL "")
-                        STRING(REGEX REPLACE "(.*${Gem_NAME}.*/include/).*${_header_PATTERN}$" "\\1" GEM_PATH_INFO "${gem_CONTENT_PATH}")
-                        list(APPEND GEM_INCLUDE_DIRS ${GEM_PATH_INFO})
-                        break()
-                    endif()
-                endforeach()
-            endforeach()
-
-            # Compact the lists
-            if(DEFINED GEM_LIBRARIES)
-                LIST(REMOVE_DUPLICATES GEM_LIBRARIES)
-            endif()
-            if(DEFINED GEM_INCLUDE_DIRS)
-                LIST(REMOVE_DUPLICATES GEM_INCLUDE_DIRS)
-            endif()
-        endif()
-    else(NOT GEM_OS_PKG)
-        pkg_check_modules(GEM_PKG ${Gem_NAME})
-        set(GEM_INCLUDE_DIRS ${GEM_PKG_INCLUDE_DIRS})
-        set(GEM_LIBRARIES ${GEM_PKG_LIBRARIES} ${GEM_PKG_STATIC_LIBRARIES})
-        list(APPEND GEM_LIBRARIES ${GEM_PKG_LDFLAGS} ${GEM_PKG_STATIC_LDFLAGS})
-        list(APPEND GEM_LIBRARIES ${GEM_PKG_LDFLAGS_OTHER} ${GEM_PKG_STATIC_LDFLAGS_OTHER})
-
-        if(GEM_DEBUG)
-            message(STATUS "GEM_OS_PKG is defined")
-            message(STATUS "GEM_INCLUDE_DIRS ${GEM_INCLUDE_DIRS}")
-            message(STATUS "GEM_STATIC_LIBRARY_DIRS ${GEM_PKG_STATIC_LIBRARY_DIRS}")
-            message(STATUS "GEM_LIBRARY_DIRS ${GEM_PKG_STATIC_LIBRARY_DIRS}")
-            message(STATUS "GEM_STATIC_LIBRARIES ${GEM_PKG_STATIC_LIBRARIES}")
-            message(STATUS "GEM_LIBRARIES ${GEM_LIBRARIES}")
-        endif()
-    endif()
-
-	if("${GEM_LIBRARIES}" STREQUAL "")
-		set(GEM_FOUND FALSE)
-    else()
-        MESSAGE(STATUS "Gem: ${Gem_NAME} found")
-	endif()
-
-    if(GEM_DEBUG)
-		message(STATUS "${Gem_NAME} library dir: ${GEM_LIBRARIES}")
-		message(STATUS "${Gem_NAME} include dir: ${GEM_INCLUDE_DIRS}")
-    endif()
-		
-    if(Gem_FIND_REQUIRED)
-        if(NOT GEM_FOUND)
-		    MESSAGE(FATAL_ERROR "Gem: ${Gem_NAME} could not be found")
-        endif()
-	endif()
-endforeach()
-

data/ext/src/rbind.pc.in

@@ -1,11 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: @PROJECT_NAME@
-Description: @PROJECT_DESCRIPTION@
-Version: @PROJECT_VERSION@
-Requires: opencv
-Libs: -L${libdir} -l@PROJECT_NAME@
-Cflags: -I${includedir}