ruby-opencv 0.0.8-x86-mingw32 → 0.0.9.pre2-x86-mingw32

data/ext/opencv/cvutils.h

@@ -1,29 +1,30 @@
-/************************************************************
-
-    cvutils.h -
-
-    $Author: ser1zw $
-
-    Copyright (C) 2011 ser1zw
-
-************************************************************/
-
-#include <ruby.h>
-#include "opencv2/core/core_c.h"
-#include "opencv2/core/core.hpp"
-#include "opencv2/imgproc/imgproc_c.h"
-#include "opencv2/imgproc/imgproc.hpp"
-
-#define raise_cverror(e) cCvError::raise(e)
-
-void raise_typeerror(VALUE object, VALUE expected_class);
-void raise_typeerror(VALUE object, const char* expected_class_name);
-void raise_compatible_typeerror(VALUE object, VALUE expected_class);
-void raise_compatible_typeerror(VALUE object, const char* expected_class_name);
-void* rb_cvAlloc(size_t size);
-CvMat* rb_cvCreateMat(int height, int width, int type);
-IplImage* rb_cvCreateImage(CvSize size, int depth, int channels);
-IplConvKernel* rb_cvCreateStructuringElementEx(int cols, int rows, int anchorX, int anchorY, int shape, int *values);
-CvMemStorage* rb_cvCreateMemStorage(int block_size);
-VALUE rb_get_option_table(VALUE klass, const char* table_name, VALUE option);
-
+/************************************************************
+
+    cvutils.h -
+
+    $Author: ser1zw $
+
+    Copyright (C) 2011 ser1zw
+
+************************************************************/
+
+#include <ruby.h>
+#include "opencv2/core/core_c.h"
+#include "opencv2/core/core.hpp"
+#include "opencv2/core/internal.hpp"
+#include "opencv2/imgproc/imgproc_c.h"
+#include "opencv2/imgproc/imgproc.hpp"
+
+#define raise_cverror(e) cCvError::raise(e)
+
+void raise_typeerror(VALUE object, VALUE expected_class);
+void raise_typeerror(VALUE object, const char* expected_class_name);
+void raise_compatible_typeerror(VALUE object, VALUE expected_class);
+void raise_compatible_typeerror(VALUE object, const char* expected_class_name);
+void* rb_cvAlloc(size_t size);
+CvMat* rb_cvCreateMat(int height, int width, int type);
+IplImage* rb_cvCreateImage(CvSize size, int depth, int channels);
+IplConvKernel* rb_cvCreateStructuringElementEx(int cols, int rows, int anchorX, int anchorY, int shape, int *values);
+CvMemStorage* rb_cvCreateMemStorage(int block_size);
+VALUE rb_get_option_table(VALUE klass, const char* table_name, VALUE option);
+

data/{extconf.rb → ext/opencv/extconf.rb}

@@ -5,14 +5,17 @@ def cv_version_suffix(incdir)
   major, minor, subminor = nil, nil, nil
   open("#{incdir}/opencv2/core/version.hpp", 'r') { |f|
     f.read.lines.each { |line|
-      major = $1.to_s if line =~ /\A#define\s+CV_MAJOR_VERSION\s+(\d+)\s*\Z/
-      minor = $1.to_s if line =~ /\A#define\s+CV_MINOR_VERSION\s+(\d+)\s*\Z/
-      subminor = $1.to_s if line =~ /\A#define\s+CV_SUBMINOR_VERSION\s+(\d+)\s*\Z/
+      major = $1.to_s if line =~ /\A#define\s+(?:CV_VERSION_EPOCH|CV_MAJOR_VERSION)\s+(\d+)\s*\Z/
+      minor = $1.to_s if line =~ /\A#define\s+(?:CV_VERSION_MAJOR|CV_MINOR_VERSION)\s+(\d+)\s*\Z/
+      subminor = $1.to_s if line =~ /\A#define\s+(?:CV_VERSION_MINOR|CV_SUBMINOR_VERSION)\s+(\d+)\s*\Z/
     }
   }
   major + minor + subminor
 end
 
