ruby-opencv 0.0.11 → 0.0.12.pre

data/test/test_opencv.rb

@@ -9,14 +9,14 @@ include OpenCV
 class TestOpenCV < OpenCVTestCase
   def test_constants
     # OpenCV version
-    assert_equal('2.4.7', CV_VERSION)
+    assert_equal('2.4.8', CV_VERSION)
     assert_equal(2, CV_MAJOR_VERSION)
     assert_equal(4, CV_MINOR_VERSION)
-    assert_equal(7, CV_SUBMINOR_VERSION)
+    assert_equal(8, CV_SUBMINOR_VERSION)
 
     assert_equal(2, CV_VERSION_EPOCH)
     assert_equal(4, CV_VERSION_MAJOR)
-    assert_equal(7, CV_VERSION_MINOR)
+    assert_equal(8, CV_VERSION_MINOR)
     assert_equal(0, CV_VERSION_REVISION)
 
     # Depths
@@ -149,7 +149,9 @@ class TestOpenCV < OpenCVTestCase
     assert_equal(4, CV_FM_LMEDS)
 
     # Flags of window
+    assert_equal(0, CV_WINDOW_NORMAL)
     assert_equal(1, CV_WINDOW_AUTOSIZE)
+    assert_equal(4096, CV_WINDOW_OPENGL)
 
     # Object detection mode
     assert_equal(1, CV_HAAR_DO_CANNY_PRUNING)

data/yard_extension.rb

@@ -0,0 +1,5 @@
+require 'yard'
+
+YARD::Tags::Library.define_tag('OpenCV function', :opencv_func)
+YARD::Tags::Library.visible_tags.place(:opencv_func).before(:abstract)
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-opencv
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12.pre
 platform: ruby
 authors:
 - lsxi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2014-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -30,28 +30,28 @@ dependencies:
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hoe-gemspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
 description: ruby-opencv is a wrapper of OpenCV for Ruby. It helps you to write computer
   vision programs (e.g. detecting faces from pictures) with Ruby.
 email:
@@ -84,9 +84,9 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 - examples/facerec/readme.md
-- examples/matching_to_many_images/train/trainImages.txt
 files:
 - ".gitignore"
+- ".yardopts"
 - DEVELOPERS_NOTE.md
 - Gemfile
 - History.txt
@@ -122,12 +122,6 @@ files:
 - examples/inpaint.rb
 - examples/match_kdtree.rb
 - examples/match_template.rb
-- examples/matching_to_many_images/matching_to_many_images.rb
-- examples/matching_to_many_images/query.png
-- examples/matching_to_many_images/train/1.png
-- examples/matching_to_many_images/train/2.png
-- examples/matching_to_many_images/train/3.png
-- examples/matching_to_many_images/train/trainImages.txt
 - examples/paint.rb
 - examples/snake.rb
 - ext/opencv/algorithm.cpp
@@ -144,8 +138,6 @@ files:
 - ext/opencv/cvchain.h
 - ext/opencv/cvcircle32f.cpp
 - ext/opencv/cvcircle32f.h
-- ext/opencv/cvcondensation.cpp
-- ext/opencv/cvcondensation.h
 - ext/opencv/cvconnectedcomp.cpp
 - ext/opencv/cvconnectedcomp.h
 - ext/opencv/cvcontour.cpp
@@ -170,8 +162,6 @@ files:
 - ext/opencv/cvline.h
 - ext/opencv/cvmat.cpp
 - ext/opencv/cvmat.h
-- ext/opencv/cvmatnd.cpp
-- ext/opencv/cvmatnd.h
 - ext/opencv/cvmemstorage.cpp
 - ext/opencv/cvmemstorage.h
 - ext/opencv/cvmoments.cpp
@@ -194,8 +184,6 @@ files:
 - ext/opencv/cvsize2d32f.h
 - ext/opencv/cvslice.cpp
 - ext/opencv/cvslice.h
-- ext/opencv/cvsparsemat.cpp
-- ext/opencv/cvsparsemat.h
 - ext/opencv/cvsurfparams.cpp
 - ext/opencv/cvsurfparams.h
 - ext/opencv/cvsurfpoint.cpp
