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 #78

Browse source
This commit is contained in:
ser1zw 2016-06-26 01:20:47 +09:00
parent fb7e35edbe
commit 4684a20cdf
1 changed files with 39 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

63
ext/opencv/cvseq.cpp
View file

@ -27,13 +27,48 @@ rb_class()
return rb_klass; return rb_klass;
} }
int
eltype2class(int eltype, VALUE* ret) {
int found = 1;
switch (eltype) {
case CV_SEQ_ELTYPE_POINT:
*ret = cCvPoint::rb_class();
break;
case CV_32FC2:
*ret = cCvPoint2D32f::rb_class();
break;
case CV_SEQ_ELTYPE_POINT3D:
*ret = cCvPoint3D32f::rb_class();
break;
case CV_SEQ_ELTYPE_CODE:
case CV_SEQ_ELTYPE_INDEX:
*ret = rb_cFixnum;
break;
case CV_SEQ_ELTYPE_PPOINT: // or CV_SEQ_ELTYPE_PTR:
// Not supported
rb_raise(rb_eArgError, "seq_flags %d is not supported.", eltype);
break;
default:
found = 0;
*ret = cCvPoint::rb_class();
break;
}
return found;
}
VALUE VALUE
seqblock_class(void *ptr) seqblock_class(void *ptr)
{ {
VALUE klass; VALUE klass = Qnil;
if (!st_lookup(seqblock_klass_table, (st_data_t)ptr, (st_data_t*)&klass)) { if (st_lookup(seqblock_klass_table, (st_data_t)ptr, (st_data_t*)&klass)) {
rb_raise(rb_eTypeError, "Invalid sequence error."); return klass;
} }
int eltype = CV_SEQ_ELTYPE((CvSeq*)ptr);
eltype2class(eltype, &klass);
return klass; return klass;
} }
@ -66,28 +101,8 @@ create_seq(int seq_flags, size_t header_size, VALUE storage_value)
int eltype = seq_flags & CV_SEQ_ELTYPE_MASK; int eltype = seq_flags & CV_SEQ_ELTYPE_MASK;
storage_value = CHECK_CVMEMSTORAGE(storage_value); storage_value = CHECK_CVMEMSTORAGE(storage_value);
switch (eltype) { if (!eltype2class(eltype, &klass)) {
case CV_SEQ_ELTYPE_POINT:
klass = cCvPoint::rb_class();
break;
case CV_32FC2:
klass = cCvPoint2D32f::rb_class();
break;
case CV_SEQ_ELTYPE_POINT3D:
klass = cCvPoint3D32f::rb_class();
break;
case CV_SEQ_ELTYPE_CODE:
case CV_SEQ_ELTYPE_INDEX:
klass = rb_cFixnum;
break;
case CV_SEQ_ELTYPE_PPOINT: // or CV_SEQ_ELTYPE_PTR:
// Not supported
rb_raise(rb_eArgError, "seq_flags %d is not supported.", eltype);
break;
default:
seq_flags = CV_SEQ_ELTYPE_POINT | CV_SEQ_KIND_GENERIC; seq_flags = CV_SEQ_ELTYPE_POINT | CV_SEQ_KIND_GENERIC;
klass = cCvPoint::rb_class();
break;
} }
int mat_type = CV_MAT_TYPE(seq_flags); int mat_type = CV_MAT_TYPE(seq_flags);