ruby-opencv 0.0.9.pre → 0.0.9.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33cfd3a0cd131a4b59cb89d8d9f65ba91066fe2e
-  data.tar.gz: 1036803c9deb609d417a1d10f3e59fad87dbc627
+  metadata.gz: 76b5c449b23681d57637a4aa297ec186beff22a1
+  data.tar.gz: ca8989e49637be04808b124c98c73e87148214fe
 SHA512:
-  metadata.gz: 040e94477fd9d6e00314334b1889f10fda54ff78e541986003c5d71e48601aef8c596b11bef17d9b0cb24485b250e993cccb1d87cf364dda7c15121db9f15ef0
-  data.tar.gz: c8b503a23b21c54f9b9723d4e721c1d12fb8cfbe5cc361db434d8ed168da714981922eefd2dce9526ad086b70a1d2c6181afc4f7e13ae0332254089ca5a3a48f
+  metadata.gz: c0c32717d6b1ea151f8a2d6c3f11cc76569b61170c787fd8803e1d009ed4b0734f86bc1867e74a63488b15652c995498e7963794fdcdadcf902335efa18d05ef
+  data.tar.gz: 2c02f63a2970da1dd51194189aafe828329e571691cf9b66759d48cc72ffe0c7f0d8af3af6e53655d7c384e01708bab6582c95322290b93b239b62b9a828fcc6

data/DEVELOPERS_NOTE.md

