bonanza-ruby-opencv 0.0.13.20160519171728 → 0.0.13.20160606151615

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7d609b9040a2e58f9f47a7cf61f96b68068c9a1
-  data.tar.gz: ab4c125c8b62c3eeaf8b59416923cf8067a3e712
+  metadata.gz: 91bfc9008859d46d0479cd66dfca85f5e5ddb9f5
+  data.tar.gz: 70ee2ee23b9045d84afae30f5743279b132c2bdc
 SHA512:
-  metadata.gz: 1ae802e14e96b7f72fb8f861740718af0fc663f906268d9f258ba4a570da1cebcaa2863ba7fc67c1e73ae5504b522aa10a7a1231f2cf245a39647cf2feae9fd8
-  data.tar.gz: 7837c1b1b0b62d494fcfc5756cb77fe45deb7d69c143a812d5a3abe4f7aa80fc96973741c009337b51a1fae1ed6b86a9f1e24a91d1c9c98c49d1c9b858aa2543
+  metadata.gz: 3ea2b575c88cf9329f292fb616ee99b1d08de15b6dbf92a24f98744456f96ab455f5f1f712ef379f6384cf65e3abbd5d365973316ce094de75aaadd0e96b0b8f
+  data.tar.gz: b9b6f58531636b5dc8e89d7b75a6d1b54d26ac5a8f7af0ddeafc0a593e5c7dc011836c0b2e448a0ae86e06003bc95bc6edabcea29ecb3a24086cdbf2a8a9c1f3

data/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, rb_cFixnum);
   register_root_object(self_ptr, storage_value);
 
   return self;

data/ext/opencv/cvcontour.cpp

@@ -65,7 +65,7 @@ rb_initialize(int argc, VALUE *argv, VALUE self)
   catch (cv::Exception& e) {
     raise_cverror(e);
   }
-  cCvSeq::register_elem_class(CVSEQ(self), cCvPoint::rb_class());
+  cCvSeq::register_elem_class(self, cCvPoint::rb_class());
   register_root_object(CVSEQ(self), storage);
 
   return self;

data/ext/opencv/cvseq.cpp

@@ -39,8 +39,6 @@ VALUE rb_allocate(VALUE klass);
 void cvseq_free(void *ptr);
 
 VALUE rb_klass;
-// contain sequence-block class
-st_table *seqblock_klass_table = st_init_numtable();
 
 VALUE
 rb_class()
@@ -49,35 +47,26 @@ rb_class()
 }
 
 VALUE
