bonanza-ruby-opencv 0.0.13.20170125170729 → 0.0.13.20200923185241

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6a884f55d0a5e88c4393a0d6d13d7a1bb51d4f0f
-  data.tar.gz: 7f38d043686b63e14740c8e6d7da27999fe1c164
+SHA256:
+  metadata.gz: b1e5119a7a5d2271845769949eddcaccd0a519c3afd373f967b4b7c6a19880a6
+  data.tar.gz: 05c6480bfdc0f25d07fdc6e4e1d79ee6be8a1ddf94f2d9aabcc7654bd3f6598e
 SHA512:
-  metadata.gz: 73b43d88566af75058ed0f4499b199e77413dbe8ac4900a47589a8348c5c525f234d4887563d64ed9c58406b4e1a5e0457048339fe35cfb64ad2b052efc35fdc
-  data.tar.gz: 203cc626d1141f44ca04c489656cf90e3fbb30540c6ecf87a53cdf941b939279271fde48479526dd6105769c429a045f9b85e8d8264b9fc277a8b90814d2114f
+  metadata.gz: 645336822d5bed3ce63d416646bfa96fe040d4f868af99546e0247abdbc1103be5fac7009340a759271bb2c2be16a7ec4d5e74328e50a9f7fe055c641906da6d
+  data.tar.gz: 9ecc114298d4f79d2d57f30bb8630125c089104d9a7aee0c14dd3b95826f6cc19c590e64b5eae380a56397e7143f81749c7e0227e4a9f2ffd92d4a5180e4d25d

data/ext/opencv/cvhistogram.cpp

@@ -95,19 +95,19 @@ rb_initialize(int argc, VALUE *argv, VALUE self)
 
   rb_scan_args(argc, argv, "32", &_dims, &_sizes, &_type, &_ranges, &_uniform);
   int sizes_len = RARRAY_LEN(_sizes);
-  sizes = ALLOCA_N(int, sizes_len);
+  sizes = RB_ALLOC_N(int, sizes_len);
 
   if (NIL_P(_ranges)) {
     sizes = ary2intptr(_sizes, sizes);
     ranges = NULL;
   }
   else {
-    ranges = ALLOCA_N(float*, sizes_len);
+    ranges = RB_ALLOC_N(float*, sizes_len);
     VALUE* range_ptr = RARRAY_PTR(_ranges);
     int i;
     for (i = 0; i < sizes_len; i++) {
       sizes[i] = NUM2INT(RARRAY_PTR(_sizes)[i]);
-      ranges[i] = ary2fltptr(range_ptr[i], ALLOCA_N(float, 2));
+      ranges[i] = ary2fltptr(range_ptr[i], RB_ALLOC_N(float, 2));
     }
   }
   uniform = TRUE_OR_FALSE(_uniform, 1);
@@ -193,7 +193,7 @@ rb_calc_hist_bang(int argc, VALUE* argv, VALUE self)
   rb_scan_args(argc, argv, "12", &images, &accumulate, &mask);
   Check_Type(images, T_ARRAY);
   int num_images = RARRAY_LEN(images);
