Merge branch 'develop'

Author: ser1zw

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.
 
 

Gemfile

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

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

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
 

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,19 +21,70 @@ 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
 
 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

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

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);

ext/opencv/cvutils.cpp

@@ -37,60 +37,60 @@ 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);
 }
 
 /*
  * Creates CvMat and underlying data
  * 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;
 }

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"
 

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 @@ def cv_version_suffix(incdir)
 }
 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"