+# Quick fix for 2.0.0
+# @libdir_basename is set to nil and dir_config() sets invalid libdir '${opencv-dir}/' when --with-opencv-dir option passed.
+@libdir_basename ||= 'lib'
 incdir, libdir = dir_config("opencv", "/usr/local/include", "/usr/local/lib")
 dir_config("libxml2", "/usr/include", "/usr/lib")
 
@@ -67,9 +70,14 @@ opencv_headers.each {|header|
 }
 have_header("stdarg.h")
 
+if $warnflags
+  $warnflags.slice!('-Wdeclaration-after-statement')
+  $warnflags.slice!('-Wimplicit-function-declaration')
+end
+
 # Quick fix for 1.8.7
 $CFLAGS << " -I#{File.dirname(__FILE__)}/ext/opencv"
 
 # Create Makefile
-create_makefile("opencv", "./ext/opencv")
+create_makefile('opencv')
 

data/lib/opencv.rb

@@ -1,3 +1,12 @@
-require (File.dirname(__FILE__) + '/opencv/version')
-require 'opencv.so'
-
+require (File.dirname(__FILE__) + '/opencv/version')
+
+if RUBY_PLATFORM =~ /mingw|mswin/
+  major, minor, subminor = RUBY_VERSION.split('.')
+  begin
+    require "#{major}.#{minor}/opencv.so"
+  rescue LoadError
+    require 'opencv.so'
+  end
+else
+  require 'opencv.so'
+end

data/lib/opencv/psyched_yaml.rb

@@ -1,22 +1,22 @@
-# -*- mode: ruby; coding: utf-8-unix -*- 
-# Psych loader for avoiding loading problem
-# (borrowed from Bundler 1.1.rc.7 https://github.com/carlhuda/bundler/blob/v1.1.rc.7/lib/bundler/psyched_yaml.rb )
-#
-# See: https://github.com/ruby-opencv/ruby-opencv/pull/6
-
-# Psych could be a gem
-begin
-  gem 'psych'
-rescue Gem::LoadError
-end if defined?(Gem)
-
-# Psych could be a stdlib
-begin
-  # it's too late if Syck is already loaded
-  require 'psych' unless defined?(Syck)
-rescue LoadError
-end
-
-# Psych might NOT EXIST AT ALL
-require 'yaml'
-
+# -*- mode: ruby; coding: utf-8 -*-
+# Psych loader for avoiding loading problem
+# (borrowed from Bundler 1.1.rc.7 https://github.com/carlhuda/bundler/blob/v1.1.rc.7/lib/bundler/psyched_yaml.rb )
+#
+# See: https://github.com/ruby-opencv/ruby-opencv/pull/6
+
+# Psych could be a gem
+begin
+  gem 'psych'
+rescue Gem::LoadError
+end if defined?(Gem)
+
+# Psych could be a stdlib
+begin
+  # it's too late if Syck is already loaded
+  require 'psych' unless defined?(Syck)
+rescue LoadError
+end
+
+# Psych might NOT EXIST AT ALL
+require 'yaml'
+

data/lib/opencv/version.rb

@@ -1,3 +1,3 @@
 module OpenCV
-  VERSION = '0.0.8'
+  VERSION = '0.0.9.pre2'
 end

data/ruby-opencv.gemspec