@@ -236,7 +224,6 @@ files:
 - images/CvMat_sobel.png
 - images/CvMat_sub_rect.png
 - images/CvSeq_relationmap.png
-- images/face_detect_from_lena.jpg
 - lib/opencv.rb
 - lib/opencv/psyched_yaml.rb
 - lib/opencv/version.rb
@@ -310,7 +297,6 @@ files:
 - test/test_cvmat_drawing.rb
 - test/test_cvmat_dxt.rb
 - test/test_cvmat_imageprocessing.rb
-- test/test_cvmat_matching.rb
 - test/test_cvmoments.rb
 - test/test_cvpoint.rb
 - test/test_cvpoint2d32f.rb
@@ -337,6 +323,7 @@ files:
 - test/test_preliminary.rb
 - test/test_trackbar.rb
 - test/test_window.rb
+- yard_extension.rb
 homepage: https://github.com/ruby-opencv/ruby-opencv/
 licenses:
 - The BSD License
@@ -354,12 +341,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: ruby-opencv
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: OpenCV wrapper for Ruby
@@ -400,7 +387,6 @@ test_files:
 - test/test_cvchain.rb
 - test/test_cvmat.rb
 - test/test_fisherfaces.rb
-- test/test_cvmat_matching.rb
 - test/test_cverror.rb
 - test/test_cvpoint.rb
 - test/test_cvsize2d32f.rb

data/examples/matching_to_many_images/matching_to_many_images.rb

@@ -1,16 +0,0 @@
-require 'opencv'
-require 'benchmark'
-include OpenCV
-
-data = File.dirname(__FILE__)
-
-query = CvMat.load File.join(data, 'query.png'), CV_LOAD_IMAGE_GRAYSCALE
-image_files = ['1.png', '2.png', '3.png'].map{|f| File.join(data, 'train', f)}
-images = image_files.map{|f| CvMat.load f, CV_LOAD_IMAGE_GRAYSCALE}
-
-
-matchs = query.match_descriptors(images)
-
-match_index, count = matchs.max_by {|image_index, count| count}
-
-puts "max match: #{image_files[match_index]}"

data/examples/matching_to_many_images/train/trainImages.txt

@@ -1,3 +0,0 @@
-1.png
-2.png
-3.png

data/ext/opencv/cvcondensation.cpp