-  IplImage** img = ALLOCA_N(IplImage*, num_images);
+  IplImage** img = RB_ALLOC_N(IplImage*, num_images);
   VALUE* images_ptr = RARRAY_PTR(images);
   for (int i = 0; i < num_images; i++) {
     img[i] = IPLIMAGE_WITH_CHECK(images_ptr[i]);
@@ -226,7 +226,7 @@ VALUE
 rb_aref(VALUE self, VALUE args)
 {
   int num_idx = RARRAY_LEN(args);
-  int* idx = ALLOCA_N(int, num_idx);
+  int* idx = RB_ALLOC_N(int, num_idx);
   VALUE* args_ptr = RARRAY_PTR(args);
   for (int i = 0; i < num_idx; i++) {
     idx[i] = NUM2INT(args_ptr[i]);
@@ -309,8 +309,8 @@ rb_min_max_value(VALUE self)
   int *max_idx = NULL;
   try {
     dims = cvGetDims(self_ptr->bins, NULL);
-    min_idx = ALLOCA_N(int, dims);
-    max_idx = ALLOCA_N(int, dims);
+    min_idx = RB_ALLOC_N(int, dims);
+    max_idx = RB_ALLOC_N(int, dims);
     cvGetMinMaxHistValue(CVHISTOGRAM(self), &min_value, &max_value, min_idx, max_idx);
   }
   catch (cv::Exception& e) {
@@ -523,10 +523,10 @@ rb_set_hist_bin_ranges_bang(int argc, VALUE* argv, VALUE self)
   Check_Type(_ranges, T_ARRAY);
 
   int ranges_size = RARRAY_LEN(_ranges);
-  float** ranges = ALLOCA_N(float*, ranges_size);
+  float** ranges = RB_ALLOC_N(float*, ranges_size);
   VALUE* range_ptr = RARRAY_PTR(_ranges);
   for (int i = 0; i < ranges_size; ++i) {
-    ranges[i] = ary2fltptr(range_ptr[i], ALLOCA_N(float, 2));
+    ranges[i] = ary2fltptr(range_ptr[i], RB_ALLOC_N(float, 2));
   }
   int uniform = TRUE_OR_FALSE(_uniform, 1);
 
@@ -560,7 +560,7 @@ rb_calc_back_project(VALUE self, VALUE image)
     return Qnil;
   }
   
-  IplImage** img = ALLOCA_N(IplImage*, num_images);
+  IplImage** img = RB_ALLOC_N(IplImage*, num_images);
   VALUE* image_ptr = RARRAY_PTR(image);
   for (int i = 0; i < num_images; ++i) {
     img[i] = IPLIMAGE_WITH_CHECK(image_ptr[i]);
@@ -607,7 +607,7 @@ rb_calc_back_project_patch(VALUE self, VALUE image, VALUE patch_size, VALUE meth
     return Qnil;
   }
   
-  IplImage** img = ALLOCA_N(IplImage*, num_images);
+  IplImage** img = RB_ALLOC_N(IplImage*, num_images);
   VALUE* image_ptr = RARRAY_PTR(image);
   for (int i = 0; i < num_images; ++i) {
     img[i] = IPLIMAGE_WITH_CHECK(image_ptr[i]);

data/ext/opencv/cvmat.cpp

@@ -2098,12 +2098,21 @@ VALUE
 rb_cmp_internal(VALUE self, VALUE val, VALUE dest, int operand)
 {
   CvArr* self_ptr = CVARR(self);
+
+  if (CV_MAT_CN(cvGetElemType(self_ptr)) != 1) {
+    rb_raise(rb_eArgError, "self should be a single-channel CvMat.");
+  }
+
   try {
-    if (rb_obj_is_kind_of(val, rb_klass))
-      cvCmp(self_ptr, CVARR(val), CVARR(dest), operand);
-    else if (CV_MAT_CN(cvGetElemType(self_ptr)) == 1 && rb_obj_is_kind_of(val, rb_cNumeric))
+    if (rb_obj_is_kind_of(val, rb_klass)) {
+      CvArr* val_ptr = CVARR(val);
+      if (CV_MAT_CN(cvGetElemType(val_ptr)) != 1) {
+        rb_raise(rb_eArgError, "val should be a single-channel CvMat.");
+      }
+      cvCmp(self_ptr, val_ptr, CVARR(dest), operand);
+    } else if (rb_obj_is_kind_of(val, rb_cNumeric)) {
       cvCmpS(self_ptr, NUM2DBL(val), CVARR(dest), operand);
-    else {
+    } else {
       VALUE mat = new_mat_kind_object(cvGetSize(CVARR(self)), self);
       cvSet(CVARR(mat), VALUE_TO_CVSCALAR(val));
       cvCmp(self_ptr, CVARR(mat), CVARR(dest), operand);
@@ -3412,14 +3421,14 @@ rb_fill_poly_bang(int argc, VALUE *argv, VALUE self)
   Check_Type(polygons, T_ARRAY);
   drawing_option = DRAWING_OPTION(drawing_option);
   num_polygons = RARRAY_LEN(polygons);
-  num_points = ALLOCA_N(int, num_polygons);
+  num_points = RB_ALLOC_N(int, num_polygons);
 
-  p = ALLOCA_N(CvPoint*, num_polygons);
+  p = RB_ALLOC_N(CvPoint*, num_polygons);
   for (j = 0; j < num_polygons; ++j) {
     points = rb_ary_entry(polygons, j);
     Check_Type(points, T_ARRAY);
     num_points[j] = RARRAY_LEN(points);
-    p[j] = ALLOCA_N(CvPoint, num_points[j]);
+    p[j] = RB_ALLOC_N(CvPoint, num_points[j]);
     for (i = 0; i < num_points[j]; ++i) {
       p[j][i] = VALUE_TO_CVPOINT(rb_ary_entry(points, i));
     }
@@ -3485,7 +3494,7 @@ rb_fill_convex_poly_bang(int argc, VALUE *argv, VALUE self)
   Check_Type(points, T_ARRAY);
   drawing_option = DRAWING_OPTION(drawing_option);
   num_points = RARRAY_LEN(points);
-  p = ALLOCA_N(CvPoint, num_points);
+  p = RB_ALLOC_N(CvPoint, num_points);
   for (i = 0; i < num_points; ++i)
     p[i] = VALUE_TO_CVPOINT(rb_ary_entry(points, i));
 
@@ -3561,14 +3570,14 @@ rb_poly_line_bang(int argc, VALUE *argv, VALUE self)
   Check_Type(polygons, T_ARRAY);
   drawing_option = DRAWING_OPTION(drawing_option);
   num_polygons = RARRAY_LEN(polygons);
-  num_points = ALLOCA_N(int, num_polygons);
-  p = ALLOCA_N(CvPoint*, num_polygons);
+  num_points = RB_ALLOC_N(int, num_polygons);
+  p = RB_ALLOC_N(CvPoint*, num_polygons);
 
   for (j = 0; j < num_polygons; ++j) {
     points = rb_ary_entry(polygons, j);
     Check_Type(points, T_ARRAY);
     num_points[j] = RARRAY_LEN(points);
-    p[j] = ALLOCA_N(CvPoint, num_points[j]);
+    p[j] = RB_ALLOC_N(CvPoint, num_points[j]);
     for (i = 0; i < num_points[j]; ++i) {
       p[j][i] = VALUE_TO_CVPOINT(rb_ary_entry(points, i));
     }
@@ -3977,7 +3986,7 @@ rb_find_chessboard_corners(int argc, VALUE *argv, VALUE self)
 
   int flag = NIL_P(flag_val) ? CV_CALIB_CB_ADAPTIVE_THRESH : NUM2INT(flag_val);
   CvSize pattern_size = VALUE_TO_CVSIZE(pattern_size_val);
-  CvPoint2D32f* corners = ALLOCA_N(CvPoint2D32f, pattern_size.width * pattern_size.height);
+  CvPoint2D32f* corners = RB_ALLOC_N(CvPoint2D32f, pattern_size.width * pattern_size.height);
   int num_found_corners = 0;
   int pattern_was_found = 0;
   try {
@@ -4013,7 +4022,7 @@ rb_find_corner_sub_pix(VALUE self, VALUE corners, VALUE win_size, VALUE zero_zon
 {
   Check_Type(corners, T_ARRAY);
   int count = RARRAY_LEN(corners);
-  CvPoint2D32f* corners_buff = ALLOCA_N(CvPoint2D32f, count);
+  CvPoint2D32f* corners_buff = RB_ALLOC_N(CvPoint2D32f, count);
   VALUE* corners_ptr = RARRAY_PTR(corners);
 
   for (int i = 0; i < count; i++) {
@@ -4322,8 +4331,8 @@ rb_get_perspective_transform(VALUE self, VALUE source, VALUE dest)
 
   int count = RARRAY_LEN(source);
 
-  CvPoint2D32f* source_buff = ALLOCA_N(CvPoint2D32f, count);
-  CvPoint2D32f* dest_buff = ALLOCA_N(CvPoint2D32f, count);
+  CvPoint2D32f* source_buff = RB_ALLOC_N(CvPoint2D32f, count);
+  CvPoint2D32f* dest_buff = RB_ALLOC_N(CvPoint2D32f, count);
 
   for (int i = 0; i < count; i++) {
     source_buff[i] = *(CVPOINT2D32F(RARRAY_PTR(source)[i]));
@@ -5366,7 +5375,7 @@ rb_draw_chessboard_corners_bang(VALUE self, VALUE pattern_size, VALUE corners, V
 {
   Check_Type(corners, T_ARRAY);
   int count = RARRAY_LEN(corners);
-  CvPoint2D32f* corners_buff = ALLOCA_N(CvPoint2D32f, count);
+  CvPoint2D32f* corners_buff = RB_ALLOC_N(CvPoint2D32f, count);
   VALUE* corners_ptr = RARRAY_PTR(corners);
   for (int i = 0; i < count; i++) {
     corners_buff[i] = *(CVPOINT2D32F(corners_ptr[i]));
@@ -6057,9 +6066,9 @@ rb_snake_image(int argc, VALUE *argv, VALUE self)
 	(RARRAY_LEN(beta) != length) ||
 	(RARRAY_LEN(gamma) != length))
       rb_raise(rb_eArgError, "alpha, beta, gamma should be same size of points");
-    a = ALLOCA_N(float, length);
-    b = ALLOCA_N(float, length);
-    c = ALLOCA_N(float, length);
+    a = RB_ALLOC_N(float, length);
+    b = RB_ALLOC_N(float, length);
+    c = RB_ALLOC_N(float, length);
     for (i = 0; i < length; ++i) {
       a[i] = (float)NUM2DBL(RARRAY_PTR(alpha)[i]);
       b[i] = (float)NUM2DBL(RARRAY_PTR(beta)[i]);

data/ext/opencv/iplconvkernel.cpp

@@ -75,7 +75,7 @@ rb_initialize(int argc, VALUE *argv, VALUE self)
     if (NIL_P(values))
       rb_raise(rb_eArgError, "argument 6 (values) should not be nil when the shape is :custom.");
     num_values = RARRAY_LEN(values);
-    _values = ALLOCA_N(int, num_values);
+    _values = RB_ALLOC_N(int, num_values);
     VALUE *values_ptr = RARRAY_PTR(values);
     for (int i = 0; i < num_values; ++i)
       _values[i] = NUM2INT(values_ptr[i]);

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: bonanza-ruby-opencv
 version: !ruby/object:Gem::Version
-  version: 0.0.13.20170125170729
+  version: 0.0.13.20200923185241
 platform: ruby
 authors:
 - lsxi
 - ser1zw
 - pcting
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -328,7 +328,7 @@ homepage: https://github.com/ruby-opencv/ruby-opencv/
 licenses:
 - The BSD License
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -345,9 +345,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: OpenCV wrapper for Ruby
 test_files: