kotovalexarian-likes-github/ruby-opencv
1
0
Fork 0
mirror of https://github.com/ruby-opencv/ruby-opencv synced 2023-03-27 23:22:12 -04:00
Code Releases Activity

fix Point

Browse source
This commit is contained in:
ser1zw 2016-04-03 07:15:11 +09:00
parent 6c2b8a6ad8
commit c235d72f00
1 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

43
ext/opencv/point.cpp
View file

@ -1,3 +1,4 @@
#include <sstream>
#include "ruby.h" #include "ruby.h"
#include "opencv2/core.hpp" #include "opencv2/core.hpp"
@ -36,7 +37,9 @@ namespace rubyopencv {
return cv::Point(NUM2INT(rb_funcall(obj, rb_intern("x"), 0)), return cv::Point(NUM2INT(rb_funcall(obj, rb_intern("x"), 0)),
NUM2INT(rb_funcall(obj, rb_intern("y"), 0))); NUM2INT(rb_funcall(obj, rb_intern("y"), 0)));
} }
rb_raise(rb_eArgError, "x y"); rb_raise(rb_eTypeError, "wrong argument type %s (expected %s or compatible object)",
rb_obj_classname(obj), rb_class2name(rb_klass));
throw;
} }
void free_point(void* ptr) { void free_point(void* ptr) {
@ -70,9 +73,9 @@ namespace rubyopencv {
selfptr->y = 0; selfptr->y = 0;
break; break;
case 1: { case 1: {
// cv::Point point = VALUE_TO_CVPOINT(argv[0]); cv::Point point = conpatible_obj2point(v1);
// selfptr->x = point.x; selfptr->x = point.x;
// selfptr->y = point.y; selfptr->y = point.y;
break; break;
} }
case 2: case 2:
@ -120,26 +123,30 @@ namespace rubyopencv {
} }
/* /*
* call-seq: * Return x and y as an +String+.
* to_s -> string
* *
* Return x and y by String. * @overload to_s
* @return [String] String representation of the point
*/ */
VALUE rb_to_s(VALUE self) { VALUE rb_to_s(VALUE self) {
const int i = 4; std::stringstream s;
VALUE str[i]; cv::Point* selfptr = obj2point(self);
str[0] = rb_str_new2("<%s:(%d,%d)>"); s << *selfptr;
str[1] = rb_str_new2(rb_class2name(CLASS_OF(self)));
str[2] = rb_x(self); VALUE param[3];
str[3] = rb_y(self); param[0] = rb_str_new2("#<%s:%s>");
return rb_f_sprintf(i, str); param[1] = rb_str_new2(rb_class2name(CLASS_OF(self)));
param[2] = rb_str_new2(s.str().c_str());
int n = sizeof(param) / sizeof(param[0]);
return rb_f_sprintf(n, param);
} }
/* /*
* call-seq: * Return x and y as an +Array+.
* to_a -> [x, y]
* *
* Return x and y by Array. * @overload to_a
* @return [Array<Integer>] Array representation of the point
*/ */
VALUE rb_to_a(VALUE self) { VALUE rb_to_a(VALUE self) {
cv::Point* selfptr = obj2point(self); cv::Point* selfptr = obj2point(self);
@ -151,7 +158,6 @@ namespace rubyopencv {
rb_klass = rb_define_class_under(opencv, "Point", rb_cData); rb_klass = rb_define_class_under(opencv, "Point", rb_cData);
rb_define_alloc_func(rb_klass, rb_allocate); rb_define_alloc_func(rb_klass, rb_allocate);
// rb_define_singleton_method(rb_klass, "compatible?", RUBY_METHOD_FUNC(rb_compatible_q), 1);
rb_define_method(rb_klass, "initialize", RUBY_METHOD_FUNC(rb_initialize), -1); rb_define_method(rb_klass, "initialize", RUBY_METHOD_FUNC(rb_initialize), -1);
rb_define_method(rb_klass, "x", RUBY_METHOD_FUNC(rb_x), 0); rb_define_method(rb_klass, "x", RUBY_METHOD_FUNC(rb_x), 0);
rb_define_method(rb_klass, "x=", RUBY_METHOD_FUNC(rb_set_x), 1); rb_define_method(rb_klass, "x=", RUBY_METHOD_FUNC(rb_set_x), 1);
@ -160,7 +166,6 @@ namespace rubyopencv {
rb_define_method(rb_klass, "to_s", RUBY_METHOD_FUNC(rb_to_s), 0); rb_define_method(rb_klass, "to_s", RUBY_METHOD_FUNC(rb_to_s), 0);
rb_define_method(rb_klass, "to_a", RUBY_METHOD_FUNC(rb_to_a), 0); rb_define_method(rb_klass, "to_a", RUBY_METHOD_FUNC(rb_to_a), 0);
// rb_define_alias(rb_klass, "to_a", "to_ary");
} }
} }
} }