v4l2-ruby 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f8083f496de211116f0a2b5bd514ee0b59cf6d8aef1e252eab63ab95c30af21
-  data.tar.gz: ec5a62fe43ee8ed4e204f1bbf2650b82dcbbb76d4113a06ca2fa8b8d2515789e
+  metadata.gz: be244fd6bc1590054d5f177e8eea4e446f1f526b1d0d3bee2a9ff91bb0eb9fb9
+  data.tar.gz: d31e3955aca0938c4e4a131323877c44c55d223ef14e8366c2beba30768f78fb
 SHA512:
-  metadata.gz: e17288b2172260ed25e884d34d5d243550704f5b00761a984ed48ce37564fadd2eae41876cbe014381d3456870c2477e956b1795b052567f24a73cf417558d64
-  data.tar.gz: 767a8ce16f952a7271d6b7c81325c8c2e0b4501ebecd865071020560b2dafb8b6bbfa05a6b9572c50ddf8243a7c47af7ff1da4a777295586e1ba9729d85cc257
+  metadata.gz: 300875132ad4b5c060a1eb7ddfaff65040d28a902559bb120f4ec271c13d1e9ffc3f225415fbbb6930303e8fcefc0de85780149178ba7569bc4d39f090a5d323
+  data.tar.gz: b84fd83a6cd1f2141009a6032765be37334b9c8fa7edbf591245d7d6223984d70ebd005017262cb7a92bd61da7964e3ddee47d142965ac07c178136896c4d739

data/ext/v4l2/v4l2.c

@@ -16,6 +16,7 @@
 #define N(x)                            (sizeof((x))/sizeof(*(x)))
 
 extern rb_encoding* rb_utf8_encoding(void);
+extern rb_encoding* rb_default_internal_encoding(void);
 
 static VALUE module;
 static VALUE camera_klass;
@@ -153,9 +154,12 @@ get_menu_list(camera_t* ptr, int ctrl, int min, int max)
     err = camera_get_menu_item(ptr, ctrl, i, &item);
     if (!err) {
       VALUE tmp;
+      VALUE name;
 
-      tmp = rb_obj_alloc(menu_item_klass);
-      rb_ivar_set(tmp, id_iv_name, rb_str_new2((const char*)item.name));
+      tmp  = rb_obj_alloc(menu_item_klass);
+      name = rb_enc_str_new_cstr((const char*)item.name, rb_utf8_encoding());
+
+      rb_ivar_set(tmp, id_iv_name, name);
       rb_ivar_set(tmp, id_iv_index, INT2FIX(item.index));
       
       rb_ary_push(ret, tmp);
@@ -178,9 +182,12 @@ get_int_menu_list(camera_t* ptr, int ctrl, int min, int max)
     err = camera_get_menu_item(ptr, ctrl, i, &item);
     if (!err) {
       VALUE tmp;
+      VALUE name;
+
+      tmp  = rb_obj_alloc(menu_item_klass);
+      name = rb_enc_sprintf(rb_utf8_encoding(), "%lld", item.value);
 
-      tmp = rb_obj_alloc(menu_item_klass);
-      rb_ivar_set(tmp, id_iv_name, rb_sprintf("%lld", item.value));
+      rb_ivar_set(tmp, id_iv_name, name);
       rb_ivar_set(tmp, id_iv_index, INT2FIX(item.index));
       
       rb_ary_push(ret, tmp);
@@ -194,6 +201,7 @@ static VALUE
 get_control_info(camera_t* ptr, int ctrl)
 {
   VALUE ret;
+  VALUE name;
   int err; 
   struct v4l2_queryctrl info;
 
@@ -202,8 +210,11 @@ get_control_info(camera_t* ptr, int ctrl)
   if (!err) {
       switch (info.type) {
       case V4L2_CTRL_TYPE_INTEGER:
-        ret = rb_obj_alloc(integer_klass);
-        rb_ivar_set(ret, id_iv_name, rb_str_new2((const char*)info.name));
+        ret  = rb_obj_alloc(integer_klass);
+        name = rb_enc_str_new_cstr((const char*)info.name,
+                                   rb_utf8_encoding());
+
+        rb_ivar_set(ret, id_iv_name, name);
         rb_ivar_set(ret, id_iv_id, INT2NUM(info.id));
         rb_ivar_set(ret, id_iv_min, INT2FIX(info.minimum));
         rb_ivar_set(ret, id_iv_max, INT2FIX(info.maximum));
@@ -212,15 +223,21 @@ get_control_info(camera_t* ptr, int ctrl)
         break;
 
       case V4L2_CTRL_TYPE_BOOLEAN:
-        ret = rb_obj_alloc(boolean_klass);
-        rb_ivar_set(ret, id_iv_name, rb_str_new2((const char*)info.name));
+        ret  = rb_obj_alloc(boolean_klass);
+        name = rb_enc_str_new_cstr((const char*)info.name,
+                                   rb_utf8_encoding());
+
+        rb_ivar_set(ret, id_iv_name, name);
         rb_ivar_set(ret, id_iv_id, INT2NUM(info.id));
         rb_ivar_set(ret, id_iv_default, (info.default_value)? Qtrue: Qfalse);
         break;
 
       case V4L2_CTRL_TYPE_MENU:
-        ret = rb_obj_alloc(menu_klass);
-        rb_ivar_set(ret, id_iv_name, rb_str_new2((const char*)info.name));
+        ret  = rb_obj_alloc(menu_klass);
+        name = rb_enc_str_new_cstr((const char*)info.name,
+                                   rb_utf8_encoding());
+
+        rb_ivar_set(ret, id_iv_name, name);
         rb_ivar_set(ret, id_iv_id, INT2NUM(info.id));
         rb_ivar_set(ret, id_iv_default, INT2FIX(info.default_value));
         rb_ivar_set(ret, id_iv_items,
@@ -228,8 +245,11 @@ get_control_info(camera_t* ptr, int ctrl)
         break;
 
       case V4L2_CTRL_TYPE_INTEGER_MENU:
-        ret = rb_obj_alloc(menu_klass);
-        rb_ivar_set(ret, id_iv_name, rb_str_new2((const char*)info.name));
+        ret  = rb_obj_alloc(menu_klass);
+        name = rb_enc_str_new_cstr((const char*)info.name,
+                                   rb_utf8_encoding());
+
+        rb_ivar_set(ret, id_iv_name, name);
         rb_ivar_set(ret, id_iv_id, INT2NUM(info.id));
         rb_ivar_set(ret, id_iv_default, INT2FIX(info.default_value));
         rb_ivar_set(ret, id_iv_items,
@@ -352,6 +372,7 @@ rb_camera_get_support_formats(VALUE self)
 
   VALUE fmt;
   VALUE fcc;
+  VALUE str;
 
   Data_Get_Struct(self, camera_t, ptr);
 
@@ -362,13 +383,18 @@ rb_camera_get_support_formats(VALUE self)
     if (err) break;
 
     fmt = rb_obj_alloc(fmt_desc_klass);
-    fcc = rb_sprintf("%c%c%c%c",
-                     desc.pixelformat >>  0 & 0xff,
-                     desc.pixelformat >>  8 & 0xff,
-                     desc.pixelformat >> 16 & 0xff,
-                     desc.pixelformat >> 24 & 0xff);
+    fcc = rb_enc_sprintf(rb_utf8_encoding(),
+                         "%c%c%c%c",
+                         desc.pixelformat >>  0 & 0xff,
+                         desc.pixelformat >>  8 & 0xff,
+                         desc.pixelformat >> 16 & 0xff,
+                         desc.pixelformat >> 24 & 0xff);
+
+    str = rb_enc_str_new_cstr((const char*)desc.description,
+                               rb_utf8_encoding());
+
     rb_ivar_set(fmt, id_iv_fcc, fcc);
-    rb_ivar_set(fmt, id_iv_desc, rb_str_new2(desc.description));
+    rb_ivar_set(fmt, id_iv_desc, str);
     
     rb_ary_push(ret, fmt);
   }
@@ -481,14 +507,32 @@ rb_camera_get_frame_capabilities(VALUE self, VALUE fmt)
 }
 
 static VALUE
-rb_camera_set_control(VALUE self, VALUE id, VALUE val)
+rb_camera_set_control(VALUE self, VALUE id, VALUE _val)
 {
   camera_t* ptr;
   int err;
+  int val;
 
   Data_Get_Struct(self, camera_t, ptr);
 
-  err = camera_set_control(ptr, FIX2INT(id), FIX2INT(val));
+  switch (TYPE(_val)) {
+  case T_TRUE:
+    val = 1;
+    break;
+
+  case T_FALSE:
+    val = 0;
+    break;
+
+  case T_FIXNUM:
+    val = FIX2INT(_val);
+    break;
+
+  default:
+    rb_raise(rb_eTypeError, "invalid type of control value");
+  }
+
+  err = camera_set_control(ptr, FIX2INT(id), val);
   if (err) {
     rb_raise(rb_eRuntimeError, "set control failed.");
   }
@@ -953,8 +997,8 @@ Init_v4l2()
   id_iv_driver  = rb_intern_const("@driver");
   id_iv_bus     = rb_intern_const("@bus");
   id_iv_id      = rb_intern_const("@id");
-  id_iv_min     = rb_intern_const("@max");
-  id_iv_max     = rb_intern_const("@min");
+  id_iv_min     = rb_intern_const("@min");
+  id_iv_max     = rb_intern_const("@max");
   id_iv_step    = rb_intern_const("@step");
   id_iv_default = rb_intern_const("@default");
   id_iv_items   = rb_intern_const("@items");

data/lib/v4l2/version.rb

@@ -1,3 +1,3 @@
 module Video4Linux2
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/v4l2-ruby.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{V4L2 insterface library for ruby}
   spec.description   = %q{V4L2 insterface library for ruby}
   spec.homepage      = "https://github.com/kwgt/v4l2-ruby"
+  spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -27,12 +28,15 @@ Gem::Specification.new do |spec|
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
+
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.extensions    = ["ext/v4l2/extconf.rb"]
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 2.4.0"
+
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rake-compiler"
+  spec.add_development_dependency "rake-compiler", "~> 1.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: v4l2-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Hiroshi Kuwagata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-16 00:00:00.000000000 Z
+date: 2019-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.7
 description: V4L2 insterface library for ruby
 email:
 - kgt9221@gmail.com
@@ -72,7 +72,8 @@ files:
 - lib/v4l2/version.rb
 - v4l2-ruby.gemspec
 homepage: https://github.com/kwgt/v4l2-ruby
-licenses: []
+licenses:
+- MIT
 metadata:
   homepage_uri: https://github.com/kwgt/v4l2-ruby
 post_install_message: 
@@ -83,15 +84,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: V4L2 insterface library for ruby