ruby-opencv 0.0.9-x86-mswin32 → 0.0.10.pre-x86-mswin32

data/ext/opencv/mouseevent.h

@@ -1,56 +1,56 @@
-/************************************************************
-
-   mouseevent.h -
-
-   $Author: lsxi $
-
-   Copyright (C) 2005-2006 Masakazu Yonekura
-
-************************************************************/
-#define __NAMESPACE_BEGIN_MOUSEEVENT namespace cMouseEvent {
-#define __NAMESPACE_END_MOUSEEVENT }
-
-#ifndef RUBY_OPENCV_GUI_MOUSEEVENT_H
-#define RUBY_OPENCV_GUI_MOUSEEVENT_H
-
-#include "opencv.h"
-
-__NAMESPACE_BEGIN_OPENCV
-__NAMESPACE_BEGIN_GUI
-__NAMESPACE_BEGIN_MOUSEEVENT
-
-typedef struct MouseEvent {
-  CvPoint point;
-  int event;
-  int flags;
-} MouseEvent;
-
-VALUE rb_class();
-
-void define_ruby_class();
-
-VALUE rb_allocate(VALUE klass);
-
-VALUE rb_event(VALUE self);
-
-VALUE rb_left_button_q(VALUE self);
-VALUE rb_right_button_q(VALUE self);
-VALUE rb_middle_button_q(VALUE self);
-VALUE rb_ctrl_key_q(VALUE self);
-VALUE rb_shift_key_q(VALUE self);
-VALUE rb_alt_key_q(VALUE self);
-
-VALUE new_object(int event, int x, int y, int flag);
-
-inline MouseEvent *MOUSEEVENT(VALUE object) {
-  MouseEvent *ptr;
-  Data_Get_Struct(object, MouseEvent, ptr);
-  return ptr;
-}
-
-__NAMESPACE_END_MOUSEEVENT
-__NAMESPACE_END_GUI
-__NAMESPACE_END_OPENCV
-
-#endif // RUBY_OPENCV_GUI_MOUSEEVENT_H
-
+/************************************************************
+
+   mouseevent.h -
+
+   $Author: lsxi $
+
+   Copyright (C) 2005-2006 Masakazu Yonekura
+
+************************************************************/
+#define __NAMESPACE_BEGIN_MOUSEEVENT namespace cMouseEvent {
+#define __NAMESPACE_END_MOUSEEVENT }
+
+#ifndef RUBY_OPENCV_GUI_MOUSEEVENT_H
+#define RUBY_OPENCV_GUI_MOUSEEVENT_H
+
+#include "opencv.h"
+
+__NAMESPACE_BEGIN_OPENCV
+__NAMESPACE_BEGIN_GUI
+__NAMESPACE_BEGIN_MOUSEEVENT
+
+typedef struct MouseEvent {
+  CvPoint point;
+  int event;
+  int flags;
+} MouseEvent;
+
+VALUE rb_class();
+
+void define_ruby_class();
+
+VALUE rb_allocate(VALUE klass);
+
+VALUE rb_event(VALUE self);
+
+VALUE rb_left_button_q(VALUE self);
+VALUE rb_right_button_q(VALUE self);
+VALUE rb_middle_button_q(VALUE self);
+VALUE rb_ctrl_key_q(VALUE self);
+VALUE rb_shift_key_q(VALUE self);
+VALUE rb_alt_key_q(VALUE self);
+
+VALUE new_object(int event, int x, int y, int flag);
+
+inline MouseEvent *MOUSEEVENT(VALUE object) {
+  MouseEvent *ptr;
+  Data_Get_Struct(object, MouseEvent, ptr);
+  return ptr;
+}
+
+__NAMESPACE_END_MOUSEEVENT
+__NAMESPACE_END_GUI
+__NAMESPACE_END_OPENCV
+
+#endif // RUBY_OPENCV_GUI_MOUSEEVENT_H
+

data/ext/opencv/opencv.cpp

@@ -166,6 +166,11 @@ define_ruby_module()
   rb_define_const(rb_module, "CV_MINOR_VERSION", INT2FIX(CV_MINOR_VERSION));
   rb_define_const(rb_module, "CV_SUBMINOR_VERSION", INT2FIX(CV_SUBMINOR_VERSION));
 
+  rb_define_const(rb_module, "CV_VERSION_EPOCH", INT2FIX(CV_VERSION_EPOCH));
+  rb_define_const(rb_module, "CV_VERSION_MAJOR", INT2FIX(CV_VERSION_MAJOR));
+  rb_define_const(rb_module, "CV_VERSION_MINOR", INT2FIX(CV_VERSION_MINOR));
+  rb_define_const(rb_module, "CV_VERSION_REVISION", INT2FIX(CV_VERSION_REVISION));
+
   /* 0: 8bit unsigned */
   rb_define_const(rb_module, "CV_8U", INT2FIX(CV_8U));
   /* 1: 8bit signed */

