ropencv 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d80992cd488fc9da556eafc91ec379f008232224
-  data.tar.gz: 560a506ffc0a3f10e3738fb951cebea84ddc175b
+  metadata.gz: ddadd3f34d029333f0b75d6daf43c9530d9eb3ce
+  data.tar.gz: 64055d27486efc056af1a403885ab76985351df1
 SHA512:
-  metadata.gz: 63b6394bb116af88eb33061789eac7bf13510b1f9ba22d24b8a147eb76c7fae5b24c2dae1a6586910d0a7fd6dae1259a31ce9e22a768f916c413cc8e7c96e152
-  data.tar.gz: d9eec5dfc196d4f77dc106c21c1de14bdbd49022889bf0b23ab62d8c2ce90eb6b4ac9c97d1bf0070fba5431ed67852276ab2aa8a6caa8e7e8fb5d8e36d549692
+  metadata.gz: 3f9bd2767f57f0181b02b361ebf134efdb3bddc641f8bfacdcd83c9fc93a7f3d199cda1a4ef8f419e1d370145834b541957e2a91860fb2445635c23ef2190232
+  data.tar.gz: b07b8f0000084df1c053521ec527c4992419f4cb04011d197cf6062cf21aca22427cf7c50230f73a0774ffbc0031afe3928d20c4aba8c178d5dfa3945c5d2e9b

data/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gemspec

data/Gemfile.lock

@@ -0,0 +1,21 @@
+PATH
+  remote: .
+  specs:
+    ropencv (0.0.20)
+      ffi (~> 1.9.0)
+      rbind (>= 0.0.27)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ffi (1.9.8)
+    minitest (5.5.1)
+    rbind (0.0.27)
+      ffi (>= 1.9.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  minitest (~> 5.5)
+  ropencv!

data/ext/opencv.txt

@@ -3,6 +3,7 @@ const cv.CV_LKFLOW_PYR_B_READY       2
 const cv.CV_LKFLOW_INITIAL_GUESSES   4
 const cv.CV_LKFLOW_GET_MIN_EIGENVALS 8
 const cv.INT_MAX 2147483647
+const cv.DBL_MAX 1.7976931348623157e+308
 const cv.CV_8U 0
 const cv.CV_8S 1
 const cv.CV_16U 2

data/ext/src/CMakeLists.txt

@@ -8,7 +8,6 @@ add_definitions(${OPENCV_CFLAGS})
 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"
@@ -18,7 +17,7 @@ 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_OTHER} )
+TARGET_LINK_LIBRARIES(rbind_opencv ${OPENCV_LIBS} ${OPENCV_LDFLAGS_OTHER} ${OPENCV_LIBRARIES})
 
 set(ROOT_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/../..)
 install(TARGETS rbind_opencv LIBRARY DESTINATION ${ROOT_FOLDER}/lib/ropencv)

data/manifest.xml

@@ -7,6 +7,6 @@
   <url>http://</url>
   <logo>http://</logo>
 
-  <depend package="opencv" />
+  <depend package="external/opencv" />
   <depend package="tools/rbind" />
 </package>

data/ropencv.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name              = 'ropencv'
-    s.version           = '0.0.20'
-    s.date              = '2015-03-13'
+    s.version           = '0.0.21'
+    s.date              = '2015-04-14'
     s.platform          = Gem::Platform::RUBY
     s.authors           = ['Alexander Duda']
     s.email             = ['Alexander.Duda@dfki.de']
@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
     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_development_dependency 'minitest', '~> 5.5'
     s.extensions = ['ext/extconf.rb']
     s.license = 'BSD'
 end

data/test/suite.rb

@@ -1,6 +1,9 @@
-require './test_mat'
-require './test_vec'
-require './test_vector'
-require './test_scalar'
-require './test_opencv'
-require './test_triangulate_points'
+require File.expand_path('../test_helper.rb', __FILE__)
+
+require 'test_mat'
+require 'test_vec'
+require 'test_vector'
+require 'test_scalar'
+require 'test_opencv'
+require 'test_triangulate_points'
+require 'test_recognizer'

data/test/test_helper.rb

@@ -0,0 +1,11 @@
+GEM_ROOT = File.join(File.dirname(__FILE__), '..')
+
+$:.unshift(File.join(GEM_ROOT, 'lib'))
+$:.unshift(File.join(GEM_ROOT, 'test'))
+
+require 'minitest/spec'
+require 'ropencv'
+require 'pp'
+
+include OpenCV
+MiniTest.autorun

data/test/test_mat.rb