@@ -1,282 +0,0 @@
-/************************************************************
-
-   cvcondensation.cpp -
-
-   $Author: lsxi $
-
-   Copyright (C) 2005-2006 Masakazu Yonekura
-
-************************************************************/
-#include "cvcondensation.h"
-/*
- * Document-class: OpenCV::CvConDensation
- *
- */
-__NAMESPACE_BEGIN_OPENCV
-__NAMESPACE_BEGIN_CVCONDENSATION
-
-VALUE rb_klass;
-
-VALUE
-rb_class()
-{
-  return rb_klass;
-}
-
-void
-define_ruby_class()
-{
-  if (rb_klass)
-    return;
-  /* 
-   * opencv = rb_define_module("OpenCV");
-   * 
-   * note: this comment is used by rdoc.
-   */
-  VALUE opencv = rb_module_opencv();
-  rb_klass = rb_define_class_under(opencv, "CvConDensation", rb_cObject);
-  rb_define_method(rb_klass, "dp", RUBY_METHOD_FUNC(rb_dp), 0);
-  rb_define_method(rb_klass, "mp", RUBY_METHOD_FUNC(rb_mp), 0);
-  rb_define_method(rb_klass, "dynamic_matrix", RUBY_METHOD_FUNC(rb_dynamic_matrix), 0);
-  rb_define_method(rb_klass, "confidence", RUBY_METHOD_FUNC(rb_confidence), 0);
-  rb_define_method(rb_klass, "cumulative", RUBY_METHOD_FUNC(rb_cumulative), 0);
-  rb_define_method(rb_klass, "state", RUBY_METHOD_FUNC(rb_state), 0);
-  rb_define_method(rb_klass, "samples_num", RUBY_METHOD_FUNC(rb_samples_num), 0);
-  rb_define_method(rb_klass, "init_sample_set", RUBY_METHOD_FUNC(rb_init_sample_set), 2);
-  rb_define_method(rb_klass, "update_by_time", RUBY_METHOD_FUNC(rb_update_by_time), 0);
-  rb_define_alias(rb_klass, "update", "update_by_time");
-  rb_define_method(rb_klass, "each_sample", RUBY_METHOD_FUNC(rb_each_sample), 0);
-  rb_define_method(rb_klass, "calculate_confidence", RUBY_METHOD_FUNC(rb_calculate_confidence), 0);
-}
-
-/*
- * call-seq:
- *   dp -> int
- *
- * Return dimension of state vector
- */
-VALUE
-rb_dp(VALUE self)
-{
-  return INT2NUM(CVCONDENSATION(self)->DP);
-}
-
-/*
- * call-seq:
- *   mp -> int
- *
- * Return demension of measurement vector.
- */
-VALUE
-rb_mp(VALUE self)
-{
-  return INT2NUM(CVCONDENSATION(self)->MP);
-}
-
-/*
- * call-seq:
- *   dynamic_matrix -> mat
- *
- * Return matrix of the linear Dynamics system.
- */
-VALUE
-rb_dynamic_matrix(VALUE self)
-{
-  CvConDensation *cd = CVCONDENSATION(self);
-  CvMat* mat = NULL;
-  try {
-    mat = cvInitMatHeader(ALLOC(CvMat), cd->DP, cd->DP, CV_MAKETYPE(CV_32F, 1), cd->DynamMatr);
-  }
-  catch (cv::Exception& e) {
-    raise_cverror(e);
-  }
-  return DEPEND_OBJECT(cCvMat::rb_class(), mat, self);
-}
-
-/*
- * call-seq:
- *   confidence -> mat
- *
- * Return confidence for each sample.
- */
-VALUE
-rb_confidence(VALUE self)
-{
-  CvConDensation *cd = CVCONDENSATION(self);
-  CvMat* mat = NULL;
-  try {
-    mat = cvInitMatHeader(ALLOC(CvMat), cd->SamplesNum, 1, CV_MAKETYPE(CV_32F, 1), cd->flConfidence);
-  }
-  catch (cv::Exception& e) {
-    raise_cverror(e);
-  }
-  return DEPEND_OBJECT(cCvMat::rb_class(), mat, self);
-}
-
-/*
- * call-seq:
- *   cumulative -> mat
- *
- * Return cumulative confidence.
- */
-VALUE
-rb_cumulative(VALUE self)
-{
-  CvConDensation *cd = CVCONDENSATION(self);
-  CvMat* mat = NULL;
-  try {
-    mat = cvInitMatHeader(ALLOC(CvMat), cd->SamplesNum, 1, CV_MAKETYPE(CV_32F, 1), cd->flCumulative);
-  }
-  catch (cv::Exception& e) {
-    raise_cverror(e);
-  }
-  return DEPEND_OBJECT(cCvMat::rb_class(), mat, self);
-}
-
-/*
- * call-seq:
- *   state -> mat
- *
- * Return vector of state
- */
-VALUE
-rb_state(VALUE self)
-{
-  CvConDensation *cd = CVCONDENSATION(self);
-  CvMat* mat = NULL;
-  try {
-    mat = cvInitMatHeader(ALLOC(CvMat), cd->DP, 1, CV_MAKETYPE(CV_32F, 1), cd->State);
-  }
-  catch (cv::Exception& e) {
-    raise_cverror(e);
-  }
-  return DEPEND_OBJECT(cCvMat::rb_class(), mat, self);  
-}
-
-/*
- * call-seq:
- *   samples_num -> int
- *
- * Return number of the samples
- */
-VALUE
-rb_samples_num(VALUE self)
-{
-  return INT2NUM(CVCONDENSATION(self)->SamplesNum);
-}
-
-/*
- * call-seq:
- *   init_sample_set(upper, lower)
- *
- * Initializes sample set for ConDensation algorithm.
- * Fills the samples with values within specified(lower to upper) ranges.
- */
-VALUE
-rb_init_sample_set(VALUE self, VALUE lower, VALUE upper)
-{
-  CvConDensation *cd = CVCONDENSATION(self);
-  CvMat *lower_bound = CVMAT_WITH_CHECK(lower), *upper_bound = CVMAT_WITH_CHECK(upper), lb_stub, ub_stub;
-  int lower_type = lower_bound->type, upper_type = lower_bound->type;
-  try {
-    if (lower_type != CV_32FC1 || lower_bound->cols != 1) {
-      if (CV_MAT_DEPTH(lower_type) == CV_32F) {
-	lower_bound = cvReshape(lower_bound, &lb_stub, 1, lower_bound->rows * lower_bound->cols);
-      }
-      else {
-	lower = cCvMat::new_object(cvSize(lower_bound->rows * lower_bound->cols, 1), CV_MAKETYPE(CV_32S, 1));
-	cvConvertScale(lower_bound, CVARR(lower));
-	lower_bound = CVMAT(lower);      
-      }
-    }
-    if (upper_type != CV_32FC1 || upper_bound->cols != 1) {
-      if (CV_MAT_DEPTH(upper_type) == CV_32F) {
-	upper_bound = cvReshape(upper_bound, &ub_stub, 1, upper_bound->rows * upper_bound->cols);
-      }
-      else {
-	upper = cCvMat::new_object(cvSize(upper_bound->rows * upper_bound->cols, 1), CV_MAKETYPE(CV_32F, 1));
-	cvConvertScale(upper_bound, CVARR(upper));
-	upper_bound = CVMAT(upper);      
-      }
-    }
-    if (lower_bound->rows != cd->DP || upper_bound->rows != cd->DP) {
-      rb_raise(rb_eTypeError, "sample matrix step unmatch.");
-    }
-    cvConDensInitSampleSet(cd, lower_bound, upper_bound);
-  }
-  catch (cv::Exception& e) {
-    raise_cverror(e);
-  }
-  return self;
-}
-
-/*
- * call-seq:
- *   update_by_time
- *
- * Estimates subsequent model state.
- */
-VALUE
-rb_update_by_time(VALUE self)
-{
-  try {
-    cvConDensUpdateByTime(CVCONDENSATION(self));
-  }
-  catch (cv::Exception& e) {
-    raise_cverror(e);
-  }
-  return self;
-}
-
-/*
- * call-seq:
- *   each_sample {|mat| ... }
- *
- * Evaluate each sample by given block.
- */
-VALUE
-rb_each_sample(VALUE self)
-{
-  CvConDensation *cd = CVCONDENSATION(self);
-  if (rb_block_given_p()) {
-    try {
-      for (int i = 0; i < cd->SamplesNum; ++i) {
-	CvMat* mat = cvInitMatHeader(ALLOC(CvMat), cd->DP, 1, CV_MAKETYPE(CV_32F, 1), cd->flSamples[i]);
-	rb_yield(DEPEND_OBJECT(cCvMat::rb_class(), mat, self));
-      }
-    }
-    catch (cv::Exception& e) {
-      raise_cverror(e);
-    }
-  }
-  return self;
-}
-
-/*
- * call-seq:
- *   calculate_confidence {|value| ... }
- *
- * Evalute each sample by given block, then return value set to confidence.
- */
-VALUE
-rb_calculate_confidence(VALUE self)
-{
-  VALUE value;
-  CvConDensation *cd = CVCONDENSATION(self);
-  if (rb_block_given_p()) {
-    try {
-      for (int i = 0; i < cd->SamplesNum; ++i) {
-	CvMat* mat = cvInitMatHeader(ALLOC(CvMat), cd->DP, 1, CV_MAKETYPE(CV_32F, 1), cd->flSamples[i]);
-	value = rb_yield(DEPEND_OBJECT(cCvMat::rb_class(), mat, self));
-	cd->flConfidence[i] = NUM2DBL(value);
-      }
-    }
-    catch (cv::Exception& e) {
-      raise_cverror(e);
-    }
-  }
-  return self;
-}
-
-__NAMESPACE_END_CVCONDENSATION
-__NAMESPACE_END_OPENCV