ropencv 0.0.14 → 0.0.15

data/examples/find_keypoints.rb

@@ -1,7 +1,7 @@
 require 'ropencv'
 include OpenCV
 
-mat = cv::imread("logo.png")
+mat = cv::imread(File.join("data","logo.png"))
 cv.blur(mat,mat,cv::Size.new(10,10))
 
 detector = cv::FeatureDetector::create("SURF")

data/examples/harr_cascade.rb

@@ -0,0 +1,37 @@
+require 'zlib'
+require 'ropencv'
+include OpenCV
+
+#depends on openCV installation so copied into the directory for easier access
+face_cascade_name = File.join(Dir.getwd,'data',"haarcascade_frontalface_alt.xml")
+image_name = File.join(Dir.getwd,'data',"jolie.jpeg")
+
+
+# unpack file
+if !File.exist?(face_cascade_name)
+    Zlib::GzipReader.open("#{face_cascade_name}.gz") do |gz|
+        f = File.open(face_cascade_name,"w")
+        f.write gz.read
+        f.close
+    end
+end
+
+frame_gray =  cv::Mat.new
+face_cascade = cv::CascadeClassifier.new
+puts face_cascade.load(face_cascade_name) ? ' loaded' : 'not loaded'
+
+frame = cv::imread(image_name)
+faces = Std::Vector.new(cv::Rect)
+
+cv::cvt_color(frame,frame_gray, cv::COLOR_BGR2GRAY)
+cv::equalizeHist( frame_gray, frame_gray );
+
+face_cascade.detect_multi_scale( frame_gray, faces, 1.1, 2, );
+puts faces.size
+
+faces.each do |face|
+  center = cv::Point.new(face.x + face.width*0.5, face.y + face.height*0.5)
+  cv::ellipse( frame, center, cv::Size.new( face.width*0.5, face.height*0.5), 0, 0, 360, cv::Scalar.new( 255, 0, 255 ), 4, 8, 0 );
+end
+cv::imshow("key_points",frame)
+cv::wait_key(-1)

data/examples/hog_descriptor.rb

@@ -0,0 +1,28 @@
+require 'ropencv'
+include OpenCV
+
+image_name = File.join(Dir.getwd,'data',"sample.jpg")
+frame = cv::imread(image_name)
+
+detector = cv::HOGDescriptor.new
+people_detector_vec = cv::HOGDescriptor.get_default_people_detector
+default_people_detector_mat = cv::Mat.new(people_detector_vec.size, 1, cv::CV_32FC1, people_detector_vec.data, cv::Mat::AUTO_STEP)
+detector.setsvm_detector(default_people_detector_mat)
+founds = Std::Vector.new(cv::Rect)
+founds_filtered = Std::Vector.new(cv::Rect)
+window = Std::Vector::Double.new()
+
+detector.detect_multi_scale(frame, founds, window)
+
+founds.each do |found|
+
+  r = cv::Rect.new(found)
+  r.x += (r.width*0.1).to_i
+  r.width = (r.width*0.8).to_i
+  r.y += (r.height*0.07).to_i
+  r.height = (r.height*0.8).to_i
+  cv::rectangle(frame, r.tl, r.br, cv::Scalar.new(0,255,0), 3)
+
+end
+cv::imshow("hog_descriptor",frame)
+cv::wait_key(-1)

data/examples/hough_circles.rb

@@ -1,12 +1,12 @@
 require 'ropencv'
 include OpenCV
 
-img = cv::imread("logo.png")
+img = cv::imread(File.join("data","logo.png"))
 gray = cv::Mat.new
-cv::cvtColor(img,gray,CV_BGR2GRAY)
+cv::cvtColor(img,gray,cv::COLOR_BGR2GRAY)
 
 circles = cv::Mat.new
-cv::HoughCircles(gray, circles, CV_HOUGH_GRADIENT, 1, gray.rows/10, 10, 20 );
+cv::HoughCircles(gray, circles, cv::HOUGH_GRADIENT, 1, gray.rows/10, 10, 20 );
 circles = circles.reshape(1,circles.cols)
 
 circles.each_row do |circle|

data/examples/match_keypoints.rb

@@ -1,8 +1,8 @@
 require 'ropencv'
 include OpenCV
 
-img1 = cv::imread('tsukuba_l.png',CV_LOAD_IMAGE_GRAYSCALE)
-img2 = cv::imread('tsukuba_r.png',CV_LOAD_IMAGE_GRAYSCALE)
+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)
 if (img1.empty() || img2.empty())
     puts("Can't read one of the images\n")
     return -1
@@ -28,6 +28,6 @@ matcher.match(descriptors1, descriptors2, matches)
 
 # drawing the results
 img_matches=cv::Mat.new(3, 4, cv::CV_64FC1)
-cv::drawMatches(img1, keypoints1, img2, keypoints2, matches, img_matches)
+cv::draw_matches(img1, keypoints1, img2, keypoints2, matches, img_matches)
 cv::imshow("matches", img_matches)
 cv::waitKey(0)

data/ext/helper.rb

@@ -94,7 +94,7 @@ def find_opencv
     opencv_version = out.read.chomp
 
     ##add opencv headers
-    headers = if opencv_version >= "2.4.4" && opencv_version < "2.4.7.0"
+    headers = if opencv_version >= "2.4.4" && opencv_version < "2.4.9.0"
                   ["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",

data/lib/ropencv/ropencv_ruby.rb

@@ -310,6 +310,9 @@ module OpenCV
 
         class Mat
             include Enumerable
+            DISPLAYED_ROWS_MAX = 100
+            DISPLAYED_COLS_MAX = 100
+
             class << self
                 alias :rbind_new :new
 
@@ -332,6 +335,10 @@ module OpenCV
                     Cv::Mat.new(obj.size,1,Cv::CV_32FC3,obj.data,Cv::Mat::AUTO_STEP).__obj_ptr__
                 elsif obj.is_a?(Std::Vector::Fixnum)
                     Cv::Mat.new(obj.size,1,Cv::CV_32SC1,obj.data,Cv::Mat::AUTO_STEP).__obj_ptr__
+                elsif obj.is_a?(Std::Vector::Float)
+                    Cv::Mat.new(obj.size,1,Cv::CV_32FC1,obj.data,Cv::Mat::AUTO_STEP).__obj_ptr__
+                elsif obj.is_a?(Std::Vector::Double)
+                    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)}
@@ -526,19 +533,23 @@ module OpenCV
             end
 
             def pretty_print(pp)
-                format = case type & 7
-                         when CV_8U
-                             '%3.u'
-                         else
-                             '%6.3f'
-                         end
-                str = to_a.map do |r|
-                    str = r.map do |e|
-                        sprintf(format,e)
-                    end.join(" ")
-                    "|#{str}|"
-                end.join("\n")
-                    pp.text str
+                if(rows <= DISPLAYED_ROWS_MAX && cols <= DISPLAYED_COLS_MAX)
+                    format = case type & 7
+                             when CV_8U
+                                 '%3.u'
+                             else
+                                 '%6.3f'
+                             end
+                    str = to_a.map do |r|
+                        str = r.map do |e|
+                            sprintf(format,e)
+                        end.join(" ")
+                        "|#{str}|"
+                    end.join("\n")
+                        pp.text str
+                else
+                    pp.text self.to_s
+                end
             end
 
             def each

data/ropencv.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name              = 'ropencv'
-    s.version           = '0.0.14'
-    s.date              = '2014-02-16'
+    s.version           = '0.0.15'
+    s.date              = '2014-03-12'
     s.platform          = Gem::Platform::RUBY
     s.authors           = ['Alexander Duda']
     s.email             = ['Alexander.Duda@dfki.de']

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: ropencv
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
+  prerelease: 
 platform: ruby
 authors:
 - Alexander Duda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-16 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbind
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.24
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -52,14 +57,19 @@ files:
 - CMakeLists.txt
 - License.txt
 - README.md
+- examples/data/haarcascade_frontalface_alt.xml.gz
+- examples/data/jolie.jpeg
+- examples/data/logo.png
+- examples/data/sample.jpg
+- examples/data/tsukuba_l.png
+- examples/data/tsukuba_r.png
 - examples/file_storage.rb
 - examples/find_homography.rb
 - examples/find_keypoints.rb
+- examples/harr_cascade.rb
+- examples/hog_descriptor.rb
 - examples/hough_circles.rb
-- examples/logo.png
 - examples/match_keypoints.rb
-- examples/tsukuba_l.png
-- examples/tsukuba_r.png
 - ext/CMakeLists.txt
 - ext/extconf.rb
 - ext/helper.rb
@@ -89,26 +99,27 @@ files:
 homepage: http://www.ropencv.aduda.eu
 licenses:
 - BSD
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby bindings for opencv 2.4.4 and higher
 test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: ed24be2b4f9b19d2ab4170ad578b3d78d36958e4
-  data.tar.gz: 4d4520ac61ca76f16bf3a7961f6240f2c6cf9f10
-SHA512:
-  metadata.gz: 47aea3c934fe8500236d0ad798dad58d6abaeafe1fe6c0e9fdf47635da080b6549df5ca777ed99a6b68c959c7a64d91db889c17c04a1091487189fe074e88cb9
-  data.tar.gz: b1e32dda67c171d45095c114b0550c0ebdd0c7bb46577636673be39edd95d98c965fbe208df74efa2fb32bcc5b3b4151bd492189e103c1220773d0162232e90b