From ca813d4f714b00be40d9de1d9143e5a9ffbf5944 Mon Sep 17 00:00:00 2001 From: Francois Deschenes Date: Tue, 24 Jul 2018 22:37:05 -0700 Subject: [PATCH] Fixed warnings. --- ext/opencv/cascadeclassifier.cpp | 2 +- ext/opencv/mat.cpp | 6 +++--- ext/opencv/point.cpp | 3 +-- ext/opencv/rect.cpp | 2 +- ext/opencv/scalar.cpp | 6 +++--- ext/opencv/size.cpp | 2 +- ext/opencv/trackbar.cpp | 2 +- ext/opencv/videocapture.cpp | 2 +- ext/opencv/window.cpp | 8 ++++---- 9 files changed, 16 insertions(+), 17 deletions(-) diff --git a/ext/opencv/cascadeclassifier.cpp b/ext/opencv/cascadeclassifier.cpp index f50ed5d..8c7a19a 100644 --- a/ext/opencv/cascadeclassifier.cpp +++ b/ext/opencv/cascadeclassifier.cpp @@ -17,7 +17,7 @@ namespace rubyopencv { VALUE rb_klass = Qnil; rb_data_type_t opencv_cascadeclassifier_type = { "CascadeClassifier", - { 0, free_cascadeclassifier, memsize_cascadeclassifier, 0 }, + { 0, free_cascadeclassifier, memsize_cascadeclassifier, }, 0, 0, 0 diff --git a/ext/opencv/mat.cpp b/ext/opencv/mat.cpp index 96d09da..2700feb 100644 --- a/ext/opencv/mat.cpp +++ b/ext/opencv/mat.cpp @@ -20,7 +20,7 @@ namespace rubyopencv { VALUE rb_klass = Qnil; rb_data_type_t opencv_mat_type = { "Mat", - { 0, free_mat, memsize_mat, 0 }, + { 0, free_mat, memsize_mat, }, 0, 0, 0 @@ -258,7 +258,7 @@ namespace rubyopencv { if (!NIL_P(params)) { Check_Type(params, T_ARRAY); - int size = RARRAY_LEN(params); + long size = RARRAY_LEN(params); for (long i = 0; i < size; i++) { VALUE n = rb_ary_entry(params, i); params_value.push_back(NUM2INT(n)); @@ -1218,7 +1218,7 @@ namespace rubyopencv { rb_define_alias(rb_klass, "height", "rows"); rb_define_method(rb_klass, "cols", RUBY_METHOD_FUNC(rb_cols), 0); rb_define_alias(rb_klass, "width", "cols"); - + rb_define_method(rb_klass, "dims", RUBY_METHOD_FUNC(rb_dims), 0); rb_define_method(rb_klass, "depth", RUBY_METHOD_FUNC(rb_depth), 0); rb_define_method(rb_klass, "channels", RUBY_METHOD_FUNC(rb_channels), 0); diff --git a/ext/opencv/point.cpp b/ext/opencv/point.cpp index 067f49b..2fd25b4 100644 --- a/ext/opencv/point.cpp +++ b/ext/opencv/point.cpp @@ -12,7 +12,7 @@ namespace rubyopencv { VALUE rb_klass = Qnil; rb_data_type_t opencv_point_type = { "Point", - { 0, free_point, memsize_point, 0 }, + { 0, free_point, memsize_point, }, 0, 0, 0 @@ -169,4 +169,3 @@ namespace rubyopencv { } } } - diff --git a/ext/opencv/rect.cpp b/ext/opencv/rect.cpp index c2aa6ee..69a44dd 100644 --- a/ext/opencv/rect.cpp +++ b/ext/opencv/rect.cpp @@ -15,7 +15,7 @@ namespace rubyopencv { VALUE rb_klass = Qnil; rb_data_type_t opencv_rect_type = { "Rect", - { 0, free_rect, memsize_rect, 0 }, + { 0, free_rect, memsize_rect, }, 0, 0, 0 diff --git a/ext/opencv/scalar.cpp b/ext/opencv/scalar.cpp index 312eab0..abe0ece 100644 --- a/ext/opencv/scalar.cpp +++ b/ext/opencv/scalar.cpp @@ -11,7 +11,7 @@ namespace rubyopencv { VALUE rb_klass = Qnil; rb_data_type_t opencv_scalar_type = { "Scalar", - { 0, free_scalar, memsize_scalar, 0 }, + { 0, free_scalar, memsize_scalar, }, 0, 0, 0 @@ -28,7 +28,7 @@ namespace rubyopencv { VALUE klass() { return rb_klass; } - + cv::Scalar* obj2scalar(VALUE obj) { cv::Scalar* ptr = NULL; TypedData_Get_Struct(obj, cv::Scalar, &opencv_scalar_type, ptr); @@ -114,7 +114,7 @@ namespace rubyopencv { return rb_ary_new3(4, rb_aref(self, INT2FIX(0)), rb_aref(self, INT2FIX(1)), rb_aref(self, INT2FIX(2)), rb_aref(self, INT2FIX(3))); } - + void init() { VALUE opencv = rb_define_module("Cv"); diff --git a/ext/opencv/size.cpp b/ext/opencv/size.cpp index 045286a..0a2ab6a 100644 --- a/ext/opencv/size.cpp +++ b/ext/opencv/size.cpp @@ -13,7 +13,7 @@ namespace rubyopencv { VALUE rb_klass = Qnil; rb_data_type_t opencv_size_type = { "Size", - { 0, free_size, memsize_size, 0 }, + { 0, free_size, memsize_size, }, 0, 0, 0 diff --git a/ext/opencv/trackbar.cpp b/ext/opencv/trackbar.cpp index 6821622..4dff260 100644 --- a/ext/opencv/trackbar.cpp +++ b/ext/opencv/trackbar.cpp @@ -14,7 +14,7 @@ namespace rubyopencv { VALUE rb_klass = Qnil; rb_data_type_t opencv_trackbar_type = { "Trackbar", - { mark_trackbar, free_trackbar, 0, 0 }, + { mark_trackbar, free_trackbar, 0, }, 0, 0, 0 diff --git a/ext/opencv/videocapture.cpp b/ext/opencv/videocapture.cpp index 3539ec7..09d0591 100644 --- a/ext/opencv/videocapture.cpp +++ b/ext/opencv/videocapture.cpp @@ -18,7 +18,7 @@ namespace rubyopencv { VALUE rb_klass = Qnil; rb_data_type_t opencv_videocapture_type = { "VideoCapture", - { 0, free_videocapture, memsize_videocapture, 0 }, + { 0, free_videocapture, memsize_videocapture, }, 0, 0, 0 diff --git a/ext/opencv/window.cpp b/ext/opencv/window.cpp index 9f9ef9d..450f343 100644 --- a/ext/opencv/window.cpp +++ b/ext/opencv/window.cpp @@ -12,7 +12,7 @@ namespace rubyopencv { VALUE rb_klass; rb_data_type_t opencv_window_type = { "Window", - { mark_window, free_window, 0, 0 }, + { mark_window, free_window, 0, }, 0, 0, 0 @@ -43,7 +43,7 @@ namespace rubyopencv { window_t* w = obj2window(obj); return StringValueCStr(w->name); } - + /* * Creates a window. * @@ -63,8 +63,8 @@ namespace rubyopencv { char* name_str = StringValueCStr(name); if (cvGetWindowHandle(name_str) != NULL) { rb_raise(rb_eStandardError, "window name should be unique."); - } - + } + int mode = CV_WINDOW_AUTOSIZE; if (argc == 2) { Check_Type(flags, T_FIXNUM);