data/ext/opencv/trackbar.h

@@ -1,69 +1,69 @@
-/************************************************************
-
-   trackbar.h -
-
-   $Author: lsxi $
-
-   Copyright (C) 2005 Masakazu Yonekura
-
-************************************************************/
-#ifndef RUBY_OPENCV_GUI_H
-#include "gui.h"
-#endif
-
-#ifndef RUBY_OPENCV_GUI_TRACKBAR_H
-#define RUBY_OPENCV_GUI_TRACKBAR_H
-
-#include "opencv.h"
-
-#define __NAMESPACE_BEGIN_TRACKBAR namespace cTrackbar {
-#define __NAMESPACE_END_TRACKBAR }
-
-__NAMESPACE_BEGIN_OPENCV
-__NAMESPACE_BEGIN_GUI
-
-typedef struct Trackbar {
-  char *name;
-  int maxval;
-  int val;
-  VALUE block;
-} Trackbar;
-
-__NAMESPACE_BEGIN_TRACKBAR
-
-VALUE rb_class();
-
-void define_ruby_class();
-VALUE rb_allocate(VALUE klass);
-
-void trackbar_mark(void *ptr);
-void trackbar_free(void *ptr);
-
-VALUE rb_initialize(int argc, VALUE *argv, VALUE self);
-VALUE rb_name(VALUE self);
-VALUE rb_max(VALUE self);
-VALUE rb_value(VALUE self);
-VALUE rb_set_value(VALUE self, VALUE val);
-
-__NAMESPACE_END_TRACKBAR
-
-inline Trackbar*
-TRACKBAR(VALUE object) {
-  Trackbar *ptr;
-  Data_Get_Struct(object, Trackbar, ptr);
-  return ptr;
-}
-
-inline Trackbar*
-TRACKBAR_WITH_CHECK(VALUE object) {
-  if (!rb_obj_is_kind_of(object, cTrackbar::rb_class())) {
-    raise_typeerror(object, cTrackbar::rb_class());
-  }
-  return TRACKBAR(object);
-}
-
-__NAMESPACE_END_GUI
-__NAMESPACE_END_OPENCV
-
-#endif // RUBY_OPENCV_GUI_TRACKBAR_H
-
+/************************************************************
+
+   trackbar.h -
+
+   $Author: lsxi $
+
+   Copyright (C) 2005 Masakazu Yonekura
+
+************************************************************/
+#ifndef RUBY_OPENCV_GUI_H
+#include "gui.h"
+#endif
+
+#ifndef RUBY_OPENCV_GUI_TRACKBAR_H
+#define RUBY_OPENCV_GUI_TRACKBAR_H
+
+#include "opencv.h"
+
+#define __NAMESPACE_BEGIN_TRACKBAR namespace cTrackbar {
+#define __NAMESPACE_END_TRACKBAR }
+
+__NAMESPACE_BEGIN_OPENCV
+__NAMESPACE_BEGIN_GUI
+
+typedef struct Trackbar {
+  char *name;
+  int maxval;
+  int val;
+  VALUE block;
+} Trackbar;
+
+__NAMESPACE_BEGIN_TRACKBAR
+
+VALUE rb_class();
+
+void define_ruby_class();
+VALUE rb_allocate(VALUE klass);
+
+void trackbar_mark(void *ptr);
+void trackbar_free(void *ptr);
+
+VALUE rb_initialize(int argc, VALUE *argv, VALUE self);
+VALUE rb_name(VALUE self);
+VALUE rb_max(VALUE self);
+VALUE rb_value(VALUE self);
+VALUE rb_set_value(VALUE self, VALUE val);
+
+__NAMESPACE_END_TRACKBAR
+
+inline Trackbar*
+TRACKBAR(VALUE object) {
+  Trackbar *ptr;
+  Data_Get_Struct(object, Trackbar, ptr);
+  return ptr;
+}
+
+inline Trackbar*
+TRACKBAR_WITH_CHECK(VALUE object) {
+  if (!rb_obj_is_kind_of(object, cTrackbar::rb_class())) {
+    raise_typeerror(object, cTrackbar::rb_class());
+  }
+  return TRACKBAR(object);
+}
+
+__NAMESPACE_END_GUI
+__NAMESPACE_END_OPENCV
+
+#endif // RUBY_OPENCV_GUI_TRACKBAR_H
+

data/ext/opencv/window.h

@@ -1,66 +1,66 @@
-/************************************************************
-
-   window.h -
-
-   $Author: lsxi $
-
-   Copyright (C) 2005-2006 Masakazu Yonekura
-
-************************************************************/
-#ifndef RUBY_OPENCV_GUI_H
-#include "gui.h"
-#endif
-
-#ifndef RUBY_OPENCV_GUI_WINDOW_H
-#define RUBY_OPENCV_GUI_WINDOW_H
-
-#include "opencv.h"
-#define __NAMESPACE_BEGIN_WINDOW namespace cWindow {
-#define __NAMESPACE_END_WINDOW }
-
-__NAMESPACE_BEGIN_OPENCV
-__NAMESPACE_BEGIN_GUI
-
-typedef struct Window {
-  VALUE name;
-  VALUE image;
-  VALUE trackbars;
-  VALUE blocks;
-} Window;
-
-__NAMESPACE_BEGIN_WINDOW
-
-void define_ruby_class();
-
-VALUE rb_allocate(VALUE klass);
-
-void window_mark(void *ptr);
-void window_free(void *ptr);
-VALUE rb_alive_q(VALUE self);
-VALUE rb_initialize(int argc, VALUE *argv, VALUE self);
-VALUE rb_destroy(VALUE self);
-VALUE rb_destroy_all(VALUE klass);
-VALUE rb_resize(int argc, VALUE *argv, VALUE self);
-VALUE rb_move(int argc, VALUE *argv, VALUE self);
-VALUE rb_show_image(VALUE self, VALUE img);
-VALUE rb_set_trackbar(int argc, VALUE *argv, VALUE self);
-VALUE rb_set_mouse_callback(int argc, VALUE* argv, VALUE self);
-
-inline Window*
-WINDOW(VALUE object) {
-  Window *ptr;
-  Data_Get_Struct(object, Window, ptr);
-  return ptr;
-}
-
-inline const char*
-GET_WINDOW_NAME(VALUE object) {
-  return StringValueCStr(WINDOW(object)->name);
-}
-
-__NAMESPACE_END_WINDOW
-__NAMESPACE_END_GUI
-__NAMESPACE_END_OPENCV
-
-#endif // RUBY_OPENCV_GUI_WINDOW_H
-
+/************************************************************
+
+   window.h -
+
+   $Author: lsxi $
+
+   Copyright (C) 2005-2006 Masakazu Yonekura
+
+************************************************************/
+#ifndef RUBY_OPENCV_GUI_H
+#include "gui.h"
+#endif
+
+#ifndef RUBY_OPENCV_GUI_WINDOW_H
+#define RUBY_OPENCV_GUI_WINDOW_H
+
+#include "opencv.h"
+#define __NAMESPACE_BEGIN_WINDOW namespace cWindow {
+#define __NAMESPACE_END_WINDOW }
+
+__NAMESPACE_BEGIN_OPENCV
+__NAMESPACE_BEGIN_GUI
+
+typedef struct Window {
+  VALUE name;
+  VALUE image;
+  VALUE trackbars;
+  VALUE blocks;
+} Window;
+
+__NAMESPACE_BEGIN_WINDOW
+
+void define_ruby_class();
+
+VALUE rb_allocate(VALUE klass);
+
+void window_mark(void *ptr);
+void window_free(void *ptr);
+VALUE rb_alive_q(VALUE self);
+VALUE rb_initialize(int argc, VALUE *argv, VALUE self);
+VALUE rb_destroy(VALUE self);
+VALUE rb_destroy_all(VALUE klass);
+VALUE rb_resize(int argc, VALUE *argv, VALUE self);
+VALUE rb_move(int argc, VALUE *argv, VALUE self);
+VALUE rb_show_image(VALUE self, VALUE img);
+VALUE rb_set_trackbar(int argc, VALUE *argv, VALUE self);
+VALUE rb_set_mouse_callback(int argc, VALUE* argv, VALUE self);
+
+inline Window*
+WINDOW(VALUE object) {
+  Window *ptr;
+  Data_Get_Struct(object, Window, ptr);
+  return ptr;
+}
+
+inline const char*
+GET_WINDOW_NAME(VALUE object) {
+  return StringValueCStr(WINDOW(object)->name);
+}
+
+__NAMESPACE_END_WINDOW
+__NAMESPACE_END_GUI
+__NAMESPACE_END_OPENCV
+
+#endif // RUBY_OPENCV_GUI_WINDOW_H
+

data/lib/opencv/version.rb

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

data/ruby-opencv.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-opencv"
-  s.version = "0.0.9.20130505072136"
+  s.version = "0.0.10.pre.20130803014724"
 
-  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-05-04"
+  s.date = "2013-08-02"
   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"]
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "ruby-opencv"
-  s.rubygems_version = "2.0.3"
+  s.rubygems_version = "2.0.6"
   s.summary = "OpenCV wrapper for Ruby"
   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"]
 
@@ -28,17 +28,17 @@ Gem::Specification.new do |s|
       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.6"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.7"])
     else
       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.6"])
+      s.add_dependency(%q<hoe>, ["~> 3.7"])
     end
   else
     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.6"])
