hornetseye-dc1394 0.3.5 → 0.5.1

data/README.md

@@ -13,7 +13,7 @@ This Ruby extension provides the class {Hornetseye::DC1394Input} for capturing v
 
 Installation
 ------------
-*hornetseye-dc1394* requires the V4L2 headers. If you are running Debian or (K)ubuntu, you can install them like this:
+*hornetseye-dc1394* requires the DC1394 headers. If you are running Debian or (K)ubuntu, you can install them like this:
 
     $ sudo aptitude install libdc1394-22-dev
 

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-dc1394'
-PKG_VERSION = '0.3.5'
+PKG_VERSION = '0.5.1'
 CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -81,8 +81,7 @@ end
 begin
   require 'yard'
   YARD::Rake::YardocTask.new :yard do |y|
-    y.options << '--no-private'
-    y.files << FileList[ 'lib/**/*.rb' ]
+    y.files << RB_FILES
   end
 rescue LoadError
   STDERR.puts 'Please install \'yard\' if you want to generate documentation'
@@ -115,8 +114,8 @@ begin
     s.extra_rdoc_files = []
     s.rdoc_options = %w{--no-private}
     s.add_dependency %<malloc>, [ '~> 1.2' ]
-    s.add_dependency %<multiarray>, [ '~> 0.11' ]
-    s.add_dependency %<hornetseye-frame>, [ '~> 0.8' ]
+    s.add_dependency %<multiarray>, [ '~> 0.23' ]
+    s.add_dependency %<hornetseye-frame>, [ '~> 0.11' ]
     s.add_development_dependency %q{rake}
   end
   GEM_SOURCE = "#{PKG_NAME}-#{PKG_VERSION}.gem"
@@ -138,8 +137,8 @@ begin
     s.extra_rdoc_files = []
     s.rdoc_options = %w{--no-private}
     s.add_dependency %<malloc>, [ '~> 1.2' ]
-    s.add_dependency %<multiarray>, [ '~> 0.11' ]
-    s.add_dependency %<hornetseye-frame>, [ '~> 0.8' ]
+    s.add_dependency %<multiarray>, [ '~> 0.23' ]
+    s.add_dependency %<hornetseye-frame>, [ '~> 0.11' ]
   end
   GEM_BINARY = "#{PKG_NAME}-#{PKG_VERSION}-#{$BINSPEC.platform}.gem"
   desc "Build the gem file #{GEM_SOURCE}"

data/ext/init.cc

@@ -31,7 +31,7 @@ extern "C" {
 
   void Init_hornetseye_dc1394(void)
   {
-    rb_require( "hornetseye_frame" );
+    rb_eval_string( "require 'hornetseye_frame'" );
     VALUE rbHornetseye = rb_define_module( "Hornetseye" );
     DC1394::registerRubyClass( rbHornetseye );
     DC1394Input::registerRubyClass( rbHornetseye );

data/lib/hornetseye-dc1394/dc1394input.rb

@@ -54,25 +54,31 @@ module Hornetseye
                     MODE_RGB8   => UBYTERGB,
                     MODE_MONO16 => USINT }
             frame_types, index = [], []
-            modes.each_with_index do |mode,i|
-              target = map[ mode.first ]
-              if target
-                frame_types.push Hornetseye::Frame( target, *mode[ 1 .. 2 ] )
+            modes.each do |mode|
+              unless map[mode.first]
+                warn "Unsupported video mode #{"0x%08x" % mode.first} #{mode[1]}x#{mode[2]}"
+              end
+            end
+            modes.collect { |mode| [map[mode.first], *mode[1 .. 2]] }.
+              each_with_index do |mode,i|
+              if mode.first
+                frame_types.push mode
                 index.push i
               end
             end
             if action
               desired = action.call frame_types
             else
-              preference = [ UYVY, UBYTERGB, USINT, UBYTE ]
+              preference = [ UBYTERGB, UYVY, USINT, UBYTE ]
               desired = frame_types.sort_by do |mode|
-                [ -preference.index( mode.typecode ), mode.width * mode.height ]
+                [-preference.index(mode.first), mode[1] * mode[2]]
               end.last
+              raise "Device does not support a known video mode" unless desired
             end
             unless frame_types.member? desired
               raise "Frame type #{desired.inspect} not supported by camera" 
             end
-            index[ frame_types.index( desired ) ]
+            index[frame_types.index(desired)]
           end
           @@dc1394 = dc1394
           retval
@@ -83,6 +89,8 @@ module Hornetseye
 
     end
 
+    include ReaderConversion
+
   end
 
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: hornetseye-dc1394
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 5
-  version: 0.3.5
+  prerelease: 
+  version: 0.5.1
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 +00:00
-default_executable: 
+date: 2011-08-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: malloc
@@ -25,9 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
         version: "1.2"
   type: :runtime
   version_requirements: *id001
@@ -39,10 +31,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 11
-        version: "0.11"
+        version: "0.23"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -53,10 +42,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
+        version: "0.11"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -67,8 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -88,20 +72,19 @@ files:
 - lib/hornetseye_dc1394_ext.rb
 - lib/hornetseye-dc1394/dc1394input.rb
 - lib/hornetseye-dc1394/docs.rb
+- ext/init.cc
 - ext/dc1394input.cc
 - ext/dc1394select.cc
-- ext/init.cc
 - ext/dc1394.cc
 - ext/frame.cc
 - ext/frame.hh
-- ext/rubytools.hh
-- ext/dc1394input.hh
-- ext/dc1394.hh
 - ext/dc1394select.hh
-- ext/rubyinc.hh
+- ext/dc1394.hh
+- ext/rubytools.hh
 - ext/error.hh
+- ext/rubyinc.hh
+- ext/dc1394input.hh
 - ext/rubytools.tcc
-has_rdoc: yard
 homepage: http://wedesoft.github.com/hornetseye-dc1394/
 licenses: []
 
@@ -116,21 +99,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: hornetseye
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Capture from DC1394 compatible firewire camera