@@ -2,42 +2,43 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-opencv"
-  s.version = "0.0.8.20130127124736"
+  s.version = "0.0.9.pre2.20130505044041"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["lsxi", "ser1zw", "pcting"]
-  s.date = "2013-01-27"
-  s.description = ""
+  s.date = "2013-05-04"
+  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 = ["extconf.rb"]
-  s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "examples/matching_to_many_images/train/trainImages.txt"]
-  s.files = [".gitignore", "DEVELOPERS_NOTE.md", "Gemfile", "History.txt", "License.txt", "Manifest.txt", "README.md", "Rakefile", "examples/alpha_blend.rb", "examples/box.png", "examples/box_in_scene.png", "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/find_obj.rb", "examples/houghcircle.rb", "examples/inpaint.png", "examples/inpaint.rb", "examples/lenna-rotated.jpg", "examples/lenna.jpg", "examples/match_kdtree.rb", "examples/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", "examples/stuff.jpg", "examples/tiffany.jpg", "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/gui.cpp", "ext/opencv/gui.h", "ext/opencv/iplconvkernel.cpp", "ext/opencv/iplconvkernel.h", "ext/opencv/iplimage.cpp", "ext/opencv/iplimage.h", "ext/opencv/lib/opencv.rb", "ext/opencv/lib/opencv/psyched_yaml.rb", "ext/opencv/lib/opencv/version.rb", "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", "extconf.rb", "images/CvMat_sobel.png", "images/CvMat_sub_rect.png", "images/CvSeq_relationmap.png", "images/face_detect_from_lena.jpg", "ruby-opencv.gemspec", "test/helper.rb", "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_iplconvkernel.rb", "test/test_iplimage.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"]
+  s.extensions = ["ext/opencv/extconf.rb"]
+  s.extra_rdoc_files = ["DEVELOPERS_NOTE.md", "History.txt", "License.txt", "Manifest.txt", "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/box.png", "examples/box_in_scene.png", "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/find_obj.rb", "examples/houghcircle.rb", "examples/inpaint.png", "examples/inpaint.rb", "examples/lenna-rotated.jpg", "examples/lenna.jpg", "examples/match_kdtree.rb", "examples/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", "examples/stuff.jpg", "examples/tiffany.jpg", "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/extconf.rb", "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/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", "images/face_detect_from_lena.jpg", "lib/opencv.rb", "lib/opencv/psyched_yaml.rb", "lib/opencv/version.rb", "ruby-opencv.gemspec", "test/helper.rb", "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_iplconvkernel.rb", "test/test_iplimage.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"]
   s.homepage = "https://github.com/ruby-opencv/ruby-opencv/"
+  s.licenses = ["The BSD License"]
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "ruby-opencv"
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.0.3"
   s.summary = "OpenCV wrapper for Ruby"
-  s.test_files = ["test/test_cvcontourtree.rb", "test/test_iplconvkernel.rb", "test/test_cvsize2d32f.rb", "test/test_cvconnectedcomp.rb", "test/test_cvcontour.rb", "test/test_cvslice.rb", "test/test_cvmat_matching.rb", "test/test_trackbar.rb", "test/test_cvpoint3d32f.rb", "test/test_cvpoint2d32f.rb", "test/test_cvcapture.rb", "test/test_cvfont.rb", "test/test_cvhumoments.rb", "test/test_cvmat_dxt.rb", "test/test_cvbox2d.rb", "test/test_iplimage.rb", "test/test_preliminary.rb", "test/test_cvmat_drawing.rb", "test/test_cvsurfparams.rb", "test/test_cvcircle32f.rb", "test/test_pointset.rb", "test/test_cvmat.rb", "test/test_cvhistogram.rb", "test/test_cverror.rb", "test/test_cvtermcriteria.rb", "test/test_cvmoments.rb", "test/test_cvchain.rb", "test/test_cvpoint.rb", "test/test_cvavgcomp.rb", "test/test_cvrect.rb", "test/test_cvvideowriter.rb", "test/test_curve.rb", "test/test_window.rb", "test/test_cvline.rb", "test/test_opencv.rb", "test/test_cvfeaturetree.rb", "test/test_cvseq.rb", "test/test_cvsize.rb", "test/test_mouseevent.rb", "test/test_cvmat_imageprocessing.rb", "test/test_cvtwopoints.rb", "test/test_cvscalar.rb", "test/test_cvsurfpoint.rb", "test/test_cvhaarclassifiercascade.rb"]
+  s.test_files = ["test/test_cvhistogram.rb", "test/test_cvconnectedcomp.rb", "test/test_mouseevent.rb", "test/test_opencv.rb", "test/test_cvmat_imageprocessing.rb", "test/test_cvmat.rb", "test/test_cvfeaturetree.rb", "test/test_iplconvkernel.rb", "test/test_cvchain.rb", "test/test_cvmat_drawing.rb", "test/test_cvpoint.rb", "test/test_trackbar.rb", "test/test_cvsize2d32f.rb", "test/test_cvsurfparams.rb", "test/test_cvscalar.rb", "test/test_cverror.rb", "test/test_cvhumoments.rb", "test/test_iplimage.rb", "test/test_cvslice.rb", "test/test_cvtwopoints.rb", "test/test_cvfont.rb", "test/test_cvseq.rb", "test/test_cvcontour.rb", "test/test_curve.rb", "test/test_cvsize.rb", "test/test_window.rb", "test/test_cvbox2d.rb", "test/test_cvpoint2d32f.rb", "test/test_cvcapture.rb", "test/test_pointset.rb", "test/test_cvcontourtree.rb", "test/test_cvavgcomp.rb", "test/test_cvsurfpoint.rb", "test/test_cvrect.rb", "test/test_cvline.rb", "test/test_cvvideowriter.rb", "test/test_cvpoint3d32f.rb", "test/test_cvmat_matching.rb", "test/test_cvcircle32f.rb", "test/test_preliminary.rb", "test/test_cvmat_dxt.rb", "test/test_cvmoments.rb", "test/test_cvtermcriteria.rb", "test/test_cvhaarclassifiercascade.rb"]
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_development_dependency(%q<rake-compiler>, [">= 0"])
       s.add_development_dependency(%q<hoe-gemspec>, [">= 0"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.5"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.6"])
     else