@@ -1,9 +1,5 @@
-require 'minitest/spec'
-require 'ropencv'
-require 'pp'
-include OpenCV
+require File.expand_path('../test_helper.rb', __FILE__)
 
-MiniTest::Unit.autorun
 describe Cv::Mat do
     before do
     end

data/test/test_opencv.rb

@@ -1,9 +1,5 @@
-require 'minitest/spec'
-require 'ropencv'
-require 'pp'
-include OpenCV
+require File.expand_path('../test_helper.rb', __FILE__)
 
-MiniTest::Unit.autorun
 describe OpenCV::Cv do
     before do
     end

data/test/test_recognizer.rb

@@ -0,0 +1,39 @@
+require File.expand_path('../test_helper.rb', __FILE__)
+
+# opencv FaceRecognizer is optional and part of opencv_contrib
+if defined? OpenCV::Cv::FaceRecognizer
+describe 'cv::createlbph_face_recognizer' do
+  describe 'initialization' do
+    it 'creates a recognizer instance' do
+      recognizer = cv::createlbph_face_recognizer
+      assert_kind_of OpenCV::Cv::Ptr::Cv_FaceRecognizer, recognizer
+    end
+  end
+
+  describe 'prediction' do
+    before do
+      @recognizer  = cv::createlbph_face_recognizer
+      @images_path = File.join(GEM_ROOT, 'examples', 'data')
+      @images      = Std::Vector.new(cv::Mat)
+      @labels      = [0, 1]
+
+      [ 'sample.jpg', 'jolie.jpeg' ].each do |filename|
+        @images << cv::imread(File.join(@images_path, filename), cv::IMREAD_GRAYSCALE)
+      end
+    end
+
+    it 'can be trained against given labels and images' do
+      @recognizer.train(@images, @labels)
+
+      image = cv::imread(File.join(@images_path, 'jolie.jpeg'), cv::IMREAD_GRAYSCALE)
+      label = FFI::MemoryPointer.new(:int, 16)
+      conf  = FFI::MemoryPointer.new(:float, 32)
+
+      @recognizer.predict(image, label, conf)
+
+      assert_operator label.read_int, :>=, 0
+      refute conf.read_float.nan?
+    end
+  end
+end
+end

data/test/test_scalar.rb

@@ -1,9 +1,5 @@
-require 'minitest/spec'
-require 'ropencv'
-require 'pp'
-include OpenCV
+require File.expand_path('../test_helper.rb', __FILE__)
 
-MiniTest::Unit.autorun
 describe Cv::Scalar do
     describe "initialize" do
         it "can be created from 4 values" do

data/test/test_triangulate_points.rb

@@ -1,10 +1,5 @@
-require 'minitest/spec'
-require 'ropencv'
-require 'pp'
-include OpenCV
+require File.expand_path('../test_helper.rb', __FILE__)
 
-
-MiniTest::Unit.autorun
 describe Cv do
     describe "triangulate_points" do
         it "must triangulate the given points" do

data/test/test_vec.rb

@@ -1,9 +1,4 @@
-require 'minitest/spec'
-require 'ropencv'
-require 'pp'
-include OpenCV
-
-MiniTest::Unit.autorun
+require File.expand_path('../test_helper.rb', __FILE__)
 
 describe Cv::Vec2d do
     describe "initialize" do

data/test/test_vector.rb

@@ -1,9 +1,5 @@
-require 'minitest/spec'
-require 'ropencv'
-require 'pp'
-include OpenCV
+require File.expand_path('../test_helper.rb', __FILE__)
 
-MiniTest::Unit.autorun
 describe Std::Vector::Cv_Point do
     describe "initialize" do
         it "can be created without arguments" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ropencv
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Alexander Duda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbind
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !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:
@@ -50,6 +64,8 @@ files:
 - .gitignore
 - .yardopts
 - CMakeLists.txt
+- Gemfile
+- Gemfile.lock
 - License.txt
 - README.md
 - examples/data/haarcascade_frontalface_alt.xml.gz
@@ -85,8 +101,10 @@ files:
 - manifest.xml
 - ropencv.gemspec
 - test/suite.rb
+- test/test_helper.rb
 - test/test_mat.rb
 - test/test_opencv.rb
+- test/test_recognizer.rb
 - test/test_scalar.rb
 - test/test_triangulate_points.rb
 - test/test_vec.rb
@@ -117,3 +135,4 @@ signing_key:
 specification_version: 4
 summary: Ruby bindings for opencv 2.4.4 and higher
 test_files: []
+has_rdoc: