Ruby 2.4 fixes

liamwhite · liamwhite · commit af14c1dd9414 · 2017-01-20T11:45:41.000Z
diff --git a/ext/opencv/cvchain.cpp b/ext/opencv/cvchain.cpp
@@ -62,7 +62,7 @@ rb_initialize(int argc, VALUE *argv, VALUE self)
     raise_cverror(e);
   }
   CvSeq* self_ptr = CVSEQ(self);
-  cCvSeq::register_elem_class(self_ptr, rb_cFixnum);
+  cCvSeq::register_elem_class(self_ptr, rb_cInteger);
   register_root_object(self_ptr, storage_value);
 
   return self;
diff --git a/ext/opencv/cvseq.cpp b/ext/opencv/cvseq.cpp
@@ -43,7 +43,7 @@ eltype2class(int eltype, VALUE* ret) {
     break;
   case CV_SEQ_ELTYPE_CODE:
   case CV_SEQ_ELTYPE_INDEX:
-    *ret = rb_cFixnum;
+    *ret = rb_cInteger;
     break;
   case CV_SEQ_ELTYPE_PPOINT: // or CV_SEQ_ELTYPE_PTR:
     // Not supported
@@ -132,7 +132,7 @@ class2seq_flags_value(VALUE klass) {
   else if (klass == cCvPoint3D32f::rb_class()) {
     seq_flags = CV_SEQ_ELTYPE_POINT3D;
   }
-  else if (klass == rb_cFixnum) {
+  else if (klass == rb_cInteger) {
     seq_flags = CV_SEQ_ELTYPE_INDEX;
   }
   else {
@@ -421,7 +421,7 @@ rb_pop(VALUE self)
   VALUE object = Qnil;
   VALUE klass = seqblock_class(seq);
   try {
-    if (klass == rb_cFixnum) {
+    if (klass == rb_cInteger) {
       int n = 0;
       cvSeqPop(seq, &n);
       object = INT2FIX(n);
@@ -489,7 +489,7 @@ rb_shift(VALUE self)
 
   VALUE object = Qnil;
   try {
-    if (seqblock_class(seq) == rb_cFixnum) {
+    if (seqblock_class(seq) == rb_cInteger) {
       int n = 0;
       cvSeqPopFront(seq, &n);
       object = INT2NUM(n);
@@ -525,7 +525,7 @@ rb_each(VALUE self)
   if (seq->total > 0) {
     VALUE klass = seqblock_class(seq);
     try {
-      if (klass == rb_cFixnum)
+      if (klass == rb_cInteger)
 	for (int i = 0; i < seq->total; ++i)
 	  rb_yield(INT2NUM(*CV_GET_SEQ_ELEM(int, seq, i)));
       else
@@ -570,7 +570,7 @@ rb_insert(VALUE self, VALUE index, VALUE object)
   if (CLASS_OF(object) != klass)
     rb_raise(rb_eTypeError, "arguments should be %s.", rb_class2name(klass));
   try {
-    if (klass == rb_cFixnum) {
+    if (klass == rb_cInteger) {
       int n = NUM2INT(object);
       cvSeqInsert(seq, NUM2INT(index), &n);
     }

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ rb_initialize(int argc, VALUE *argv, VALUE self)`
`62`	`62`	`raise_cverror(e);`
`63`	`63`	`}`
`64`	`64`	`CvSeq* self_ptr = CVSEQ(self);`
`65`		`- cCvSeq::register_elem_class(self_ptr, rb_cFixnum);`
	`65`	`+ cCvSeq::register_elem_class(self_ptr, rb_cInteger);`
`66`	`66`	`register_root_object(self_ptr, storage_value);`
`67`	`67`
`68`	`68`	`return self;`