bonanza-ruby-opencv 0.0.13.20160428094028 → 0.0.13.20160519171728

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96859427571888ecbefa820f5924585031e7a3e9
-  data.tar.gz: c965897744c47aa4f9ca201bff01786a7e9df79d
+  metadata.gz: e7d609b9040a2e58f9f47a7cf61f96b68068c9a1
+  data.tar.gz: ab4c125c8b62c3eeaf8b59416923cf8067a3e712
 SHA512:
-  metadata.gz: be20d5d44ca136a99706bf6e27ca525e50d763401bc1918bfcaa838cbcd79cd64c8c626d118e271dd5912b033307f34c2cd715ebbfdb01f0229b70945cb98498
-  data.tar.gz: c177a5eaf307f024ff16e209066034760fec5a477ea2f104f5f83aecbc27f9587d6df795123b845b6cf5123af78fab20c0e0b9c1d6a9ea8003de4fd08adf917e
+  metadata.gz: 1ae802e14e96b7f72fb8f861740718af0fc663f906268d9f258ba4a570da1cebcaa2863ba7fc67c1e73ae5504b522aa10a7a1231f2cf245a39647cf2feae9fd8
+  data.tar.gz: 7837c1b1b0b62d494fcfc5756cb77fe45deb7d69c143a812d5a3abe4f7aa80fc96973741c009337b51a1fae1ed6b86a9f1e24a91d1c9c98c49d1c9b858aa2543

data/ext/opencv/cvmat.cpp

@@ -1977,6 +1977,18 @@ rb_and(int argc, VALUE *argv, VALUE self)
   return dest;
 }
 