+    s.add_dependency(%q<hoe>, ["~> 3.7"])
   end
 end

data/test/test_cvmat_imageprocessing.rb

@@ -1169,10 +1169,10 @@ class TestCvMat_imageprocessing < OpenCVTestCase
   end
 
   def test_flood_fill
-    mat0 = create_cvmat(128, 128, :cv8u, 1) { |j, i, c|
-      if (i >= 32 and i < 96) and (j >= 32 and j < 96)
+    mat0 = create_cvmat(128, 256, :cv8u, 1) { |j, i, c|
+      if (i >= 32 and i < 224) and (j >= 32 and j < 96)
         CvScalar.new(255)
-      elsif (i >= 16 and i < 112) and (j >= 16 and j < 112)
+      elsif (i >= 16 and i < 240) and (j >= 16 and j < 112)
         CvScalar.new(192)
       else
         CvScalar.new(128)
@@ -1189,50 +1189,40 @@ class TestCvMat_imageprocessing < OpenCVTestCase
     mat5, comp5, mask5 = mat05.flood_fill!(point, 0, CvScalar.new(0), CvScalar.new(64),
                                            {:connectivity => 8, :fixed_range => true, :mask_only => true})
 
-    assert_equal('8c6a235fdf4c9c4f6822a45daac5b1af', hash_img(mat1))
-    assert_equal(5120.0, comp1.area)
+    assert_equal(9216.0, comp1.area)
     assert_equal(16, comp1.rect.x)
     assert_equal(16, comp1.rect.y)
-    assert_equal(96, comp1.rect.width)
+    assert_equal(224, comp1.rect.width)
     assert_equal(96, comp1.rect.height)
     assert_cvscalar_equal(CvScalar.new(0, 0, 0, 0), comp1.value)
-    assert_equal('1fd2537966283987b39c8b2c9d778383', hash_img(mask1))
 
-    assert_equal('7456e5de74bb8b4e783d04bbf1904644', hash_img(mat2))
-    assert_equal(12288.0, comp2.area)
+    assert_equal(20480.0, comp2.area)
     assert_equal(0, comp2.rect.x)
     assert_equal(0, comp2.rect.y)
-    assert_equal(128, comp2.rect.width)
+    assert_equal(256, comp2.rect.width)
     assert_equal(128, comp2.rect.height)
     assert_cvscalar_equal(CvScalar.new(0, 0, 0, 0), comp2.value)
-    assert_equal('847934f5170e2072cdfd63e16a1e06ad', hash_img(mask2))
 
-    assert_equal('df720005423762ca1b68e06571f58b21', hash_img(mat3))
-    assert_equal(9216.0, comp3.area)
+    assert_equal(21504.0, comp3.area)
     assert_equal(16, comp3.rect.x)
     assert_equal(16, comp3.rect.y)
-    assert_equal(96, comp3.rect.width)
+    assert_equal(224, comp3.rect.width)
     assert_equal(96, comp3.rect.height)
     assert_cvscalar_equal(CvScalar.new(0, 0, 0, 0), comp3.value)
 
-    assert_equal('7833f4c85c77056db71e33ae8072a1b5', hash_img(mat4))
-    assert_equal(9216.0, comp4.area)
+    assert_equal(21504.0, comp4.area)
     assert_equal(16, comp4.rect.x)
     assert_equal(16, comp4.rect.y)
-    assert_equal(96, comp4.rect.width)
+    assert_equal(224, comp4.rect.width)
     assert_equal(96, comp4.rect.height)
-    assert_cvscalar_equal(CvScalar.new(220, 0, 0, 0), comp4.value)
-    assert_equal('b34b0269872fe3acde0e0c73e5cdd23b', hash_img(mask4))
+    assert_cvscalar_equal(CvScalar.new(228, 0, 0, 0), comp4.value)
 
-    assert_equal('7833f4c85c77056db71e33ae8072a1b5', hash_img(mat5))
-    assert_equal('7833f4c85c77056db71e33ae8072a1b5', hash_img(mat05))
-    assert_equal(9216.0, comp5.area)
+    assert_equal(21504.0, comp5.area)
     assert_equal(16, comp5.rect.x)
     assert_equal(16, comp5.rect.y)
-    assert_equal(96, comp5.rect.width)
+    assert_equal(224, comp5.rect.width)
     assert_equal(96, comp5.rect.height)
-    assert_cvscalar_equal(CvScalar.new(220, 0, 0, 0), comp5.value)
-    assert_equal('b34b0269872fe3acde0e0c73e5cdd23b', hash_img(mask5))
+    assert_cvscalar_equal(CvScalar.new(228, 0, 0, 0), comp5.value)
 
     assert_raise(TypeError) {
       mat0.flood_fill(DUMMY_OBJ, 0)