hornetseye-dc1394 0.3.1 → 0.3.2

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-dc1394'
-PKG_VERSION = '0.3.1'
+PKG_VERSION = '0.3.2'
 CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
 RB_FILES = FileList[ 'lib/**/*.rb' ]

data/lib/hornetseye-dc1394/dc1394input.rb

@@ -42,9 +42,16 @@ module Hornetseye
                 index.push i
               end
             end
-            desired = action.call frame_types
+            if action
+              desired = action.call frame_types
+            else
+              preference = [ UYVY, UBYTERGB, USINT, UBYTE ]
+              desired = frame_types.sort_by do |mode|
+                [ -preference.index( mode.typecode ), mode.width * mode.height ]
+              end.last
+            end
             unless frame_types.member? desired
-              raise "Frame type #{desired} not supported by camera" 
+              raise "Frame type #{desired.inspect} not supported by camera" 
             end
             index[ frame_types.index( desired ) ]
           end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-20 00:00:00 +00:00
+date: 2010-11-21 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency