ruby-opencv 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40401c95ab8f679c62f524003fe0a0c43abb0681
-  data.tar.gz: ffe7858c51e1ccb47c416cd465a6a0061a3c8cc6
+  metadata.gz: 4167570217e86b8b50a744e19375a4e6691f879a
+  data.tar.gz: 3bb849ae998b8330cecfcc29ba8e2cd164b0168d
 SHA512:
-  metadata.gz: 4e298023316425072af0c0ed97e681a31b8526cc1014d57ab4cfec3df804195582824b81a435676fc45d479f79d3e6de4c1a87359a6bf2ec74b4be746d7bf7bf
-  data.tar.gz: aec9e0aa7e67b5f500ca1131b52d8a4de62ca167e535398329eb09c53727e9bc2a916b114f81a93bda0dbc1a5d70e9349eab2d5df70a22d8fa80d7262b5d46fa
+  metadata.gz: a5a43d61e47c1364e42b0a33b27b589939caace91b878dcfda4174a02d0be78ac631e39c20e7b2af55766089bb01abd1c8be8a8f701542d36ef3806ddb121fb3
+  data.tar.gz: a577c48d4261d033b25fd5e72e1f108db091920604ab95d1bc7482ba129303d2bc6641ca8c5e993fa41e73c6c65588f331001eec1f84aaf5038855e60f8cd536

data/ext/opencv/cvcapture.cpp

@@ -27,8 +27,12 @@ rb_class()
 void
 cvcapture_free(void *ptr)
 { 
-  if (ptr)
-    cvReleaseCapture((CvCapture**)&ptr);
+  if (ptr) {
+    sCvCapture* scap = (sCvCapture*)ptr;
+    if (scap->opened)
+      cvReleaseCapture(&scap->ptr);
+    delete scap;
+  }
 }
 
 /*
@@ -49,6 +53,7 @@ rb_open(int argc, VALUE *argv, VALUE self)
   VALUE device;
   rb_scan_args(argc, argv, "01", &device);
   CvCapture *capture = 0;
+  sCvCapture *scap = new sCvCapture();
   try {
     switch (TYPE(device)) {
     case T_STRING:
@@ -74,7 +79,27 @@ rb_open(int argc, VALUE *argv, VALUE self)
   }
   if (!capture)
     rb_raise(rb_eStandardError, "Invalid capture format.");
-  return Data_Wrap_Struct(rb_klass, 0, cvcapture_free, capture);
+  scap->ptr = capture;
+  scap->opened = true;
+  return Data_Wrap_Struct(rb_klass, 0, cvcapture_free, scap);
+}
+
+/*
+ * Releases an opened video file or a capturing device
+ * @return [boolean] False if the device was already closed
+ */
+
+VALUE
+rb_close(VALUE self)
+{
+  sCvCapture *scap;
+  Data_Get_Struct(self, sCvCapture, scap);
+  if (scap->opened) {
+    scap->opened = false;
+    cvReleaseCapture(&scap->ptr);
+    return true;
+  } else
+    return false;
 }
 
 /*
@@ -570,6 +595,7 @@ init_ruby_class()
   rb_hash_aset(video_interface, ID2SYM(rb_intern("quicktime")), INT2FIX(CV_CAP_QT));
   
   rb_define_singleton_method(rb_klass, "open", RUBY_METHOD_FUNC(rb_open), -1);
+  rb_define_method(rb_klass, "close", RUBY_METHOD_FUNC(rb_close), 0);
   
   rb_define_method(rb_klass, "grab", RUBY_METHOD_FUNC(rb_grab), 0);
   rb_define_method(rb_klass, "retrieve", RUBY_METHOD_FUNC(rb_retrieve), 0);

data/ext/opencv/cvcapture.h

@@ -16,6 +16,12 @@
 #define __NAMESPACE_END_CVCAPTURE }
 
 __NAMESPACE_BEGIN_OPENCV
+
+typedef struct {
+  CvCapture* ptr;
+  bool opened;
+} sCvCapture;
+
 __NAMESPACE_BEGIN_CVCAPTURE
 
 
@@ -26,6 +32,8 @@ void init_ruby_class();
 void cvcapture_free(void *ptr);
 VALUE rb_open(int argc, VALUE *argv, VALUE klass);
 
+VALUE rb_close(VALUE self);
+
 VALUE rb_grab(VALUE self);
 VALUE rb_retrieve(VALUE self);
 VALUE rb_query(VALUE self);
@@ -62,9 +70,11 @@ __NAMESPACE_END_CVCAPTURE
 
 inline CvCapture*
 CVCAPTURE(VALUE object) {
-  CvCapture *ptr;
-  Data_Get_Struct(object, CvCapture, ptr);
-  return ptr;
+  sCvCapture *scap;
+  Data_Get_Struct(object, sCvCapture, scap);
+  if (!scap->opened)
+    rb_raise(rb_eIOError, "Resource is not available!");
+  return scap->ptr;
 }
 
 __NAMESPACE_END_OPENCV

data/lib/opencv/version.rb

@@ -1,4 +1,4 @@
 module OpenCV
-  VERSION = '0.0.15'
+  VERSION = '0.0.16'
 end
 

data/ruby-opencv.gemspec

@@ -1,15 +1,15 @@
 # -*- encoding: utf-8 -*-
-# stub: ruby-opencv 0.0.15.20160408012232 ruby lib
+# stub: ruby-opencv 0.0.16.20160417000540 ruby lib
 # stub: ext/opencv/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "ruby-opencv".freeze
-  s.version = "0.0.15.20160408012232"
+  s.version = "0.0.16.20160417000540"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["lsxi".freeze, "ser1zw".freeze, "pcting".freeze]
-  s.date = "2016-04-07"
+  s.date = "2016-04-16"
   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.".freeze
   s.email = ["masakazu.yonekura@gmail.com".freeze, "azariahsawtikes@gmail.com".freeze, "pcting@gmail.com".freeze]
   s.extensions = ["ext/opencv/extconf.rb".freeze]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/ruby-opencv/ruby-opencv/".freeze
   s.licenses = ["The BSD License".freeze]
   s.rdoc_options = ["--main".freeze, "README.md".freeze]
-  s.rubygems_version = "2.6.2".freeze
+  s.rubygems_version = "2.6.3".freeze
   s.summary = "OpenCV wrapper for Ruby".freeze
 
   if s.respond_to? :specification_version then

data/test/test_cvcapture.rb

@@ -50,6 +50,14 @@ class TestCvCapture < OpenCVTestCase
     # }
   end
 
+  def test_close
+    cap1 = CvCapture.open(AVI_SAMPLE)
+    cap1.close
+    assert_raise(IOError) do
+      cap1.query
+    end
+  end
+
   def test_grab
     assert(@cap.grab)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-opencv
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - lsxi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -346,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: OpenCV wrapper for Ruby