+VALUE
+rb_and_into(VALUE self, VALUE other, VALUE dest)
+{
+  try {
+    cvAnd(CVARR(self), CVARR(other), CVARR(dest));
+  }
+  catch (cv::Exception& e) {
+    raise_cverror(e);
+  }
+  return dest;
+}
+
 /*
  * Calculates the per-element bit-wise disjunction of two arrays or an array and a scalar.
  *
@@ -2068,10 +2080,15 @@ rb_not_bang(VALUE self)
 }
 
 VALUE
-rb_cmp_internal(VALUE self, VALUE val, int operand)
+rb_cmp(VALUE self, VALUE val, VALUE dest, VALUE operand)
+{
+  return rb_cmp_internal(self, val, dest, NUM2INT(operand));
+}
+
+VALUE
+rb_cmp_internal(VALUE self, VALUE val, VALUE dest, int operand)
 {
   CvArr* self_ptr = CVARR(self);
-  VALUE dest = new_mat_kind_object(cvGetSize(self_ptr), self, CV_8U, 1);
   try {
     if (rb_obj_is_kind_of(val, rb_klass))
       cvCmp(self_ptr, CVARR(val), CVARR(dest), operand);
@@ -2101,7 +2118,8 @@ rb_cmp_internal(VALUE self, VALUE val, int operand)
 VALUE
 rb_eq(VALUE self, VALUE val)
 {
-  return rb_cmp_internal(self, val, CV_CMP_EQ);
+  VALUE dest = new_mat_kind_object(cvGetSize(CVARR(self)), self, CV_8U, 1);
+  return rb_cmp_internal(self, val, dest, CV_CMP_EQ);
 }
 
 /*
@@ -2116,7 +2134,8 @@ rb_eq(VALUE self, VALUE val)
 VALUE
 rb_gt(VALUE self, VALUE val)
 {
-  return rb_cmp_internal(self, val, CV_CMP_GT);
+  VALUE dest = new_mat_kind_object(cvGetSize(CVARR(self)), self, CV_8U, 1);
+  return rb_cmp_internal(self, val, dest, CV_CMP_GT);
 }
 
 /*
@@ -2131,7 +2150,8 @@ rb_gt(VALUE self, VALUE val)
 VALUE
 rb_ge(VALUE self, VALUE val)
 {
-  return rb_cmp_internal(self, val, CV_CMP_GE);
+  VALUE dest = new_mat_kind_object(cvGetSize(CVARR(self)), self, CV_8U, 1);
+  return rb_cmp_internal(self, val, dest, CV_CMP_GE);
 }
 
 /*
@@ -2146,7 +2166,8 @@ rb_ge(VALUE self, VALUE val)
 VALUE
 rb_lt(VALUE self, VALUE val)
 {
-  return rb_cmp_internal(self, val, CV_CMP_LT);
+  VALUE dest = new_mat_kind_object(cvGetSize(CVARR(self)), self, CV_8U, 1);
+  return rb_cmp_internal(self, val, dest, CV_CMP_LT);
 }
 
 /*
@@ -2161,7 +2182,8 @@ rb_lt(VALUE self, VALUE val)
 VALUE
 rb_le(VALUE self, VALUE val)
 {
-  return rb_cmp_internal(self, val, CV_CMP_LE);
+  VALUE dest = new_mat_kind_object(cvGetSize(CVARR(self)), self, CV_8U, 1);
+  return rb_cmp_internal(self, val, dest, CV_CMP_LE);
 }
 
 /*
@@ -2176,7 +2198,8 @@ rb_le(VALUE self, VALUE val)
 VALUE
 rb_ne(VALUE self, VALUE val)
 {
-  return rb_cmp_internal(self, val, CV_CMP_NE);
+  VALUE dest = new_mat_kind_object(cvGetSize(CVARR(self)), self, CV_8U, 1);
+  return rb_cmp_internal(self, val, dest, CV_CMP_NE);
 }
 
 /*
@@ -2400,6 +2423,19 @@ rb_avg(int argc, VALUE *argv, VALUE self)
   return cCvScalar::new_object(avg);
 }
 
+VALUE
+rb_avg_value(VALUE self, VALUE mask)
+{
+  CvScalar avg;
+  try {
+    avg = cvAvg(CVARR(self), MASK(mask));
+  }
+  catch (cv::Exception& e) {
+    raise_cverror(e);
+  }
+  return rb_float_new(avg.val[0]);
+}
+
 /*
  * Calculates a mean and standard deviation of array elements.
  * @overload avg_sdv(mask = nil)
@@ -4465,6 +4501,19 @@ rb_dilate_bang(int argc, VALUE *argv, VALUE self)
   return self;
 }
 
+VALUE
+rb_dilate_into(VALUE self, VALUE dest, VALUE element, VALUE iteration)
+{
+  IplConvKernel* kernel = NIL_P(element) ? NULL : IPLCONVKERNEL_WITH_CHECK(element);
+  try {
+    cvDilate(CVARR(self), CVARR(dest), kernel, NUM2INT(iteration));
+  }
+  catch (cv::Exception& e) {
+    raise_cverror(e);
+  }
+  return self;
+}
+
 /*
  * Performs advanced morphological transformations using erosion and dilation as basic operations.
  *
@@ -6658,12 +6707,14 @@ init_ruby_class()
   rb_define_singleton_method(rb_klass, "add_weighted", RUBY_METHOD_FUNC(rb_add_weighted), 5);
   rb_define_method(rb_klass, "and", RUBY_METHOD_FUNC(rb_and), -1);
   rb_define_alias(rb_klass, "&", "and");
+  rb_define_method(rb_klass, "and_into", RUBY_METHOD_FUNC(rb_and_into), 2);
   rb_define_method(rb_klass, "or", RUBY_METHOD_FUNC(rb_or), -1);
   rb_define_alias(rb_klass, "|", "or");
   rb_define_method(rb_klass, "xor", RUBY_METHOD_FUNC(rb_xor), -1);
   rb_define_alias(rb_klass, "^", "xor");
   rb_define_method(rb_klass, "not", RUBY_METHOD_FUNC(rb_not), 0);
   rb_define_method(rb_klass, "not!", RUBY_METHOD_FUNC(rb_not_bang), 0);
+  rb_define_method(rb_klass, "cmp", RUBY_METHOD_FUNC(rb_cmp), 3);
   rb_define_method(rb_klass, "eq", RUBY_METHOD_FUNC(rb_eq), 1);
   rb_define_method(rb_klass, "gt", RUBY_METHOD_FUNC(rb_gt), 1);
   rb_define_method(rb_klass, "ge", RUBY_METHOD_FUNC(rb_ge), 1);
@@ -6679,6 +6730,7 @@ init_ruby_class()
   rb_define_method(rb_klass, "count_non_zero", RUBY_METHOD_FUNC(rb_count_non_zero), 0);
   rb_define_method(rb_klass, "sum", RUBY_METHOD_FUNC(rb_sum), 0);
   rb_define_method(rb_klass, "avg", RUBY_METHOD_FUNC(rb_avg), -1);
+  rb_define_method(rb_klass, "avg_value", RUBY_METHOD_FUNC(rb_avg_value), 1);
   rb_define_method(rb_klass, "avg_sdv", RUBY_METHOD_FUNC(rb_avg_sdv), -1);
   rb_define_method(rb_klass, "sdv", RUBY_METHOD_FUNC(rb_sdv), -1);
   rb_define_method(rb_klass, "min_max_loc", RUBY_METHOD_FUNC(rb_min_max_loc), -1);
@@ -6751,6 +6803,7 @@ init_ruby_class()
   rb_define_method(rb_klass, "erode!", RUBY_METHOD_FUNC(rb_erode_bang), -1);
   rb_define_method(rb_klass, "dilate", RUBY_METHOD_FUNC(rb_dilate), -1);
   rb_define_method(rb_klass, "dilate!", RUBY_METHOD_FUNC(rb_dilate_bang), -1);
+  rb_define_method(rb_klass, "dilate_into", RUBY_METHOD_FUNC(rb_dilate_into), 3);
   rb_define_method(rb_klass, "morphology", RUBY_METHOD_FUNC(rb_morphology), -1);
 
   rb_define_method(rb_klass, "smooth", RUBY_METHOD_FUNC(rb_smooth), -1);

data/ext/opencv/cvmat.h

@@ -104,7 +104,7 @@ VALUE rb_or(int argc, VALUE *argv, VALUE self);
 VALUE rb_xor(int argc, VALUE *argv, VALUE self);
 VALUE rb_not(VALUE self);
 VALUE rb_not_bang(VALUE self);
-VALUE rb_cmp_internal(VALUE self, VALUE val, int operand);
+VALUE rb_cmp_internal(VALUE self, VALUE val, VALUE dest, int operand);
 VALUE rb_eq(VALUE self, VALUE val);
 VALUE rb_gt(VALUE self, VALUE val);
 VALUE rb_ge(VALUE self, VALUE val);

data/ext/opencv/opencv.cpp

@@ -234,6 +234,14 @@ init_ruby_module()
   rb_define_const(rb_module, "CV_IMWRITE_PNG_STRATEGY_FIXED", INT2FIX(CV_IMWRITE_PNG_STRATEGY_FIXED));
   rb_define_const(rb_module, "CV_IMWRITE_PXM_BINARY", INT2FIX(CV_IMWRITE_PXM_BINARY));
 
+  /* Comparison types */
+  rb_define_const(rb_module, "CV_CMP_EQ", INT2FIX(CV_CMP_EQ));
+  rb_define_const(rb_module, "CV_CMP_GT", INT2FIX(CV_CMP_GT));
+  rb_define_const(rb_module, "CV_CMP_GE", INT2FIX(CV_CMP_GE));
+  rb_define_const(rb_module, "CV_CMP_LT", INT2FIX(CV_CMP_LT));
+  rb_define_const(rb_module, "CV_CMP_LE", INT2FIX(CV_CMP_LE));
+  rb_define_const(rb_module, "CV_CMP_NE", INT2FIX(CV_CMP_NE));
+
   /* Types of morphological operations */
   rb_define_const(rb_module, "CV_MOP_OPEN", INT2FIX(CV_MOP_OPEN));
   rb_define_const(rb_module, "CV_MOP_CLOSE", INT2FIX(CV_MOP_CLOSE));

data/ruby-opencv.gemspec

@@ -1,15 +1,15 @@
 # -*- encoding: utf-8 -*-
-# stub: ruby-opencv 0.0.13.20160428094028 ruby lib
+# stub: ruby-opencv 0.0.13.20160519171728 ruby lib
 # stub: ext/opencv/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "bonanza-ruby-opencv"
-  s.version = "0.0.13.20160428094028"
+  s.version = "0.0.13.20160519171728"
 
   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-04-28"
+  s.date = "2016-05-20"
   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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonanza-ruby-opencv
 version: !ruby/object:Gem::Version
-  version: 0.0.13.20160428094028
+  version: 0.0.13.20160519171728
 platform: ruby
 authors:
 - lsxi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-05-20 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.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: OpenCV wrapper for Ruby