bonanza-ruby-opencv 0.0.13.20160706180126 → 0.0.13.20170103170729

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24f1afcafaf9f0107b5da52232ea80a6c92c8c66
-  data.tar.gz: 09b9c6b8d74f204033453bed56cfd153f3bbb4c9
+  metadata.gz: 4b8b6ede2d88a28c3046cc19e81688b8c918956b
+  data.tar.gz: 97e6bd52ad70913551b7ccfa884ed88463694e70
 SHA512:
-  metadata.gz: ba416c3ca597e23b0a5cc3e178454900348544ea3a94229d8c3db3526dc217157cf44583c2b156baa181b2bf88cceb1449213cd672c582a89a6b085c530cd2ae
-  data.tar.gz: 468a46fdbf7e51db03ffdaa9f9ffab3916479e52f9ef44db84e0e50e2de9b5beaa1edc0ae6a451500d625af1349d2bf7da4d78eb0b13c829146e3efa51f7e9a1
+  metadata.gz: 47f88a62f00c3c3b2116a2b7106834e9eb7cafc2108313ad38674b196d41cf35d187a05b632215827a4c81428d53e4881dcbd23bce9ccf57d9f7c1b87d6be870
+  data.tar.gz: 2ed38a4df87cdf9507e2fa1dcb850fac2072eb1c87e06f9fd52b29a0612389fc050c41d9db897ceabf9050d1c93c15fd55331611d9e5f951365f93e7c67cb4a4

data/ext/opencv/cvchain.cpp

@@ -62,7 +62,11 @@ rb_initialize(int argc, VALUE *argv, VALUE self)
     raise_cverror(e);
   }
   CvSeq* self_ptr = CVSEQ(self);
+#ifdef RUBY_INTEGER_UNIFICATION
+  cCvSeq::register_elem_class(self, rb_cInteger);
+#else
   cCvSeq::register_elem_class(self, rb_cFixnum);
+#endif
   register_root_object(self_ptr, storage_value);
 
   return self;

data/ext/opencv/cvhistogram.cpp

@@ -257,6 +257,36 @@ rb_aref(VALUE self, VALUE args)
   return rb_float_new((double)value);
 }
 
+VALUE
+rb_at(VALUE self, VALUE x)
+{
+  float value = 0.0;
+  CvHistogram* self_ptr = CVHISTOGRAM(self);
+  try {
+    value = cvQueryHistValue_1D(self_ptr, NUM2INT(x));
+  }
+  catch (cv::Exception& e) {
+    raise_cverror(e);
+  }
+  
+  return rb_float_new((double)value);
+}
+
+VALUE
+rb_at_3d(VALUE self, VALUE x, VALUE y, VALUE z)
+{
+  float value = 0.0;
+  CvHistogram* self_ptr = CVHISTOGRAM(self);
+  try {
+    value = cvQueryHistValue_3D(self_ptr, NUM2INT(x), NUM2INT(y), NUM2INT(z));
+  }
+  catch (cv::Exception& e) {
+    raise_cverror(e);
+  }
+  
+  return rb_float_new((double)value);
+}
+
 /*
  * Finds the minimum and maximum histogram bins.
  * @overload min_max_value
@@ -682,6 +712,8 @@ init_ruby_class()
   rb_define_method(rb_klass, "calc_hist", RUBY_METHOD_FUNC(rb_calc_hist), -1);
   rb_define_method(rb_klass, "calc_hist!", RUBY_METHOD_FUNC(rb_calc_hist_bang), -1);
   rb_define_method(rb_klass, "[]", RUBY_METHOD_FUNC(rb_aref), -2);
+  rb_define_method(rb_klass, "at", RUBY_METHOD_FUNC(rb_at), 1);
+  rb_define_method(rb_klass, "at_3d", RUBY_METHOD_FUNC(rb_at_3d), 3);
   rb_define_alias(rb_klass, "query_hist_value", "[]");
   rb_define_method(rb_klass, "min_max_value", RUBY_METHOD_FUNC(rb_min_max_value), 0);
   rb_define_method(rb_klass, "copy_hist", RUBY_METHOD_FUNC(rb_copy_hist), 0);

data/ext/opencv/cvmat.cpp

@@ -5192,6 +5192,35 @@ rb_flood_fill_bang(int argc, VALUE *argv, VALUE self)
   return rb_ary_new3(3, self, cCvRect::new_object(cvRect(rect.x, rect.y, rect.width, rect.height)), mask);
 }
 
+VALUE
+rb_flood_fill_mask(VALUE self, VALUE seed_point, VALUE mask, VALUE lo_diff, VALUE up_diff, VALUE connectivity, VALUE fixed_range)
+{
+  int flags = NUM2INT(connectivity);
+  if (RTEST(fixed_range)) {
+    flags |= CV_FLOODFILL_FIXED_RANGE;
+  }
+  flags |= CV_FLOODFILL_MASK_ONLY;
+  cv::Rect rect;
+  try {
+    cv::Mat selfMat(CVMAT(self));
+    cv::Mat maskMat(CVMAT(mask));
+
+    cv::floodFill(
+      selfMat,
+      maskMat,
+      cv::Point(VALUE_TO_CVPOINT(seed_point)),
+      cv::Scalar(cvScalar(0)),
+      &rect,
+      cv::Scalar(NIL_P(lo_diff) ? cvScalar(0) : VALUE_TO_CVSCALAR(lo_diff)),
+      cv::Scalar(NIL_P(up_diff) ? cvScalar(0) : VALUE_TO_CVSCALAR(up_diff)),
+      flags);
+  }
+  catch (cv::Exception& e) {
+    raise_cverror(e);
+  }
+  return cCvRect::new_object(cvRect(rect.x, rect.y, rect.width, rect.height));
+}
+
 /*
  * Finds contours in binary image.
  *
@@ -6845,6 +6874,7 @@ init_ruby_class()
 
   rb_define_method(rb_klass, "flood_fill", RUBY_METHOD_FUNC(rb_flood_fill), -1);
   rb_define_method(rb_klass, "flood_fill!", RUBY_METHOD_FUNC(rb_flood_fill_bang), -1);
+  rb_define_method(rb_klass, "flood_fill_mask", RUBY_METHOD_FUNC(rb_flood_fill_mask), 6);
   rb_define_method(rb_klass, "find_contours", RUBY_METHOD_FUNC(rb_find_contours), -1);
   rb_define_method(rb_klass, "find_contours!", RUBY_METHOD_FUNC(rb_find_contours_bang), -1);
   rb_define_method(rb_klass, "draw_contours", RUBY_METHOD_FUNC(rb_draw_contours), -1);

data/ext/opencv/cvseq.cpp

@@ -88,7 +88,11 @@ rb_initialize(int argc, VALUE *argv, VALUE self)
     raise_typeerror(klass, rb_cClass);
 
   int type = 0, size = 0;
+#ifdef RUBY_INTEGER_UNIFICATION
+  if (klass == rb_cInteger) {
+#else
   if (klass == rb_cFixnum) {
+#endif
     type = CV_SEQ_ELTYPE_INDEX;
     size = sizeof(int);
   }
@@ -170,7 +174,11 @@ rb_aref(VALUE self, VALUE index)
 
   VALUE result = Qnil;
   try {
+#ifdef RUBY_INTEGER_UNIFICATION
+    if (seqblock_class(self) == rb_cInteger)
+#else
     if (seqblock_class(self) == rb_cFixnum)
+#endif
       result = INT2NUM(*CV_GET_SEQ_ELEM(int, seq, idx));
     else
       result = REFER_OBJECT(seqblock_class(self), cvGetSeqElem(seq, idx), self);
@@ -352,7 +360,11 @@ rb_pop(VALUE self)
   VALUE object = Qnil;
   VALUE klass = seqblock_class(self);
   try {
+#ifdef RUBY_INTEGER_UNIFICATION
+    if (klass == rb_cInteger) {
+#else
     if (klass == rb_cFixnum) {
+#endif
       int n = 0;
       cvSeqPop(seq, &n);
       object = INT2FIX(n);
@@ -420,7 +432,11 @@ rb_shift(VALUE self)
 
   VALUE object = Qnil;
   try {
+#ifdef RUBY_INTEGER_UNIFICATION
+    if (seqblock_class(self) == rb_cInteger) {
+#else
     if (seqblock_class(self) == rb_cFixnum) {
+#endif
       int n = 0;
       cvSeqPopFront(seq, &n);
       object = INT2NUM(n);
@@ -456,7 +472,11 @@ rb_each(VALUE self)
   if (seq->total > 0) {
     VALUE klass = seqblock_class(self);
     try {
+#ifdef RUBY_INTEGER_UNIFICATION
+      if (klass == rb_cInteger)
+#else
       if (klass == rb_cFixnum)
+#endif
 	for (int i = 0; i < seq->total; ++i)
 	  rb_yield(INT2NUM(*CV_GET_SEQ_ELEM(int, seq, i)));
       else
@@ -501,7 +521,11 @@ rb_insert(VALUE self, VALUE index, VALUE object)
   if (CLASS_OF(object) != klass)
     rb_raise(rb_eTypeError, "arguments should be %s.", rb_class2name(klass));
   try {
+#ifdef RUBY_INTEGER_UNIFICATION
+    if (klass == rb_cInteger) {
+#else
     if (klass == rb_cFixnum) {
+#endif
       int n = NUM2INT(object);
       cvSeqInsert(seq, NUM2INT(index), &n);
     }

data/ruby-opencv.gemspec

@@ -1,15 +1,15 @@
 # -*- encoding: utf-8 -*-
-# stub: ruby-opencv 0.0.13.20160706180126 ruby lib
+# stub: ruby-opencv 0.0.13.20170103170729 ruby lib
 # stub: ext/opencv/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "bonanza-ruby-opencv"
-  s.version = "0.0.13.20160706180126"
+  s.version = "0.0.13.20170103170729"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["lsxi", "ser1zw", "pcting"]
-  s.date = "2016-07-06"
+  s.date = "2017-01-03"
   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"]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/ruby-opencv/ruby-opencv/"
   s.licenses = ["The BSD License"]
   s.rdoc_options = ["--main", "README.md"]
-  s.rubygems_version = "2.2.2"
+  #s.rubygems_version = "2.2.2"
   s.summary = "OpenCV wrapper for Ruby"
   s.test_files = ["test/test_cvcontour.rb", "test/test_eigenfaces.rb", "test/test_cvmoments.rb", "test/test_cvseq.rb", "test/test_cvcontourtree.rb", "test/test_cvbox2d.rb", "test/test_iplimage.rb", "test/test_cvvideowriter.rb", "test/test_cvline.rb", "test/test_cvhumoments.rb", "test/test_cvfont.rb", "test/test_cvconnectedcomp.rb", "test/test_cvhistogram.rb", "test/test_trackbar.rb", "test/test_cvmat_imageprocessing.rb", "test/test_cvhaarclassifiercascade.rb", "test/test_cvcircle32f.rb", "test/test_cvcapture.rb", "test/test_cvmat_dxt.rb", "test/test_cvrect.rb", "test/test_iplconvkernel.rb", "test/test_cvsurfpoint.rb", "test/test_cvavgcomp.rb", "test/test_cvscalar.rb", "test/test_pointset.rb", "test/test_curve.rb", "test/test_cvtermcriteria.rb", "test/test_cvtwopoints.rb", "test/test_cvsurfparams.rb", "test/test_cvpoint2d32f.rb", "test/test_cvpoint3d32f.rb", "test/test_cvfeaturetree.rb", "test/test_mouseevent.rb", "test/test_cvchain.rb", "test/test_cvmat.rb", "test/test_fisherfaces.rb", "test/test_cverror.rb", "test/test_cvpoint.rb", "test/test_cvsize2d32f.rb", "test/test_preliminary.rb", "test/test_cvmat_drawing.rb", "test/test_lbph.rb", "test/test_cvsize.rb", "test/test_window.rb", "test/test_cvslice.rb", "test/test_opencv.rb"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonanza-ruby-opencv
 version: !ruby/object:Gem::Version
-  version: 0.0.13.20160706180126
+  version: 0.0.13.20170103170729
 platform: ruby
 authors:
 - lsxi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -346,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: OpenCV wrapper for Ruby