diff --git a/Manifest.txt b/Manifest.txt index 61c8ef8..c3fbb19 100644 --- a/Manifest.txt +++ b/Manifest.txt @@ -34,12 +34,6 @@ examples/images/tiffany.jpg 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 @@ -56,8 +50,6 @@ ext/opencv/cvchain.cpp 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 @@ -82,8 +74,6 @@ ext/opencv/cvline.cpp 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 @@ -106,8 +96,6 @@ ext/opencv/cvsize2d32f.cpp 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 @@ -221,7 +209,6 @@ test/test_cvmat.rb 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 diff --git a/examples/matching_to_many_images/matching_to_many_images.rb b/examples/matching_to_many_images/matching_to_many_images.rb deleted file mode 100644 index 72d0a1c..0000000 --- a/examples/matching_to_many_images/matching_to_many_images.rb +++ /dev/null @@ -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]}" diff --git a/examples/matching_to_many_images/query.png b/examples/matching_to_many_images/query.png deleted file mode 100755 index 9aa1199..0000000 Binary files a/examples/matching_to_many_images/query.png and /dev/null differ diff --git a/examples/matching_to_many_images/train/1.png b/examples/matching_to_many_images/train/1.png deleted file mode 100755 index c52e19e..0000000 Binary files a/examples/matching_to_many_images/train/1.png and /dev/null differ diff --git a/examples/matching_to_many_images/train/2.png b/examples/matching_to_many_images/train/2.png deleted file mode 100755 index 7b1189c..0000000 Binary files a/examples/matching_to_many_images/train/2.png and /dev/null differ diff --git a/examples/matching_to_many_images/train/3.png b/examples/matching_to_many_images/train/3.png deleted file mode 100755 index dc2389a..0000000 Binary files a/examples/matching_to_many_images/train/3.png and /dev/null differ diff --git a/examples/matching_to_many_images/train/trainImages.txt b/examples/matching_to_many_images/train/trainImages.txt deleted file mode 100755 index b376639..0000000 --- a/examples/matching_to_many_images/train/trainImages.txt +++ /dev/null @@ -1,3 +0,0 @@ -1.png -2.png -3.png diff --git a/ext/opencv/cvcondensation.cpp b/ext/opencv/cvcondensation.cpp deleted file mode 100644 index 460b951..0000000 --- a/ext/opencv/cvcondensation.cpp +++ /dev/null @@ -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 -init_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 diff --git a/ext/opencv/cvcondensation.h b/ext/opencv/cvcondensation.h deleted file mode 100644 index 745980d..0000000 --- a/ext/opencv/cvcondensation.h +++ /dev/null @@ -1,49 +0,0 @@ -/************************************************************ - - cvcondensation.h - - - $Author: lsxi $ - - Copyright (C) 2005-2006 Masakazu Yonekura - -************************************************************/ -#ifndef RUBY_OPENCV_CVCONDENSATION_H -#define RUBY_OPENCV_CVCONDENSATION_H - -#include "opencv.h" - -#define __NAMESPACE_BEGIN_CVCONDENSATION namespace cCvConDensation { -#define __NAMESPACE_END_CVCONDENSATION } - -__NAMESPACE_BEGIN_OPENCV -__NAMESPACE_BEGIN_CVCONDENSATION - -VALUE rb_class(); -void init_ruby_class(); - -VALUE rb_dp(VALUE self); -VALUE rb_mp(VALUE self); -VALUE rb_dynamic_matrix(VALUE self); -VALUE rb_state(VALUE self); -VALUE rb_confidence(VALUE self); -VALUE rb_cumulative(VALUE self); -VALUE rb_samples_num(VALUE self); - -VALUE rb_init_sample_set(VALUE self, VALUE lower, VALUE upper); -VALUE rb_update_by_time(VALUE self); -VALUE rb_each_sample(VALUE self); -VALUE rb_calculate_confidence(VALUE self); - -__NAMESPACE_END_CVCONDENSATION - -inline CvConDensation* -CVCONDENSATION(VALUE object) -{ - CvConDensation *ptr; - Data_Get_Struct(object, CvConDensation, ptr); - return ptr; -} - -__NAMESPACE_END_OPENCV - -#endif // RUBY_OPENCV_CVCONDENSATION_H diff --git a/ext/opencv/cvmat.cpp b/ext/opencv/cvmat.cpp index de9c664..b8c7e40 100644 --- a/ext/opencv/cvmat.cpp +++ b/ext/opencv/cvmat.cpp @@ -5224,96 +5224,6 @@ rb_match_shapes(int argc, VALUE *argv, VALUE self) return rb_float_new(result); } - -/** - * Port from OpenCV sample: matching_to_many_images.cpp - * call-seq: - * match_descriptors(images[, detector_type="SURF"][, descriptor_type="SURF"][, matcher_type="FlannBased"]) -> Hash - * - * Matching descriptors detected on one image to descriptors detected in image array. - * Returns a Hash contains match count of each image index. - * For example, a Hash {0 => 5, 2 => 10} means the images[0] has 5 key points matched, images[2] has 10 key points matched, - * and all of other images in the images array have no key point matched. - * Hence images[2] is the best match in general. - * - * images is an array of CvMat objects. - * detector_type is a string, default is "SURF", options: "SURF", "FAST", "SIFT", "STAR" - * descriptor_type is a string, default is "SURF", options: "SURF", "SIFT", "BRIEF" - * matcher_type is a string, default is "FlannBased", options: "FlannBased", "BruteForce" - */ -VALUE -rb_match_descriptors(int argc, VALUE *argv, VALUE self) -{ - VALUE images, detector_type, descriptor_type, matcher_type; - rb_scan_args(argc, argv, "13", &images, &detector_type, &descriptor_type, &matcher_type); - if (RARRAY_LEN(images) == 0) { - return rb_hash_new(); - } - if (NIL_P(detector_type)) { - detector_type = rb_str_new2("SURF"); - } - if (NIL_P(descriptor_type)) { - descriptor_type = rb_str_new2("SURF"); - } - if (NIL_P(matcher_type)) { - matcher_type = rb_str_new2("FlannBased"); - } - - VALUE _matches = rb_hash_new(); - try { - cv::Mat queryImage(CVMAT(self)); - std::vector trainImages; - for(int i = 0, n = RARRAY_LEN(images); i < n; i++) { - trainImages.push_back(CVMAT_WITH_CHECK(RARRAY_PTR(images)[i])); - } - - cv::Ptr featureDetector = cv::FeatureDetector::create(StringValueCStr(detector_type)); - if (featureDetector.empty()) { - rb_raise(rb_eArgError, "Could not create feature detector by given detector type: %s", StringValueCStr(detector_type)); - } - cv::Ptr descriptorExtractor = cv::DescriptorExtractor::create(StringValueCStr(descriptor_type)); - if (descriptorExtractor.empty()) { - rb_raise(rb_eArgError, "Could not create descriptor extractor by given descriptor type: %s", StringValueCStr(descriptor_type)); - } - cv::Ptr descriptorMatcher; - try { - descriptorMatcher = cv::DescriptorMatcher::create(StringValueCStr(matcher_type)); - } - catch(cv::Exception& e) { - rb_raise(rb_eArgError, "Could not create descriptor matcher by given matcher type: %s", StringValueCStr(matcher_type)); - } - - std::vector queryKeypoints; - std::vector > trainKeypoints; - featureDetector->detect(queryImage, queryKeypoints); - featureDetector->detect(trainImages, trainKeypoints); - cv::Mat queryDescriptors; - std::vector trainDescriptors; - descriptorExtractor->compute(queryImage, queryKeypoints, queryDescriptors); - descriptorExtractor->compute(trainImages, trainKeypoints, trainDescriptors); - std::vector matches; - descriptorMatcher->add(trainDescriptors); - descriptorMatcher->train(); - descriptorMatcher->match(queryDescriptors, matches); - - for (size_t i = 0, n = matches.size(); i < n; i++) { - VALUE match = INT2FIX(matches[i].imgIdx); - VALUE count = rb_hash_lookup(_matches, match); - if (NIL_P(count)) { - count = INT2FIX(1); - } else { - count = INT2FIX(FIX2INT(count) + 1); - } - rb_hash_aset(_matches, match, count); - } - } - catch (cv::Exception& e) { - raise_cverror(e); - } - - return _matches; -} - /* * call-seq: * mean_shift(window, criteria) -> comp @@ -6099,7 +6009,6 @@ init_ruby_class() rb_define_method(rb_klass, "apply_color_map", RUBY_METHOD_FUNC(rb_apply_color_map), 1); rb_define_method(rb_klass, "match_template", RUBY_METHOD_FUNC(rb_match_template), -1); rb_define_method(rb_klass, "match_shapes", RUBY_METHOD_FUNC(rb_match_shapes), -1); - rb_define_method(rb_klass, "match_descriptors", RUBY_METHOD_FUNC(rb_match_descriptors), -1); rb_define_method(rb_klass, "mean_shift", RUBY_METHOD_FUNC(rb_mean_shift), 2); rb_define_method(rb_klass, "cam_shift", RUBY_METHOD_FUNC(rb_cam_shift), 2); diff --git a/ext/opencv/cvmat.h b/ext/opencv/cvmat.h index 7c2926e..2046040 100644 --- a/ext/opencv/cvmat.h +++ b/ext/opencv/cvmat.h @@ -221,7 +221,6 @@ VALUE rb_apply_color_map(VALUE self, VALUE colormap); /* Matching*/ VALUE rb_match_template(int argc, VALUE *argv, VALUE self); VALUE rb_match_shapes(int argc, VALUE *argv, VALUE self); -VALUE rb_match_descriptors(int argc, VALUE *argv, VALUE self); /* Object Tracking */ VALUE rb_mean_shift(VALUE self, VALUE window, VALUE criteria); diff --git a/ext/opencv/cvmatnd.cpp b/ext/opencv/cvmatnd.cpp deleted file mode 100644 index 07fc125..0000000 --- a/ext/opencv/cvmatnd.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/*********************************************************** - - cvmatnd.cpp - - - $Author: lsxi $ - - Copyright (C) 2007 Masakazu Yonekura - -************************************************************/ -#include "cvmatnd.h" -/* - * Document-class: OpenCV::CvMatND - * - */ -__NAMESPACE_BEGIN_OPENCV -__NAMESPACE_BEGIN_CVMATND - -VALUE rb_klass; - -VALUE -rb_class() -{ - return rb_klass; -} - -void -init_ruby_class() -{ - if (rb_klass) - return; - /* - * opencv = rb_define_module("OpenCV"); - * cvmat = rb_define_class_under(opencv, "CvMat", rb_cObject); - * - * note: this comment is used by rdoc. - */ - VALUE opencv = rb_module_opencv(), cvmat = cCvMat::rb_class(); - - rb_klass = rb_define_class_under(opencv, "CvMatND", cvmat); -} - -__NAMESPACE_END_CVMATND -__NAMESPACE_END_OPENCV - diff --git a/ext/opencv/cvmatnd.h b/ext/opencv/cvmatnd.h deleted file mode 100644 index d9647c6..0000000 --- a/ext/opencv/cvmatnd.h +++ /dev/null @@ -1,28 +0,0 @@ -/************************************************************ - - cvmatnd.h - - - $Author: lsxi $ - - Copyright (C) 2007 Masakazu Yonekura - -************************************************************/ -#ifndef RUBY_OPENCV_CVMATND_H -#define RUBY_OPENCV_CVMATND_H - -#include "opencv.h" - -#define __NAMESPACE_BEGIN_CVMATND namespace cCvMatND { -#define __NAMESPACE_END_CVMATND } - -__NAMESPACE_BEGIN_OPENCV -__NAMESPACE_BEGIN_CVMATND - -VALUE rb_class(); - -void init_ruby_class(); - -__NAMESPACE_END_CVMATND -__NAMESPACE_END_OPENCV - -#endif // RUBY_OPENCV_CVMATND_H diff --git a/ext/opencv/cvsparsemat.cpp b/ext/opencv/cvsparsemat.cpp deleted file mode 100644 index 4b0fb94..0000000 --- a/ext/opencv/cvsparsemat.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/*********************************************************** - - cvsparse.cpp - - - $Author: lsxi $ - - Copyright (C) 2007 Masakazu Yonekura - -************************************************************/ -#include "cvsparsemat.h" -/* - * Document-class: OpenCV::CvSparseMat - * - */ -__NAMESPACE_BEGIN_OPENCV -__NAMESPACE_BEGIN_CVSPARSEMAT - -VALUE rb_klass; - -VALUE -rb_class() -{ - return rb_klass; -} - -void -init_ruby_class() -{ - if (rb_klass) - return; - /* - * opencv = rb_define_module("OpenCV"); - * cvmat = rb_define_class_under(opencv, "CvMat", rb_cObject); - * - * note: this comment is used by rdoc. - */ - VALUE opencv = rb_module_opencv(), cvmat = cCvMat::rb_class(); - - rb_klass = rb_define_class_under(opencv, "CvSparseMat", cvmat); -} - -__NAMESPACE_END_CVSPARSEMAT -__NAMESPACE_END_OPENCV - diff --git a/ext/opencv/cvsparsemat.h b/ext/opencv/cvsparsemat.h deleted file mode 100644 index 71559ae..0000000 --- a/ext/opencv/cvsparsemat.h +++ /dev/null @@ -1,28 +0,0 @@ -/************************************************************ - - cvsparsemat.h - - - $Author: lsxi $ - - Copyright (C) 2005-2006 Masakazu Yonekura - -************************************************************/ -#ifndef RUBY_OPENCV_CVSPARSEMAT_H -#define RUBY_OPENCV_CVSPARSEMAT_H - -#include "opencv.h" - -#define __NAMESPACE_BEGIN_CVSPARSEMAT namespace cCvSparseMat { -#define __NAMESPACE_END_CVSPARSEMAT } - -__NAMESPACE_BEGIN_OPENCV -__NAMESPACE_BEGIN_CVSPARSEMAT - -VALUE rb_class(); - -void init_ruby_class(); - -__NAMESPACE_END_CVSPARSEMAT -__NAMESPACE_END_OPENCV - -#endif // RUBY_OPENCV_CVSPARSEMAT_H diff --git a/ext/opencv/opencv.cpp b/ext/opencv/opencv.cpp index 9e2ddd2..a6ed86c 100644 --- a/ext/opencv/opencv.cpp +++ b/ext/opencv/opencv.cpp @@ -738,8 +738,6 @@ extern "C" { mOpenCV::cCvMat::init_ruby_class(); mOpenCV::cIplImage::init_ruby_class(); - mOpenCV::cCvMatND::init_ruby_class(); - mOpenCV::cCvSparseMat::init_ruby_class(); mOpenCV::cCvHistogram::init_ruby_class(); mOpenCV::cCvCapture::init_ruby_class(); mOpenCV::cCvVideoWriter::init_ruby_class(); @@ -748,7 +746,6 @@ extern "C" { mOpenCV::cCvTwoPoints::init_ruby_class(); mOpenCV::cCvCircle32f::init_ruby_class(); - mOpenCV::cCvConDensation::init_ruby_class(); mOpenCV::cCvFeatureTree::init_ruby_class(); mOpenCV::cCvConnectedComp::init_ruby_class(); diff --git a/ext/opencv/opencv.h b/ext/opencv/opencv.h index 7d67c66..7582687 100644 --- a/ext/opencv/opencv.h +++ b/ext/opencv/opencv.h @@ -109,8 +109,6 @@ extern "C" { #include "cvmat.h" #include "iplimage.h" -#include "cvmatnd.h" -#include "cvsparsemat.h" #include "cvhistogram.h" #include "cvcapture.h" #include "cvvideowriter.h" @@ -119,8 +117,6 @@ extern "C" { #include "cvtwopoints.h" #include "cvcircle32f.h" -#include "cvcondensation.h" - #include "cvconnectedcomp.h" #include "cvavgcomp.h" #include "cvhaarclassifiercascade.h" diff --git a/ruby-opencv.gemspec b/ruby-opencv.gemspec index d9a6677..7a12dbd 100644 --- a/ruby-opencv.gemspec +++ b/ruby-opencv.gemspec @@ -1,10 +1,10 @@ # -*- encoding: utf-8 -*- -# stub: ruby-opencv 0.0.11.20140118200758 ruby lib +# stub: ruby-opencv 0.0.11.20140118202856 ruby lib # stub: ext/opencv/extconf.rb Gem::Specification.new do |s| s.name = "ruby-opencv" - s.version = "0.0.11.20140118200758" + s.version = "0.0.11.20140118202856" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.require_paths = ["lib"] @@ -13,15 +13,15 @@ Gem::Specification.new do |s| s.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." s.email = ["masakazu.yonekura@gmail.com", "azariahsawtikes@gmail.com", "pcting@gmail.com"] s.extensions = ["ext/opencv/extconf.rb"] - s.extra_rdoc_files = ["DEVELOPERS_NOTE.md", "History.txt", "License.txt", "Manifest.txt", "README.md", "examples/facerec/readme.md", "examples/matching_to_many_images/train/trainImages.txt"] - s.files = [".gitignore", "DEVELOPERS_NOTE.md", "Gemfile", "History.txt", "License.txt", "Manifest.txt", "README.md", "Rakefile", "config.yml", "examples/alpha_blend.rb", "examples/contours/bitmap-contours-with-labels.png", "examples/contours/bitmap-contours.png", "examples/contours/bounding-box-detect-canny.rb", "examples/contours/contour_retrieval_modes.rb", "examples/contours/rotated-boxes.jpg", "examples/convexhull.rb", "examples/face_detect.rb", "examples/facerec/create_csv.rb", "examples/facerec/facerec_eigenfaces.rb", "examples/facerec/facerec_fisherfaces.rb", "examples/facerec/facerec_lbph.rb", "examples/facerec/readme.md", "examples/find_obj.rb", "examples/houghcircle.rb", "examples/images/box.png", "examples/images/box_in_scene.png", "examples/images/inpaint.png", "examples/images/lena-256x256.jpg", "examples/images/lena-eyes.jpg", "examples/images/lenna-rotated.jpg", "examples/images/lenna.jpg", "examples/images/stuff.jpg", "examples/images/tiffany.jpg", "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", "ext/opencv/algorithm.h", "ext/opencv/curve.cpp", "ext/opencv/curve.h", "ext/opencv/cvavgcomp.cpp", "ext/opencv/cvavgcomp.h", "ext/opencv/cvbox2d.cpp", "ext/opencv/cvbox2d.h", "ext/opencv/cvcapture.cpp", "ext/opencv/cvcapture.h", "ext/opencv/cvchain.cpp", "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", "ext/opencv/cvcontour.h", "ext/opencv/cvcontourtree.cpp", "ext/opencv/cvcontourtree.h", "ext/opencv/cvconvexitydefect.cpp", "ext/opencv/cvconvexitydefect.h", "ext/opencv/cverror.cpp", "ext/opencv/cverror.h", "ext/opencv/cvfeaturetree.cpp", "ext/opencv/cvfeaturetree.h", "ext/opencv/cvfont.cpp", "ext/opencv/cvfont.h", "ext/opencv/cvhaarclassifiercascade.cpp", "ext/opencv/cvhaarclassifiercascade.h", "ext/opencv/cvhistogram.cpp", "ext/opencv/cvhistogram.h", "ext/opencv/cvhumoments.cpp", "ext/opencv/cvhumoments.h", "ext/opencv/cvline.cpp", "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", "ext/opencv/cvmoments.h", "ext/opencv/cvpoint.cpp", "ext/opencv/cvpoint.h", "ext/opencv/cvpoint2d32f.cpp", "ext/opencv/cvpoint2d32f.h", "ext/opencv/cvpoint3d32f.cpp", "ext/opencv/cvpoint3d32f.h", "ext/opencv/cvrect.cpp", "ext/opencv/cvrect.h", "ext/opencv/cvscalar.cpp", "ext/opencv/cvscalar.h", "ext/opencv/cvseq.cpp", "ext/opencv/cvseq.h", "ext/opencv/cvsize.cpp", "ext/opencv/cvsize.h", "ext/opencv/cvsize2d32f.cpp", "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", "ext/opencv/cvsurfpoint.h", "ext/opencv/cvtermcriteria.cpp", "ext/opencv/cvtermcriteria.h", "ext/opencv/cvtwopoints.cpp", "ext/opencv/cvtwopoints.h", "ext/opencv/cvutils.cpp", "ext/opencv/cvutils.h", "ext/opencv/cvvideowriter.cpp", "ext/opencv/cvvideowriter.h", "ext/opencv/eigenfaces.cpp", "ext/opencv/eigenfaces.h", "ext/opencv/extconf.rb", "ext/opencv/facerecognizer.cpp", "ext/opencv/facerecognizer.h", "ext/opencv/fisherfaces.cpp", "ext/opencv/fisherfaces.h", "ext/opencv/gui.cpp", "ext/opencv/gui.h", "ext/opencv/iplconvkernel.cpp", "ext/opencv/iplconvkernel.h", "ext/opencv/iplimage.cpp", "ext/opencv/iplimage.h", "ext/opencv/lbph.cpp", "ext/opencv/lbph.h", "ext/opencv/mouseevent.cpp", "ext/opencv/mouseevent.h", "ext/opencv/opencv.cpp", "ext/opencv/opencv.h", "ext/opencv/pointset.cpp", "ext/opencv/pointset.h", "ext/opencv/trackbar.cpp", "ext/opencv/trackbar.h", "ext/opencv/window.cpp", "ext/opencv/window.h", "images/CvMat_sobel.png", "images/CvMat_sub_rect.png", "images/CvSeq_relationmap.png", "lib/opencv.rb", "lib/opencv/psyched_yaml.rb", "lib/opencv/version.rb", "ruby-opencv.gemspec", "test/eigenfaces_save.xml", "test/fisherfaces_save.xml", "test/helper.rb", "test/lbph_save.xml", "test/runner.rb", "test/samples/airplane.jpg", "test/samples/baboon.jpg", "test/samples/baboon200.jpg", "test/samples/baboon200_rotated.jpg", "test/samples/blank0.jpg", "test/samples/blank1.jpg", "test/samples/blank2.jpg", "test/samples/blank3.jpg", "test/samples/blank4.jpg", "test/samples/blank5.jpg", "test/samples/blank6.jpg", "test/samples/blank7.jpg", "test/samples/blank8.jpg", "test/samples/blank9.jpg", "test/samples/cat.jpg", "test/samples/chessboard.jpg", "test/samples/contours.jpg", "test/samples/fruits.jpg", "test/samples/haarcascade_frontalface_alt.xml.gz", "test/samples/inpaint-mask.bmp", "test/samples/lena-256x256.jpg", "test/samples/lena-32x32.jpg", "test/samples/lena-eyes.jpg", "test/samples/lena-inpaint.jpg", "test/samples/lena.jpg", "test/samples/lines.jpg", "test/samples/messy0.jpg", "test/samples/messy1.jpg", "test/samples/movie_sample.avi", "test/samples/one_way_train_0000.jpg", "test/samples/one_way_train_0001.jpg", "test/samples/partially_blank0.jpg", "test/samples/partially_blank1.jpg", "test/samples/smooth0.jpg", "test/samples/smooth1.jpg", "test/samples/smooth2.jpg", "test/samples/smooth3.jpg", "test/samples/smooth4.jpg", "test/samples/smooth5.jpg", "test/samples/smooth6.jpg", "test/samples/str-cv-rotated.jpg", "test/samples/str-cv.jpg", "test/samples/str-ov.jpg", "test/samples/stuff.jpg", "test/test_curve.rb", "test/test_cvavgcomp.rb", "test/test_cvbox2d.rb", "test/test_cvcapture.rb", "test/test_cvchain.rb", "test/test_cvcircle32f.rb", "test/test_cvconnectedcomp.rb", "test/test_cvcontour.rb", "test/test_cvcontourtree.rb", "test/test_cverror.rb", "test/test_cvfeaturetree.rb", "test/test_cvfont.rb", "test/test_cvhaarclassifiercascade.rb", "test/test_cvhistogram.rb", "test/test_cvhumoments.rb", "test/test_cvline.rb", "test/test_cvmat.rb", "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", "test/test_cvpoint3d32f.rb", "test/test_cvrect.rb", "test/test_cvscalar.rb", "test/test_cvseq.rb", "test/test_cvsize.rb", "test/test_cvsize2d32f.rb", "test/test_cvslice.rb", "test/test_cvsurfparams.rb", "test/test_cvsurfpoint.rb", "test/test_cvtermcriteria.rb", "test/test_cvtwopoints.rb", "test/test_cvvideowriter.rb", "test/test_eigenfaces.rb", "test/test_fisherfaces.rb", "test/test_iplconvkernel.rb", "test/test_iplimage.rb", "test/test_lbph.rb", "test/test_mouseevent.rb", "test/test_opencv.rb", "test/test_pointset.rb", "test/test_preliminary.rb", "test/test_trackbar.rb", "test/test_window.rb", "yard_extension.rb"] + s.extra_rdoc_files = ["DEVELOPERS_NOTE.md", "History.txt", "License.txt", "Manifest.txt", "README.md", "examples/facerec/readme.md"] + s.files = [".gitignore", "DEVELOPERS_NOTE.md", "Gemfile", "History.txt", "License.txt", "Manifest.txt", "README.md", "Rakefile", "config.yml", "examples/alpha_blend.rb", "examples/contours/bitmap-contours-with-labels.png", "examples/contours/bitmap-contours.png", "examples/contours/bounding-box-detect-canny.rb", "examples/contours/contour_retrieval_modes.rb", "examples/contours/rotated-boxes.jpg", "examples/convexhull.rb", "examples/face_detect.rb", "examples/facerec/create_csv.rb", "examples/facerec/facerec_eigenfaces.rb", "examples/facerec/facerec_fisherfaces.rb", "examples/facerec/facerec_lbph.rb", "examples/facerec/readme.md", "examples/find_obj.rb", "examples/houghcircle.rb", "examples/images/box.png", "examples/images/box_in_scene.png", "examples/images/inpaint.png", "examples/images/lena-256x256.jpg", "examples/images/lena-eyes.jpg", "examples/images/lenna-rotated.jpg", "examples/images/lenna.jpg", "examples/images/stuff.jpg", "examples/images/tiffany.jpg", "examples/inpaint.rb", "examples/match_kdtree.rb", "examples/match_template.rb", "examples/paint.rb", "examples/snake.rb", "ext/opencv/algorithm.cpp", "ext/opencv/algorithm.h", "ext/opencv/curve.cpp", "ext/opencv/curve.h", "ext/opencv/cvavgcomp.cpp", "ext/opencv/cvavgcomp.h", "ext/opencv/cvbox2d.cpp", "ext/opencv/cvbox2d.h", "ext/opencv/cvcapture.cpp", "ext/opencv/cvcapture.h", "ext/opencv/cvchain.cpp", "ext/opencv/cvchain.h", "ext/opencv/cvcircle32f.cpp", "ext/opencv/cvcircle32f.h", "ext/opencv/cvconnectedcomp.cpp", "ext/opencv/cvconnectedcomp.h", "ext/opencv/cvcontour.cpp", "ext/opencv/cvcontour.h", "ext/opencv/cvcontourtree.cpp", "ext/opencv/cvcontourtree.h", "ext/opencv/cvconvexitydefect.cpp", "ext/opencv/cvconvexitydefect.h", "ext/opencv/cverror.cpp", "ext/opencv/cverror.h", "ext/opencv/cvfeaturetree.cpp", "ext/opencv/cvfeaturetree.h", "ext/opencv/cvfont.cpp", "ext/opencv/cvfont.h", "ext/opencv/cvhaarclassifiercascade.cpp", "ext/opencv/cvhaarclassifiercascade.h", "ext/opencv/cvhistogram.cpp", "ext/opencv/cvhistogram.h", "ext/opencv/cvhumoments.cpp", "ext/opencv/cvhumoments.h", "ext/opencv/cvline.cpp", "ext/opencv/cvline.h", "ext/opencv/cvmat.cpp", "ext/opencv/cvmat.h", "ext/opencv/cvmemstorage.cpp", "ext/opencv/cvmemstorage.h", "ext/opencv/cvmoments.cpp", "ext/opencv/cvmoments.h", "ext/opencv/cvpoint.cpp", "ext/opencv/cvpoint.h", "ext/opencv/cvpoint2d32f.cpp", "ext/opencv/cvpoint2d32f.h", "ext/opencv/cvpoint3d32f.cpp", "ext/opencv/cvpoint3d32f.h", "ext/opencv/cvrect.cpp", "ext/opencv/cvrect.h", "ext/opencv/cvscalar.cpp", "ext/opencv/cvscalar.h", "ext/opencv/cvseq.cpp", "ext/opencv/cvseq.h", "ext/opencv/cvsize.cpp", "ext/opencv/cvsize.h", "ext/opencv/cvsize2d32f.cpp", "ext/opencv/cvsize2d32f.h", "ext/opencv/cvslice.cpp", "ext/opencv/cvslice.h", "ext/opencv/cvsurfparams.cpp", "ext/opencv/cvsurfparams.h", "ext/opencv/cvsurfpoint.cpp", "ext/opencv/cvsurfpoint.h", "ext/opencv/cvtermcriteria.cpp", "ext/opencv/cvtermcriteria.h", "ext/opencv/cvtwopoints.cpp", "ext/opencv/cvtwopoints.h", "ext/opencv/cvutils.cpp", "ext/opencv/cvutils.h", "ext/opencv/cvvideowriter.cpp", "ext/opencv/cvvideowriter.h", "ext/opencv/eigenfaces.cpp", "ext/opencv/eigenfaces.h", "ext/opencv/extconf.rb", "ext/opencv/facerecognizer.cpp", "ext/opencv/facerecognizer.h", "ext/opencv/fisherfaces.cpp", "ext/opencv/fisherfaces.h", "ext/opencv/gui.cpp", "ext/opencv/gui.h", "ext/opencv/iplconvkernel.cpp", "ext/opencv/iplconvkernel.h", "ext/opencv/iplimage.cpp", "ext/opencv/iplimage.h", "ext/opencv/lbph.cpp", "ext/opencv/lbph.h", "ext/opencv/mouseevent.cpp", "ext/opencv/mouseevent.h", "ext/opencv/opencv.cpp", "ext/opencv/opencv.h", "ext/opencv/pointset.cpp", "ext/opencv/pointset.h", "ext/opencv/trackbar.cpp", "ext/opencv/trackbar.h", "ext/opencv/window.cpp", "ext/opencv/window.h", "images/CvMat_sobel.png", "images/CvMat_sub_rect.png", "images/CvSeq_relationmap.png", "lib/opencv.rb", "lib/opencv/psyched_yaml.rb", "lib/opencv/version.rb", "ruby-opencv.gemspec", "test/eigenfaces_save.xml", "test/fisherfaces_save.xml", "test/helper.rb", "test/lbph_save.xml", "test/runner.rb", "test/samples/airplane.jpg", "test/samples/baboon.jpg", "test/samples/baboon200.jpg", "test/samples/baboon200_rotated.jpg", "test/samples/blank0.jpg", "test/samples/blank1.jpg", "test/samples/blank2.jpg", "test/samples/blank3.jpg", "test/samples/blank4.jpg", "test/samples/blank5.jpg", "test/samples/blank6.jpg", "test/samples/blank7.jpg", "test/samples/blank8.jpg", "test/samples/blank9.jpg", "test/samples/cat.jpg", "test/samples/chessboard.jpg", "test/samples/contours.jpg", "test/samples/fruits.jpg", "test/samples/haarcascade_frontalface_alt.xml.gz", "test/samples/inpaint-mask.bmp", "test/samples/lena-256x256.jpg", "test/samples/lena-32x32.jpg", "test/samples/lena-eyes.jpg", "test/samples/lena-inpaint.jpg", "test/samples/lena.jpg", "test/samples/lines.jpg", "test/samples/messy0.jpg", "test/samples/messy1.jpg", "test/samples/movie_sample.avi", "test/samples/one_way_train_0000.jpg", "test/samples/one_way_train_0001.jpg", "test/samples/partially_blank0.jpg", "test/samples/partially_blank1.jpg", "test/samples/smooth0.jpg", "test/samples/smooth1.jpg", "test/samples/smooth2.jpg", "test/samples/smooth3.jpg", "test/samples/smooth4.jpg", "test/samples/smooth5.jpg", "test/samples/smooth6.jpg", "test/samples/str-cv-rotated.jpg", "test/samples/str-cv.jpg", "test/samples/str-ov.jpg", "test/samples/stuff.jpg", "test/test_curve.rb", "test/test_cvavgcomp.rb", "test/test_cvbox2d.rb", "test/test_cvcapture.rb", "test/test_cvchain.rb", "test/test_cvcircle32f.rb", "test/test_cvconnectedcomp.rb", "test/test_cvcontour.rb", "test/test_cvcontourtree.rb", "test/test_cverror.rb", "test/test_cvfeaturetree.rb", "test/test_cvfont.rb", "test/test_cvhaarclassifiercascade.rb", "test/test_cvhistogram.rb", "test/test_cvhumoments.rb", "test/test_cvline.rb", "test/test_cvmat.rb", "test/test_cvmat_drawing.rb", "test/test_cvmat_dxt.rb", "test/test_cvmat_imageprocessing.rb", "test/test_cvmoments.rb", "test/test_cvpoint.rb", "test/test_cvpoint2d32f.rb", "test/test_cvpoint3d32f.rb", "test/test_cvrect.rb", "test/test_cvscalar.rb", "test/test_cvseq.rb", "test/test_cvsize.rb", "test/test_cvsize2d32f.rb", "test/test_cvslice.rb", "test/test_cvsurfparams.rb", "test/test_cvsurfpoint.rb", "test/test_cvtermcriteria.rb", "test/test_cvtwopoints.rb", "test/test_cvvideowriter.rb", "test/test_eigenfaces.rb", "test/test_fisherfaces.rb", "test/test_iplconvkernel.rb", "test/test_iplimage.rb", "test/test_lbph.rb", "test/test_mouseevent.rb", "test/test_opencv.rb", "test/test_pointset.rb", "test/test_preliminary.rb", "test/test_trackbar.rb", "test/test_window.rb", "yard_extension.rb"] s.homepage = "https://github.com/ruby-opencv/ruby-opencv/" s.licenses = ["The BSD License"] s.rdoc_options = ["--main", "README.md"] s.rubyforge_project = "ruby-opencv" s.rubygems_version = "2.2.1" s.summary = "OpenCV wrapper for Ruby" - s.test_files = ["test/test_cvcontour.rb", "test/test_eigenfaces.rb", "test/test_cvmoments.rb", "test/test_cvseq.rb", "test/test_cvcontourtree.rb", "test/test_cvbox2d.rb", "test/test_iplimage.rb", "test/test_cvvideowriter.rb", "test/test_cvline.rb", "test/test_cvhumoments.rb", "test/test_cvfont.rb", "test/test_cvconnectedcomp.rb", "test/test_cvhistogram.rb", "test/test_trackbar.rb", "test/test_cvmat_imageprocessing.rb", "test/test_cvhaarclassifiercascade.rb", "test/test_cvcircle32f.rb", "test/test_cvcapture.rb", "test/test_cvmat_dxt.rb", "test/test_cvrect.rb", "test/test_iplconvkernel.rb", "test/test_cvsurfpoint.rb", "test/test_cvavgcomp.rb", "test/test_cvscalar.rb", "test/test_pointset.rb", "test/test_curve.rb", "test/test_cvtermcriteria.rb", "test/test_cvtwopoints.rb", "test/test_cvsurfparams.rb", "test/test_cvpoint2d32f.rb", "test/test_cvpoint3d32f.rb", "test/test_cvfeaturetree.rb", "test/test_mouseevent.rb", "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", "test/test_preliminary.rb", "test/test_cvmat_drawing.rb", "test/test_lbph.rb", "test/test_cvsize.rb", "test/test_window.rb", "test/test_cvslice.rb", "test/test_opencv.rb"] + s.test_files = ["test/test_cvcontour.rb", "test/test_eigenfaces.rb", "test/test_cvmoments.rb", "test/test_cvseq.rb", "test/test_cvcontourtree.rb", "test/test_cvbox2d.rb", "test/test_iplimage.rb", "test/test_cvvideowriter.rb", "test/test_cvline.rb", "test/test_cvhumoments.rb", "test/test_cvfont.rb", "test/test_cvconnectedcomp.rb", "test/test_cvhistogram.rb", "test/test_trackbar.rb", "test/test_cvmat_imageprocessing.rb", "test/test_cvhaarclassifiercascade.rb", "test/test_cvcircle32f.rb", "test/test_cvcapture.rb", "test/test_cvmat_dxt.rb", "test/test_cvrect.rb", "test/test_iplconvkernel.rb", "test/test_cvsurfpoint.rb", "test/test_cvavgcomp.rb", "test/test_cvscalar.rb", "test/test_pointset.rb", "test/test_curve.rb", "test/test_cvtermcriteria.rb", "test/test_cvtwopoints.rb", "test/test_cvsurfparams.rb", "test/test_cvpoint2d32f.rb", "test/test_cvpoint3d32f.rb", "test/test_cvfeaturetree.rb", "test/test_mouseevent.rb", "test/test_cvchain.rb", "test/test_cvmat.rb", "test/test_fisherfaces.rb", "test/test_cverror.rb", "test/test_cvpoint.rb", "test/test_cvsize2d32f.rb", "test/test_preliminary.rb", "test/test_cvmat_drawing.rb", "test/test_lbph.rb", "test/test_cvsize.rb", "test/test_window.rb", "test/test_cvslice.rb", "test/test_opencv.rb"] if s.respond_to? :specification_version then s.specification_version = 4 diff --git a/test/test_cvmat_matching.rb b/test/test_cvmat_matching.rb deleted file mode 100755 index 27d8006..0000000 --- a/test/test_cvmat_matching.rb +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env ruby -# -*- mode: ruby; coding: utf-8 -*- -require 'test/unit' -require 'opencv' -require File.expand_path(File.dirname(__FILE__)) + '/helper' - -include OpenCV - -# Tests for matching functions of OpenCV::CvMat -class TestCvMat_matching < OpenCVTestCase - def setup - @query = read_test_image('query.png') - @images = ['1.png', '2.png', '3.png'].map{|f| read_test_image('train', f)} - end - - def data_dir - File.join(File.dirname(__FILE__), '..', 'examples', 'matching_to_many_images') - end - - def read_test_image(*path) - CvMat.load File.join(data_dir, *path), CV_LOAD_IMAGE_GRAYSCALE - end - - def test_match_descriptors - matchs = @query.match_descriptors(@images) - match_index, count = matchs.max_by {|image_index, count| count} - assert_equal 2, match_index - end - - def test_match_descriptors_with_empty_image_array - assert_equal({}, @query.match_descriptors([])) - end - - def test_match_descriptors_with_wrong_detector_type_argument - assert_raise ArgumentError do - @query.match_descriptors(@images, "Wrong") - end - end - - def test_match_descriptors_with_wrong_descriptor_type_argument - assert_raise ArgumentError do - @query.match_descriptors(@images, "SURF", "wrong") - end - end - - def test_match_descriptors_with_wrong_matcher_type_argument - assert_raise ArgumentError do - @query.match_descriptors(@images, "SURF", "SURF", "wrong") - end - end - - def test_match_descriptors_with_invalid_image_array - assert_raise TypeError do - @query.match_descriptors([DUMMY_OBJ, DUMMY_OBJ]) - end - end -end