-seqblock_class(void *ptr)
+seqblock_class(VALUE object)
 {
-  VALUE klass;
-  if (!st_lookup(seqblock_klass_table, (st_data_t)ptr, (st_data_t*)&klass)) {
+  VALUE klass = rb_iv_get(object, "@elem_class");
+  if (!RTEST(klass)) {
     rb_raise(rb_eTypeError, "Invalid sequence error.");
   }
   return klass;
 }
 
 void
-register_elem_class(CvSeq *seq, VALUE klass)
+register_elem_class(VALUE object, VALUE klass)
 {
-  st_insert(seqblock_klass_table, (st_data_t)seq, (st_data_t)klass);
-}
-
-void
-unregister_elem_class(void *ptr)
-{
-  if (ptr) {
-    st_delete(seqblock_klass_table, (st_data_t*)&ptr, NULL);
-    unregister_object(ptr);
-  }
+  rb_iv_set(object, "@elem_class", klass);
 }
 
 VALUE
 rb_allocate(VALUE klass)
 {
   CvSeq *ptr = ALLOC(CvSeq);
-  return Data_Wrap_Struct(klass, 0, unregister_elem_class, ptr);
+  return Data_Wrap_Struct(klass, 0, 0, ptr);
 }
 
 /*
@@ -133,7 +122,7 @@ rb_initialize(int argc, VALUE *argv, VALUE self)
     raise_cverror(e);
   }
   DATA_PTR(self) = seq;
-  register_elem_class(seq, klass);
+  register_elem_class(self, klass);
   register_root_object(seq, storage_value);
   
   return self;
@@ -181,10 +170,10 @@ rb_aref(VALUE self, VALUE index)
 
   VALUE result = Qnil;
   try {
-    if (seqblock_class(seq) == rb_cFixnum)
+    if (seqblock_class(self) == rb_cFixnum)
       result = INT2NUM(*CV_GET_SEQ_ELEM(int, seq, idx));
     else
-      result = REFER_OBJECT(seqblock_class(seq), cvGetSeqElem(seq, idx), self);
+      result = REFER_OBJECT(seqblock_class(self), cvGetSeqElem(seq, idx), self);
   }
   catch (cv::Exception& e) {
     raise_cverror(e);
@@ -228,7 +217,7 @@ rb_h_prev(VALUE self)
 {
   CvSeq *seq = CVSEQ(self);
   if (seq->h_prev)
-    return new_sequence(CLASS_OF(self), seq->h_prev, seqblock_class(seq), lookup_root_object(seq));
+    return new_sequence(CLASS_OF(self), seq->h_prev, seqblock_class(self), lookup_root_object(seq));
   else
     return Qnil;
 }
@@ -245,7 +234,7 @@ rb_h_next(VALUE self)
 {
   CvSeq *seq = CVSEQ(self);
   if (seq->h_next)
-    return new_sequence(CLASS_OF(self), seq->h_next, seqblock_class(seq), lookup_root_object(seq));
+    return new_sequence(CLASS_OF(self), seq->h_next, seqblock_class(self), lookup_root_object(seq));
   else
     return Qnil;
 }
@@ -262,7 +251,7 @@ rb_v_prev(VALUE self)
 {
   CvSeq *seq = CVSEQ(self);
   if (seq->v_prev)
-    return new_sequence(CLASS_OF(self), seq->v_prev, seqblock_class(seq), lookup_root_object(seq));
+    return new_sequence(CLASS_OF(self), seq->v_prev, seqblock_class(self), lookup_root_object(seq));
   else
     return Qnil;
 }
@@ -279,7 +268,7 @@ rb_v_next(VALUE self)
 {
   CvSeq *seq = CVSEQ(self);
   if (seq->v_next)
-    return new_sequence(CLASS_OF(self), seq->v_next, seqblock_class(seq), lookup_root_object(seq));
+    return new_sequence(CLASS_OF(self), seq->v_next, seqblock_class(self), lookup_root_object(seq));
   else
     return Qnil;
 }
@@ -288,7 +277,7 @@ VALUE
 rb_seq_push(VALUE self, VALUE args, int flag)
 {
   CvSeq *seq = CVSEQ(self);
-  VALUE klass = seqblock_class(seq), object;
+  VALUE klass = seqblock_class(self), object;
   volatile void *elem = NULL;
   int len = RARRAY_LEN(args);
   for (int i = 0; i < len; ++i) {
@@ -361,7 +350,7 @@ rb_pop(VALUE self)
     return Qnil;
   
   VALUE object = Qnil;
-  VALUE klass = seqblock_class(seq);
+  VALUE klass = seqblock_class(self);
   try {
     if (klass == rb_cFixnum) {
       int n = 0;
@@ -431,13 +420,13 @@ rb_shift(VALUE self)
 
   VALUE object = Qnil;
   try {
-    if (seqblock_class(seq) == rb_cFixnum) {
+    if (seqblock_class(self) == rb_cFixnum) {
       int n = 0;
       cvSeqPopFront(seq, &n);
       object = INT2NUM(n);
     }
     else {
-      object = GENERIC_OBJECT(seqblock_class(seq), malloc(seq->elem_size));
+      object = GENERIC_OBJECT(seqblock_class(self), malloc(seq->elem_size));
       cvSeqPopFront(seq, DATA_PTR(object));
     }
   }
@@ -465,7 +454,7 @@ rb_each(VALUE self)
 {
   CvSeq *seq = CVSEQ(self);
   if (seq->total > 0) {
-    VALUE klass = seqblock_class(seq);
+    VALUE klass = seqblock_class(self);
     try {
       if (klass == rb_cFixnum)
 	for (int i = 0; i < seq->total; ++i)
@@ -508,7 +497,7 @@ rb_insert(VALUE self, VALUE index, VALUE object)
 {
   Check_Type(index, T_FIXNUM);
   CvSeq *seq = CVSEQ(self);
-  VALUE klass = seqblock_class(seq);
+  VALUE klass = seqblock_class(self);
   if (CLASS_OF(object) != klass)
     rb_raise(rb_eTypeError, "arguments should be %s.", rb_class2name(klass));
   try {
@@ -547,10 +536,11 @@ VALUE
 new_sequence(VALUE klass, CvSeq *seq, VALUE element_klass, VALUE storage)
 {
   register_root_object(seq, storage);
-  rb_gc_mark(storage);
-  if (!NIL_P(element_klass))
-    register_elem_class(seq, element_klass);
-  return Data_Wrap_Struct(klass, mark_root_object, unregister_elem_class, seq);
+  VALUE object = Data_Wrap_Struct(klass, mark_root_object, 0, seq);
+  if (!NIL_P(element_klass)) {
+    register_elem_class(object, element_klass);
+  }
+  return object;
 }
 
 void

data/ext/opencv/cvseq.h

@@ -21,9 +21,8 @@ __NAMESPACE_BEGIN_CVSEQ
 VALUE rb_class();
 void init_ruby_class();
 
-VALUE seqblock_class(void *ptr);
-void register_elem_class(CvSeq *seq, VALUE klass);
-void unregister_elem_class(void *ptr);
+VALUE seqblock_class(VALUE object);
+void register_elem_class(VALUE object, VALUE klass);
 
 VALUE rb_allocate(VALUE klass);
 

data/ruby-opencv.gemspec

@@ -1,15 +1,15 @@
 # -*- encoding: utf-8 -*-
-# stub: ruby-opencv 0.0.13.20160519171728 ruby lib
+# stub: ruby-opencv 0.0.13.20160606151615 ruby lib
 # stub: ext/opencv/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "bonanza-ruby-opencv"
-  s.version = "0.0.13.20160519171728"
+  s.version = "0.0.13.20160606151615"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["lsxi", "ser1zw", "pcting"]
-  s.date = "2016-05-20"
+  s.date = "2016-06-06"
   s.description = "ruby-opencv is a wrapper of OpenCV for Ruby. It helps you to write computer vision programs (e.g. detecting faces from pictures) with Ruby."
   s.email = ["masakazu.yonekura@gmail.com", "azariahsawtikes@gmail.com", "pcting@gmail.com"]
   s.extensions = ["ext/opencv/extconf.rb"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonanza-ruby-opencv
 version: !ruby/object:Gem::Version
-  version: 0.0.13.20160519171728
+  version: 0.0.13.20160606151615
 platform: ruby
 authors:
 - lsxi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc