ropencv 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1650b14ec2a2ce44837bf1975ecdd677c4bae996
-  data.tar.gz: 0ffe7a2c605e9ade443040e70a307fc17a16de78
+  metadata.gz: d80992cd488fc9da556eafc91ec379f008232224
+  data.tar.gz: 560a506ffc0a3f10e3738fb951cebea84ddc175b
 SHA512:
-  metadata.gz: 6bae2f59f42f6ae007c8cfe7e7b19de02e73ece1c5c47ff6a073192333b4fc5d31dbf2236355990a9f45940757ffee25174c8057f9c7821e567d46960bc92b28
-  data.tar.gz: c1d4d40884066d282ef9325cd5c1aea5d9fa8bb9b10da7d3b6e3b716b66ced06849884fd4bf2f8d04a0a18821cffa48dc8af2ebea30074ea453c5faba01ecfce
+  metadata.gz: 63b6394bb116af88eb33061789eac7bf13510b1f9ba22d24b8a147eb76c7fae5b24c2dae1a6586910d0a7fd6dae1259a31ce9e22a768f916c413cc8e7c96e152
+  data.tar.gz: d9eec5dfc196d4f77dc106c21c1de14bdbd49022889bf0b23ab62d8c2ce90eb6b4ac9c97d1bf0070fba5431ed67852276ab2aa8a6caa8e7e8fb5d8e36d549692

data/ext/helper.rb

@@ -91,14 +91,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
+    out.read.chomp =~ /(\d+).(\d+).(\d+)/
+    major = $1.to_i; minor = $2.to_i; revision = $3.to_i
 
     ##add opencv headers
-    headers = if major >= 2 && major < 3
+    headers = if major < 1 || (major == 2 && minor <= 4 && revision<= 3)
+                  raise "OpenCV version #{opencv_version} is not supported. At least OpenCV 2.4.4 is required"
+              elsif major == 2
                   ["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",
@@ -110,7 +109,7 @@ def find_opencv
                       "opencv2/highgui/highgui_c.h", "opencv2/highgui/highgui.hpp",
                       "opencv2/contrib/contrib.hpp", "opencv2/nonfree/nonfree.hpp",
                       "opencv2/nonfree/features2d.hpp"]
-              elsif major >= 3
+              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",
@@ -121,8 +120,9 @@ 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"]
               else
-                  raise "OpenCV version #{opencv_version} is not supported"
+                  raise "OpenCV version #{opencv_version} is currently not supported"
               end
+
     temp = paths.clone
     temp.each do |path|
 	if path =~ /(.*)opencv$/
@@ -145,6 +145,5 @@ def find_opencv
             nil
 	end
     end.compact
-    Rbind.log.warn "found opencv #{opencv_version}: #{paths[0]}"
-    [opencv_version,headers]
+    [major,minor,revision,headers]
 end

data/ext/rbind.rb

@@ -3,7 +3,9 @@ require 'pp'
 require 'yaml'
 
 require File.join(File.dirname(__FILE__),'helper.rb')
-opencv_version,opencv_headers = find_opencv
+major,minor,revision,opencv_headers = find_opencv
+opencv_version = "#{major}.#{minor}.#{revision}"
+Rbind.log.warn "found opencv #{opencv_version}"
 
 rbind = Rbind::Rbind.new("OpenCV")
 rbind.pkg_config << "opencv"
@@ -19,7 +21,7 @@ end
 
 # add some templates and alias
 rbind.parser.type_alias["const_c_string"] = rbind.c_string.to_const
-if opencv_version >= "3.0.0"
+if major >= 3
     rbind.add_std_types
     rbind.parser.add_type OpenCVPtr2.new
     rbind.cv.add_type(Rbind::RClass.new("ShapeTransformer"))
@@ -45,7 +47,7 @@ rbind.parse_headers
 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"
+if major == 2 && minor == 4 && revision>= 9
     rbind.parse File.join(File.dirname(__FILE__),"post_opencv249.txt")
 
     rbind.cv.calcOpticalFlowSF[0].parameter(0).remove_const!
@@ -67,7 +69,7 @@ if opencv_version >= "2.4.9" && opencv_version < "3.0.0"
     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"
+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!
@@ -130,6 +132,14 @@ Rbind::GeneratorRuby.on_normalize_default_value do |parameter|
     end
 end
 
+# add version
+cmajor = Rbind::RParameter.new(:CV_VERSION_MAJOR,rbind.parser.type("const int"),major)
+cminor= Rbind::RParameter.new(:CV_VERSION_MINOR,rbind.parser.type("const int"),minor)
+crevision = Rbind::RParameter.new(:CV_VERSION_REVISION,rbind.parser.type("const int"),revision)
+rbind.parser.add_const(cmajor)
+rbind.parser.add_const(cminor)
+rbind.parser.add_const(crevision)
+
 # generate files
 rbind.generator_ruby.file_prefix = "ropencv"
 rbind.generate(File.join(File.dirname(__FILE__),"src"),File.join(File.dirname(__FILE__),"..","lib","ropencv"))

data/ropencv.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name              = 'ropencv'
-    s.version           = '0.0.19'
+    s.version           = '0.0.20'
     s.date              = '2015-03-13'
     s.platform          = Gem::Platform::RUBY
     s.authors           = ['Alexander Duda']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ropencv
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Alexander Duda