-      s.add_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_dependency(%q<rake-compiler>, [">= 0"])
       s.add_dependency(%q<hoe-gemspec>, [">= 0"])
-      s.add_dependency(%q<hoe>, ["~> 3.5"])
+      s.add_dependency(%q<hoe>, ["~> 3.6"])
     end
   else
-    s.add_dependency(%q<rdoc>, ["~> 3.10"])
+    s.add_dependency(%q<rdoc>, ["~> 4.0"])
     s.add_dependency(%q<rake-compiler>, [">= 0"])
     s.add_dependency(%q<hoe-gemspec>, [">= 0"])
-    s.add_dependency(%q<hoe>, ["~> 3.5"])
+    s.add_dependency(%q<hoe>, ["~> 3.6"])
   end
 end

data/test/helper.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# -*- mode: ruby; coding: utf-8-unix -*- 
+# -*- mode: ruby; coding: utf-8 -*-
 require 'test/unit'
 require 'digest/md5'
 require 'opencv'

data/test/runner.rb

@@ -1,30 +1,30 @@
-#!/usr/bin/env ruby
-# -*- mode: ruby; coding: utf-8-unix -*- 
-require 'test/unit'
-
-src_testdir = File.dirname(File.expand_path(__FILE__))
-if Test::Unit.methods.include? :setup_argv
-  srcdir = File.dirname(src_testdir)
-  Test::Unit.setup_argv {|files|
-    if files.empty?
-      [src_testdir]
-    else
-      files.map {|f|
-        if File.exist? "#{src_testdir}/#{f}"
-          "#{src_testdir}/#{f}"
-        elsif File.exist? "#{srcdir}/#{f}"
-          "#{srcdir}/#{f}"
-        elsif File.exist? f
-          f
-        else
-          raise ArgumentError, "not found: #{f}"
-        end
-      }
-    end
-  }
-elsif Test::Unit.constants.map {|c| c.to_sym }.include? :AutoRunner
-  Test::Unit::AutoRunner.run(true, src_testdir)
-else
-  raise 'Test runner not found'
-end
-
+#!/usr/bin/env ruby
+# -*- mode: ruby; coding: utf-8 -*-
+require 'test/unit'
+
+src_testdir = File.dirname(File.expand_path(__FILE__))
+if Test::Unit.methods.include? :setup_argv
+  srcdir = File.dirname(src_testdir)
+  Test::Unit.setup_argv {|files|
+    if files.empty?
+      [src_testdir]
+    else
+      files.map {|f|
+        if File.exist? "#{src_testdir}/#{f}"
+          "#{src_testdir}/#{f}"
+        elsif File.exist? "#{srcdir}/#{f}"
+          "#{srcdir}/#{f}"
+        elsif File.exist? f
+          f
+        else
+          raise ArgumentError, "not found: #{f}"
+        end
+      }
+    end
+  }
+elsif Test::Unit.constants.map {|c| c.to_sym }.include? :AutoRunner
+  Test::Unit::AutoRunner.run(true, src_testdir)
+else
+  raise 'Test runner not found'
+end
+

data/test/test_curve.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# -*- mode: ruby; coding: utf-8-unix -*- 
+# -*- mode: ruby; coding: utf-8 -*-
 require 'test/unit'
 require 'opencv'
 require File.expand_path(File.dirname(__FILE__)) + '/helper'

data/test/test_cvavgcomp.rb

@@ -1,24 +1,24 @@
-#!/usr/bin/env ruby
-# -*- mode: ruby; coding: utf-8-unix -*- 
-require 'test/unit'
-require 'opencv'
-require File.expand_path(File.dirname(__FILE__)) + '/helper'
-
-include OpenCV
-
-# Tests for OpenCV::CvAvgComp
-class TestCvAvgComp < OpenCVTestCase
-  def setup
-    @avgcomp = CvAvgComp.new
-  end
-
-  def test_initialize
-    assert_equal(CvAvgComp, @avgcomp.class)
-    assert(@avgcomp.is_a? CvRect)
-  end
-
-  def test_neighbors
-    assert_equal(Fixnum, @avgcomp.neighbors.class)
-  end
-end
-
+#!/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 OpenCV::CvAvgComp
+class TestCvAvgComp < OpenCVTestCase
+  def setup
+    @avgcomp = CvAvgComp.new
+  end
+
+  def test_initialize
+    assert_equal(CvAvgComp, @avgcomp.class)
+    assert(@avgcomp.is_a? CvRect)
+  end
+
+  def test_neighbors
+    assert_equal(Fixnum, @avgcomp.neighbors.class)
+  end
+end
+

data/test/test_cvbox2d.rb

@@ -1,76 +1,76 @@
-#!/usr/bin/env ruby
-# -*- mode: ruby; coding: utf-8-unix -*- 
-require 'test/unit'
-require 'opencv'
-require File.expand_path(File.dirname(__FILE__)) + '/helper'
-
-include OpenCV
-
-# Tests for OpenCV::CvBox2D
-class TestCvBox2D < OpenCVTestCase
-  class MyPoint; end
-  def test_initialize
-    box = CvBox2D.new
-    assert_in_delta(0, box.center.x, 0.001)
-    assert_in_delta(0, box.center.y, 0.001)
-    assert_in_delta(0, box.size.width, 0.001)
-    assert_in_delta(0, box.size.height, 0.001)
-    assert_in_delta(0, box.angle, 0.001)
-
-    box = CvBox2D.new(CvPoint2D32f.new(1.1, 2.2), CvSize2D32f.new(3.3, 4.4), 5.5)
-    assert_in_delta(1.1, box.center.x, 0.001)
-    assert_in_delta(2.2, box.center.y, 0.001)
-    assert_in_delta(3.3, box.size.width, 0.001)
-    assert_in_delta(4.4, box.size.height, 0.001)
-    assert_in_delta(5.5, box.angle, 0.001)
-  end
-
-  def test_center
-    box = CvBox2D.new
-    box.center = CvPoint2D32f.new(1.1, 2.2)
-    assert_in_delta(1.1, box.center.x, 0.001)
-    assert_in_delta(2.2, box.center.y, 0.001)
-
-    box.center.x = 3.3
-    box.center.y = 4.4
-    assert_in_delta(3.3, box.center.x, 0.001)
-    assert_in_delta(4.4, box.center.y, 0.001)
-  end
-  
-  def test_size
-    box = CvBox2D.new
-    box.size = CvSize2D32f.new(1.1, 2.2)
-    assert_in_delta(1.1, box.size.width, 0.001)
-    assert_in_delta(2.2, box.size.height, 0.001)
-
-    box.size.width = 3.3
-    box.size.height = 4.4
-    assert_in_delta(3.3, box.size.width, 0.001)
-    assert_in_delta(4.4, box.size.height, 0.001)
-  end
-
-  def test_angle
-    box = CvBox2D.new
-    box.angle = 1.1
-    assert_in_delta(1.1, box.angle, 0.001)
-  end
-
-  def test_points
-    box = CvBox2D.new
-    box.center = CvPoint2D32f.new(10, 20)
-    box.size = CvSize2D32f.new(5, 7)
-    pt = box.points
-
-    assert_equal(4, pt.size)
-    assert_in_delta(7.5, pt[0].x, 0.001)
-    assert_in_delta(23.5, pt[0].y, 0.001)
-    assert_in_delta(7.5, pt[1].x, 0.001)
-    assert_in_delta(16.5, pt[1].y, 0.001)
-    assert_in_delta(12.5, pt[2].x, 0.001)
-    assert_in_delta(16.5, pt[2].y, 0.001)
-    assert_in_delta(12.5, pt[3].x, 0.001)
-    assert_in_delta(23.5, pt[3].y, 0.001)
-  end
-end
-
-
+#!/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 OpenCV::CvBox2D
+class TestCvBox2D < OpenCVTestCase
+  class MyPoint; end
+  def test_initialize
+    box = CvBox2D.new
+    assert_in_delta(0, box.center.x, 0.001)
+    assert_in_delta(0, box.center.y, 0.001)
+    assert_in_delta(0, box.size.width, 0.001)
+    assert_in_delta(0, box.size.height, 0.001)
+    assert_in_delta(0, box.angle, 0.001)
+
+    box = CvBox2D.new(CvPoint2D32f.new(1.1, 2.2), CvSize2D32f.new(3.3, 4.4), 5.5)
+    assert_in_delta(1.1, box.center.x, 0.001)
+    assert_in_delta(2.2, box.center.y, 0.001)
+    assert_in_delta(3.3, box.size.width, 0.001)
+    assert_in_delta(4.4, box.size.height, 0.001)
+    assert_in_delta(5.5, box.angle, 0.001)
+  end
+
+  def test_center
+    box = CvBox2D.new
+    box.center = CvPoint2D32f.new(1.1, 2.2)
+    assert_in_delta(1.1, box.center.x, 0.001)
+    assert_in_delta(2.2, box.center.y, 0.001)
+
+    box.center.x = 3.3
+    box.center.y = 4.4
+    assert_in_delta(3.3, box.center.x, 0.001)
+    assert_in_delta(4.4, box.center.y, 0.001)
+  end
+  
+  def test_size
+    box = CvBox2D.new
+    box.size = CvSize2D32f.new(1.1, 2.2)
+    assert_in_delta(1.1, box.size.width, 0.001)
+    assert_in_delta(2.2, box.size.height, 0.001)
+
+    box.size.width = 3.3
+    box.size.height = 4.4
+    assert_in_delta(3.3, box.size.width, 0.001)
+    assert_in_delta(4.4, box.size.height, 0.001)
+  end
+
+  def test_angle
+    box = CvBox2D.new
+    box.angle = 1.1
+    assert_in_delta(1.1, box.angle, 0.001)
+  end
+
+  def test_points
+    box = CvBox2D.new
+    box.center = CvPoint2D32f.new(10, 20)
+    box.size = CvSize2D32f.new(5, 7)
+    pt = box.points
+
+    assert_equal(4, pt.size)
+    assert_in_delta(7.5, pt[0].x, 0.001)
+    assert_in_delta(23.5, pt[0].y, 0.001)
+    assert_in_delta(7.5, pt[1].x, 0.001)
+    assert_in_delta(16.5, pt[1].y, 0.001)
+    assert_in_delta(12.5, pt[2].x, 0.001)
+    assert_in_delta(16.5, pt[2].y, 0.001)
+    assert_in_delta(12.5, pt[3].x, 0.001)
+    assert_in_delta(23.5, pt[3].y, 0.001)
+  end
+end
+
+