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

Merge branch 'master' into documentation

Browse source 
Conflicts:
	ext/opencv/cvmat.cpp
This commit is contained in:
ser1zw 2012-10-28 13:52:15 +09:00
commit 55cf3593cc
7 changed files with 40 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/opencv/cvseq.cpp
View file

@ -332,13 +332,13 @@ rb_seq_push(VALUE self, VALUE args, int flag)
{
CvSeq *seq = CVSEQ(self);
VALUE klass = seqblock_class(seq), object;
void *elem = NULL;
volatile void *elem = NULL;
int len = RARRAY_LEN(args);
for (int i = 0; i < len; ++i) {
object = RARRAY_PTR(args)[i];
if (CLASS_OF(object) == klass) {
if (TYPE(object) == T_FIXNUM) {
int int_elem = FIX2INT(object);
volatile int int_elem = FIX2INT(object);
elem = &int_elem;
}
else {
@ -346,9 +346,9 @@ rb_seq_push(VALUE self, VALUE args, int flag)
}
try {
if (flag == CV_FRONT)
cvSeqPushFront(seq, elem);
cvSeqPushFront(seq, (const void*)elem);
else
cvSeqPush(seq, elem);
cvSeqPush(seq, (const void*)elem);
}
catch (cv::Exception& e) {
raise_cverror(e);