@@ -14,12 +14,11 @@
   * [hoe](https://github.com/seattlerb/hoe)
   * [hoe-gemspec](https://github.com/flavorjones/hoe-gemspec)
   * [rake-compiler](https://github.com/luislavena/rake-compiler)
-  * [gem-compile](https://github.com/frsyuki/gem-compile)
 
 
 ## Create ruby-opencv gem
 Run the following commands.
-When you use mingw32, use **MSYS console**, or when you use mswin32, 
+When you use mingw32, use **MSYS console**, or when you use mswin32,
 use [**Visual Studio Command Prompt**](http://msdn.microsoft.com/en-us/library/ms229859.aspx)
 instead of cmd.exe.
 
@@ -32,16 +31,34 @@ $ git ls-files > Manifest.txt
 $ rake gem:spec
 $ rake gem
 ```
-**ruby-opencv-x.y.z.gem** will be created in pkg/ directory.
+**ruby-opencv-x.y.z.gem** will be created in **pkg** directory.
 
-To create pre-build binaries, run the following commands in Windows.
+To create pre-build binaries, create a config file firstly:
 
+```yml
+# config.yml
+platform: mingw32
+rubies:
+  - C:/ruby-1.9.3-p392-mingw32/bin/ruby.exe
+  - C:/ruby-2.0.0-p0-mingw32/bin/ruby.exe
+extopts:
+  - --with-opencv-include=C:/opencv/build/include
+  - --with-opencv-lib=C:/opencv/build/x86/mingw/lib
 ```
-$ cd pkg
-$ gem compile ruby-opencv-*.gem
+
+Entries are below:
+
+- **platform**: Target platform (e.g. mingw32, mswin32)
+- **rubies**: Array of target versions of ruby's paths (You can create fat gems if you specify multiple versions of ruby)
+- **extopts**: Array of options to be passed to **extconf.rb**
+
+Then, run the following command:
+
+```
+$ rake gem:precompile CONFIG=config.yml
 ```
 
-**ruby-opencv-x.y.z-x86-mingw32.gem** will be created when you use mingw32, or
+**ruby-opencv-x.y.z-mingw32.gem** will be created when you use mingw32, or
 **ruby-opencv-x.y.z-x86-mswin32.gem** when you use mswin32.
 
 

data/Gemfile

@@ -4,6 +4,5 @@ group :development do
   gem "hoe"
   gem "hoe-gemspec"
   gem "rake-compiler"
-  gem "gem-compile"
 end
 

data/Manifest.txt

@@ -6,6 +6,7 @@ License.txt
 Manifest.txt
 README.md
 Rakefile
+config.yml
 examples/alpha_blend.rb
 examples/box.png
 examples/box_in_scene.png

data/README.md

@@ -3,7 +3,7 @@
 An OpenCV wrapper for Ruby.
 
 * Web site: <https://github.com/ruby-opencv/ruby-opencv>
-* Ruby 1.9.3, 2.0.0 and OpenCV 2.4.4 are supported.
+* Ruby 1.9.3, 2.0.0 and OpenCV 2.4.5 are supported.
 
 ## Requirement
 

data/Rakefile

@@ -1,8 +1,13 @@
 # -*- mode: ruby; coding: utf-8 -*-
 require 'rubygems'
-require './lib/opencv/psyched_yaml'
+require "rubygems/ext"
+require "rubygems/installer"
 require 'hoe'
 require 'rake/extensiontask'
+require 'fileutils'
+require './lib/opencv/psyched_yaml'
+
+SO_FILE = 'opencv.so'
 
 Hoe.plugin :gemspec
 
@@ -16,14 +21,16 @@ hoespec = Hoe.spec 'ruby-opencv' do |s|
 
   s.readme_file  = 'README.md'
   s.history_file = 'History.txt'
+
   s.spec_extras = { :extensions => ['ext/opencv/extconf.rb'] }
+
   s.test_globs = ['test/test_*.rb']
   s.urls = ['https://github.com/ruby-opencv/ruby-opencv/']
 
   s.extra_dev_deps << ['rake-compiler', '>= 0'] << ['hoe-gemspec']
 
   Rake::ExtensionTask.new('opencv', spec) do |ext|
-    ext.lib_dir = File.join('lib', 'opencv')
+    ext.lib_dir = 'lib'
   end
 end
 
@@ -31,4 +38,53 @@ hoespec.spec.files.delete('.gemtest')
 
 Rake::Task[:test].prerequisites << :compile
 
+desc 'Create a pre-compiled gem'
+task 'gem:precompile' => ['gem'] do
+  tmp_dir = Dir.mktmpdir('tmp', '.')
+  gemfile = Dir.glob("pkg/*.gem")[0]
+  target_dir = File.join(tmp_dir, File.basename(gemfile, '.gem'))
+
+  installer = Gem::Installer.new(gemfile)
+  installer.unpack(target_dir)
+
+  gemspec = installer.spec
+  extension = gemspec.extensions[0]
+  gemspec.extensions.clear
+
+  config = ENV['CONFIG'] ?  YAML.load_file(ENV['CONFIG']) : {}
+  rubies = config['rubies'] || [Gem.ruby]
+  args = config['extopts'] || []
+  gemspec.platform = config['platform'] || Gem::Platform::CURRENT
+
+  multi = rubies.size > 1
+  rubies.each { |ruby|
+    lib_dir = 'lib'
+    if multi
+      major, minor, _ = `#{ruby} -e "print RUBY_VERSION"`.chomp.split('.')
+      lib_dir = File.join(lib_dir, [major, minor].join('.'))
+    end
+
+    make_cmd = (`#{ruby} -e "print RUBY_PLATFORM"` =~ /mswin/) ? 'nmake' : 'make'
+    Dir.chdir(target_dir) {
+      cmd = [ruby, extension, *args].join(' ')
+      results = []
+      Gem::Ext::ExtConfBuilder.run(cmd, results)
+      Gem::Ext::ExtConfBuilder.make('', results)
+
+      FileUtils.mkdir_p lib_dir
+      FileUtils.mv SO_FILE, lib_dir
+      sh "#{make_cmd} clean"
+    }
+
+    gemspec.files << File.join(lib_dir, SO_FILE)
+  }
+
+  Dir.chdir(target_dir) {
+    gemfile = Gem::Package.build(gemspec)
+    FileUtils.mv gemfile, File.dirname(__FILE__)
+  }
+
+  FileUtils.rm_rf tmp_dir
+end
+
 # vim: syntax=ruby

data/config.yml

@@ -0,0 +1,7 @@
+platform: mingw32
+rubies:
+  - C:/ruby-1.9.3-p392-mingw32/bin/ruby.exe
+  - C:/ruby-2.0.0-p0-mingw32/bin/ruby.exe
+extopts:
+  - --with-opencv-include=C:/opencv/build/include
+  - --with-opencv-lib=C:/opencv/build/x86/mingw/lib

data/ext/opencv/cvcapture.cpp

@@ -187,21 +187,25 @@ VALUE
 rb_retrieve(VALUE self)
 {
   VALUE image = Qnil;
+  IplImage *frame = NULL;
   try {
-    IplImage *frame = cvRetrieveFrame(CVCAPTURE(self));
-    if (!frame)
+    if (!(frame = cvRetrieveFrame(CVCAPTURE(self)))) {
       return Qnil;
-    image = cIplImage::new_object(cvSize(frame->width, frame->height),
-				  CV_MAKETYPE(CV_8U, frame->nChannels));
-    if (frame->origin == IPL_ORIGIN_TL)
+    }
+    image = cIplImage::new_object(frame->width, frame->height,
+				  CV_MAKETYPE(IPL2CV_DEPTH(frame->depth), frame->nChannels));
+    if (frame->origin == IPL_ORIGIN_TL) {
       cvCopy(frame, CVARR(image));
-    else
+    }
+    else {
       cvFlip(frame, CVARR(image));
+    }
   }
   catch (cv::Exception& e) {
     raise_cverror(e);
   }
   return image;
+
 }
 
 /*
@@ -214,16 +218,19 @@ VALUE
 rb_query(VALUE self)
 {
   VALUE image = Qnil;
+  IplImage *frame = NULL;
   try {
-    IplImage *frame = cvQueryFrame(CVCAPTURE(self));
-    if (!frame)
+    if (!(frame = cvQueryFrame(CVCAPTURE(self)))) {
       return Qnil;
-    image = cIplImage::new_object(cvSize(frame->width, frame->height),
-				  CV_MAKETYPE(CV_8U, frame->nChannels));
-    if (frame->origin == IPL_ORIGIN_TL)
+    }
+    image = cIplImage::new_object(frame->width, frame->height,
+				  CV_MAKETYPE(IPL2CV_DEPTH(frame->depth), frame->nChannels));
+    if (frame->origin == IPL_ORIGIN_TL) {
       cvCopy(frame, CVARR(image));
-    else
+    }
+    else {
       cvFlip(frame, CVARR(image));
+    }
   }
   catch (cv::Exception& e) {
     raise_cverror(e);

data/ext/opencv/cvutils.cpp

@@ -37,31 +37,28 @@ raise_compatible_typeerror(VALUE object, const char* expected_class_name)
 
 /*
  * Allocates a memory buffer
- * When memory allocation is failed, run GC and retry it
+ * see cv::fastMalloc()
  */
 void*
-rb_cvAlloc(size_t size)
+rbFastMalloc(size_t size)
 {
-  void* ptr = NULL;
-  try {
-    ptr = cvAlloc(size);
+  uchar* udata = (uchar*)xmalloc(size + sizeof(void*) + CV_MALLOC_ALIGN);
+  if(!udata) {
+    rb_raise(rb_eNoMemError, "Failed to allocate memory");
   }
-  catch(cv::Exception& e) {
-    if (e.code != CV_StsNoMem)
-      rb_raise(rb_eRuntimeError, "%s", e.what());
+  uchar** adata = cv::alignPtr((uchar**)udata + 1, CV_MALLOC_ALIGN);
+  adata[-1] = udata;
+  return adata;
+}
 
-    rb_gc_start();
-    try {
-      ptr = cvAlloc(size);
-    }
-    catch (cv::Exception& e) {
-      if (e.code == CV_StsNoMem)
-	rb_raise(rb_eNoMemError, "%s", e.what());
-      else
-	rb_raise(rb_eRuntimeError, "%s", e.what());
-    }
-  }
-  return ptr;
+/*
+ * Allocates a memory buffer
+ * When memory allocation is failed, run GC and retry it
+ */
+void*
+rb_cvAlloc(size_t size)
+{
+  return rbFastMalloc(size);
 }
 
 /*
@@ -69,28 +66,31 @@ rb_cvAlloc(size_t size)
  * When memory allocation is failed, run GC and retry it
  */
 CvMat*
-rb_cvCreateMat(int height, int width, int type)
+rb_cvCreateMat(int rows, int cols, int type)
 {
-  CvMat* ptr = NULL;
+  CvMat* mat = NULL;
   try {
-    ptr = cvCreateMat(height, width, type);
+    mat = cvCreateMatHeader(rows, cols, type);
+    if (mat) {
+      // see OpenCV's cvCreateData()
+      size_t step = mat->step;
+      size_t total_size = step * mat->rows + sizeof(int) + CV_MALLOC_ALIGN;
+
+      mat->refcount = (int*)rbFastMalloc(total_size);
+      mat->data.ptr = (uchar*)cvAlignPtr(mat->refcount + 1, CV_MALLOC_ALIGN);
+      *mat->refcount = 1;
+    }
+    else {
+      rb_raise(rb_eRuntimeError, "Failed to create mat header");
+    }
   }
   catch(cv::Exception& e) {
-    if (e.code != CV_StsNoMem)
-      rb_raise(rb_eRuntimeError, "%s", e.what());
-
-    rb_gc_start();
-    try {
-      ptr = cvCreateMat(height, width, type);
-    }
-    catch (cv::Exception& e) {
-      if (e.code == CV_StsNoMem)
-	rb_raise(rb_eNoMemError, "%s", e.what());
-      else
-	rb_raise(rb_eRuntimeError, "%s", e.what());
+    if (mat) {
+      cvReleaseMat(&mat);
     }
+    rb_raise(rb_eRuntimeError, "%s", e.what());
   }
-  return ptr;
+  return mat;
 }
 
 /*
@@ -102,22 +102,20 @@ rb_cvCreateImage(CvSize size, int depth, int channels)
 {
   IplImage* ptr = NULL;
   try {
-    ptr = cvCreateImage(size, depth, channels);
+    ptr = cvCreateImageHeader(size, depth, channels);
+    if (ptr) {
+      // see OpenCV's cvCreateData()
+      ptr->imageData = ptr->imageDataOrigin = (char*)rbFastMalloc((size_t)ptr->imageSize);
+    }
+    else {
+      rb_raise(rb_eRuntimeError, "Failed to create image header");
+    }
   }
   catch(cv::Exception& e) {
-    if (e.code != CV_StsNoMem)
-      rb_raise(rb_eRuntimeError, "%s", e.what());
-
-    rb_gc_start();
-    try {
-      ptr = cvCreateImage(size, depth, channels);
-    }
-    catch (cv::Exception& e) {
-      if (e.code == CV_StsNoMem)
-	rb_raise(rb_eNoMemError, "%s", e.what());
-      else
-	rb_raise(rb_eRuntimeError, "%s", e.what());
+    if (ptr) {
+      cvReleaseImage(&ptr);
     }
+    rb_raise(rb_eRuntimeError, "%s", e.what());
   }
   return ptr;
 }

data/ext/opencv/cvutils.h

@@ -11,6 +11,7 @@
 #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"
 

data/ext/opencv/extconf.rb

@@ -5,9 +5,9 @@ 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
@@ -70,8 +70,10 @@ opencv_headers.each {|header|
 }
 have_header("stdarg.h")
 
-$warnflags.slice!('-Wdeclaration-after-statement')
-$warnflags.slice!('-Wimplicit-function-declaration')
+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"

data/lib/opencv.rb

@@ -1,3 +1,12 @@
 require (File.dirname(__FILE__) + '/opencv/version')
-require 'opencv.so'
 
+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/version.rb

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

data/ruby-opencv.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-opencv"
-  s.version = "0.0.9.pre.20130324195100"
+  s.version = "0.0.9.pre2.20130505044041"
 
   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-03-24"
+  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 = ["ext/opencv/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/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.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"]
@@ -19,26 +19,26 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "ruby-opencv"
   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 = 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-opencv
 version: !ruby/object:Gem::Version
-  version: 0.0.9.pre
+  version: 0.0.9.pre2
 platform: ruby
 authors:
 - lsxi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
 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:
@@ -78,9 +78,11 @@ executables: []
 extensions:
 - ext/opencv/extconf.rb
 extra_rdoc_files:
+- DEVELOPERS_NOTE.md
 - History.txt
 - License.txt
 - Manifest.txt
+- README.md
 - examples/matching_to_many_images/train/trainImages.txt
 files:
 - .gitignore
@@ -91,6 +93,7 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
+- config.yml
 - examples/alpha_blend.rb
 - examples/box.png
 - examples/box_in_scene.png
@@ -336,47 +339,47 @@ signing_key:
 specification_version: 4
 summary: OpenCV wrapper for Ruby
 test_files:
-- test/test_cvcontourtree.rb
+- 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_cvconnectedcomp.rb
-- test/test_cvcontour.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_cvmat_matching.rb
-- test/test_trackbar.rb
-- test/test_cvpoint3d32f.rb
-- test/test_cvpoint2d32f.rb
-- test/test_cvcapture.rb
+- test/test_cvtwopoints.rb
 - test/test_cvfont.rb
-- test/test_cvhumoments.rb
-- test/test_cvmat_dxt.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_iplimage.rb
-- test/test_preliminary.rb
-- test/test_cvmat_drawing.rb
-- test/test_cvsurfparams.rb
-- test/test_cvcircle32f.rb
+- test/test_cvpoint2d32f.rb
+- test/test_cvcapture.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_cvcontourtree.rb
 - test/test_cvavgcomp.rb
+- test/test_cvsurfpoint.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_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