ruby-opencv 0.0.9 → 0.0.10.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa96af3be79ecae9c81d90111ca2846faffa5772
-  data.tar.gz: 38159ae00e9b76b4369349f2bbadc1e94c9c221b
+  metadata.gz: 8ee7ddd0ca847a2fcb2c2f17f6e7068902352e30
+  data.tar.gz: 37da69fff04151c786fd9a9dd30b899bc2d7297b
 SHA512:
-  metadata.gz: 75c85cd901e7cd17368b0a9a9dba60c4e48ac40e83a7b76257a3286aa47ac6dee5f7808697a0e6d342606ccb99d904161f55a44a2185b08f53b1df1b701c4856
-  data.tar.gz: 03ac59968a6856f97b29d7472169a6ec58dcfc61f4939cf2f686f81d00db66f9a29d8284798ab0aca3be50e30cef002704f76352a5a479bdcc32253454c85e75
+  metadata.gz: 3c88a48f85e00c9d4ac901af3118ede191feabaa1456ed127ad24d5c2d0576eabe219d9260f1886a9ecb5a7cd81be58c25176d3196a47c5efbdaf9aaa1500685
+  data.tar.gz: f2b027d0fe499193a88a7fc3aba2ec28f4d738172c4b4faf46a7e73d5d6e49b4edf4a93b366e3a3007fb2b142c30011080e44de0b3b00c1436a6900ffef8c0f5

data/.gitignore

@@ -22,4 +22,5 @@ videowriter_result.avi
 examples/contours/rotated-boxes-with-detected-bounding-rectangles.jpg
 Gemfile.lock
 .RUBYLIBDIR.*
+.RUBYARCHDIR.*
 

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.5 are supported.
+* Ruby 1.9.3, 2.0.0 and OpenCV 2.4.6.1 are supported.
 
 ## Requirement
 

data/ext/opencv/cvmat.cpp

@@ -3945,9 +3945,9 @@ rb_resize(int argc, VALUE *argv, VALUE self)
 VALUE
 rb_warp_affine(int argc, VALUE *argv, VALUE self)
 {
-  VALUE map_matrix, flags_val, option, fill_value;
+  VALUE map_matrix, flags_val, fill_value;
   VALUE dest = Qnil;
-  if (rb_scan_args(argc, argv, "13", &map_matrix, &flags_val, &option, &fill_value) < 4)
+  if (rb_scan_args(argc, argv, "12", &map_matrix, &flags_val, &fill_value) < 3)
     fill_value = INT2FIX(0);
   CvArr* self_ptr = CVARR(self);
   int flags = NIL_P(flags_val) ? (CV_INTER_LINEAR | CV_WARP_FILL_OUTLIERS) : NUM2INT(flags_val);
@@ -4755,7 +4755,7 @@ rb_flood_fill_bang(int argc, VALUE *argv, VALUE self)
   try {
     CvSize size = cvGetSize(self_ptr);
     // TODO: Change argument format to set mask
-    mask = new_object(size.width + 2, size.height + 2, CV_MAKETYPE(CV_8U, 1));
+    mask = new_object(size.height + 2, size.width + 2, CV_MAKETYPE(CV_8U, 1));
     CvMat* mask_ptr = CVMAT(mask);
     cvSetZero(mask_ptr);
     cvFloodFill(self_ptr,
@@ -5261,11 +5261,11 @@ rb_match_template(int argc, VALUE *argv, VALUE self)
  * Compares two shapes(self and object). <i>object</i> should be CvMat or CvContour.
  *
  * A - object1, B - object2:
- * * method=CV_CONTOUR_MATCH_I1
+ * * method=CV_CONTOURS_MATCH_I1
  *     I1(A,B)=sumi=1..7abs(1/mAi - 1/mBi)
- * * method=CV_CONTOUR_MATCH_I2
+ * * method=CV_CONTOURS_MATCH_I2
  *     I2(A,B)=sumi=1..7abs(mAi - mBi)
- * * method=CV_CONTOUR_MATCH_I3
+ * * method=CV_CONTOURS_MATCH_I3
  *     I3(A,B)=sumi=1..7abs(mAi - mBi)/abs(mAi)
  */
 VALUE

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

data/test/test_opencv.rb

@@ -9,10 +9,15 @@ include OpenCV
 class TestOpenCV < OpenCVTestCase
   def test_constants
     # OpenCV version
-    assert_equal('2.4.3', CV_VERSION)
+    assert_equal('2.4.6.1', CV_VERSION)
     assert_equal(2, CV_MAJOR_VERSION)
     assert_equal(4, CV_MINOR_VERSION)
-    assert_equal(3, CV_SUBMINOR_VERSION)
+    assert_equal(6, CV_SUBMINOR_VERSION)
+
+    assert_equal(2, CV_VERSION_EPOCH)
+    assert_equal(4, CV_VERSION_MAJOR)
+    assert_equal(6, CV_VERSION_MINOR)
+    assert_equal(1, CV_VERSION_REVISION)
 
     # Depths
     assert_equal(0, CV_8U)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-opencv
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10.pre
 platform: ruby
 authors:
 - lsxi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
 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:
@@ -329,12 +329,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: ruby-opencv
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: OpenCV wrapper for Ruby