hornetseye-dc1394 0.2.0 → 0.2.1

data/Rakefile

@@ -7,15 +7,15 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-dc1394'
-PKG_VERSION = '0.2.0'
+PKG_VERSION = '0.2.1'
+CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
-STRIP = ENV[ 'STRIP' ] || 'strip'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
 CC_FILES = FileList[ 'ext/*.cc' ]
 HH_FILES = FileList[ 'ext/*.hh' ] + FileList[ 'ext/*.tcc' ]
 TC_FILES = FileList[ 'test/tc_*.rb' ]
 TS_FILES = FileList[ 'test/ts_*.rb' ]
-SO_FILE = "ext/#{PKG_NAME.tr '\-', '_'}.so"
+SO_FILE = "ext/#{PKG_NAME.tr '\-', '_'}.#{CFG[ 'DLEXT' ]}"
 PKG_FILES = [ 'Rakefile', 'README.md', 'COPYING', '.document' ] +
             RB_FILES + CC_FILES + HH_FILES + TS_FILES + TC_FILES
 BIN_FILES = [ 'README.md', 'COPYING', '.document', SO_FILE ] +
@@ -27,17 +27,18 @@ EMAIL = %q{jan@wedesoft.de}
 HOMEPAGE = %q{http://wedesoft.github.com/hornetseye-dc1394/}
 
 OBJ = CC_FILES.ext 'o'
-$CXXFLAGS = ENV[ 'CXXFLAGS' ] || ''
-$CXXFLAGS = "#{$CXXFLAGS} -fPIC -DNDEBUG"
-if RbConfig::CONFIG[ 'rubyhdrdir' ]
-  $CXXFLAGS = "#{$CXXFLAGS} -I#{RbConfig::CONFIG[ 'rubyhdrdir' ]} " +
-             "-I#{RbConfig::CONFIG[ 'rubyhdrdir' ]}/#{RbConfig::CONFIG[ 'arch' ]}"
+$CXXFLAGS = "-DNDEBUG #{CFG[ 'CPPFLAGS' ]} #{CFG[ 'CFLAGS' ]}"
+if CFG[ 'rubyhdrdir' ]
+  $CXXFLAGS = "#{$CXXFLAGS} -I#{CFG[ 'rubyhdrdir' ]} " + 
+              "-I#{CFG[ 'rubyhdrdir' ]}/#{CFG[ 'arch' ]}"
 else
-  $CXXFLAGS = "#{$CXXFLAGS} -I#{RbConfig::CONFIG[ 'archdir' ]}"
+  $CXXFLAGS = "#{$CXXFLAGS} -I#{CFG[ 'archdir' ]}"
 end
-$LIBRUBYARG = RbConfig::CONFIG[ 'LIBRUBYARG' ]
-$SITELIBDIR = RbConfig::CONFIG[ 'sitelibdir' ]
-$SITEARCHDIR = RbConfig::CONFIG[ 'sitearchdir' ]
+$LIBRUBYARG = "-L#{CFG[ 'libdir' ]} #{CFG[ 'LIBRUBYARG' ]} #{CFG[ 'LDFLAGS' ]} " +
+              "#{CFG[ 'SOLIBS' ]} #{CFG[ 'DLDLIBS' ]}"
+$SITELIBDIR = CFG[ 'sitelibdir' ]
+$SITEARCHDIR = CFG[ 'sitearchdir' ]
+$LDSHARED = CFG[ 'LDSHARED' ][ CFG[ 'LDSHARED' ].index( ' ' ) .. -1 ]
 
 task :default => :all
 
@@ -46,7 +47,6 @@ task :all => [ SO_FILE ]
 
 file SO_FILE => OBJ do |t|
    sh "#{CXX} -shared -o #{t.name} #{OBJ} -ldc1394 #{$LIBRUBYARG}"
-   sh "#{STRIP} --strip-all #{t.name}"
 end
 
 task :test => [ SO_FILE ]
@@ -171,7 +171,7 @@ rule '.o' => '.cc' do |t|
 end
 
 file ".depends.mf" do |t|
-  sh "g++ -MM #{$CXXFLAGS} #{CC_FILES.join ' '} | " +
+  sh "g++ -MM #{CC_FILES.join ' '} | " +
     "sed -e :a -e N -e 's/\\n/\\$/g' -e ta | " +
     "sed -e 's/ *\\\\\\$ */ /g' -e 's/\\$/\\n/g' | sed -e 's/^/ext\\//' > #{t.name}"
 end

data/ext/dc1394input.cc

@@ -25,7 +25,7 @@ using namespace std;
 
 VALUE DC1394Input::cRubyClass = Qnil;
 
-DC1394Input::DC1394Input( DC1394Ptr dc1394, int node, dc1394speed_t speed,
+DC1394Input::DC1394Input( DC1394Ptr dc1394, unsigned int node, dc1394speed_t speed,
                           DC1394SelectPtr select, bool forceFrameRate,
                           dc1394framerate_t frameRate )
   throw (Error):
@@ -42,7 +42,7 @@ DC1394Input::DC1394Input( DC1394Ptr dc1394, int node, dc1394speed_t speed,
                 "'ieee1394','raw1394' and 'ohci1394' are loaded and whether you "
                 "have read/write permission on \"/dev/raw1394\". Also make sure "
                 "that the camera is connected and powered up." );
-    ERRORMACRO( node >= 0 && node < list->num, Error, ,
+    ERRORMACRO( node < list->num, Error, ,
                 "Camera node number " << node << " out of range. The range is "
                 "[ 0; " << list->num << " )" );
     m_camera = dc1394_camera_new( dc1394->get(), list->ids[ node ].guid );
@@ -52,20 +52,16 @@ DC1394Input::DC1394Input( DC1394Ptr dc1394, int node, dc1394speed_t speed,
                << setbase( 10 ) << ")" );
     dc1394video_modes_t videoModes;
     err = dc1394_video_get_supported_modes( m_camera, &videoModes );
-    for ( int i=0; i<videoModes.num; i++ ) {
-      if ( !dc1394_is_video_mode_scalable( videoModes.modes[i] ) ) {
-        dc1394video_mode_t videoMode = videoModes.modes[i];
-        dc1394color_coding_t coding;
-        dc1394_get_color_coding_from_video_mode( m_camera, videoMode, &coding );
-        unsigned int width, height;
-        dc1394_get_image_size_from_video_mode( m_camera, videoMode, &width, &height );
-        select->add( coding, width, height );
-      } else {
-        ERRORMACRO( false, Error, , "Scalable video modes not implemented yet" );
-      };
+    for ( unsigned int i=0; i<videoModes.num; i++ ) {
+      dc1394video_mode_t videoMode = videoModes.modes[i];
+      dc1394color_coding_t coding;
+      dc1394_get_color_coding_from_video_mode( m_camera, videoMode, &coding );
+      unsigned int width, height;
+      dc1394_get_image_size_from_video_mode( m_camera, videoMode, &width, &height );
+      select->add( coding, width, height );
     };
-    int selection = select->make();
-    ERRORMACRO( selection >= 0 && selection < videoModes.num, Error, ,
+    unsigned int selection = select->make();
+    ERRORMACRO( selection < videoModes.num, Error, ,
                 "Index of selected video mode out of range" );
     dc1394video_mode_t videoMode = videoModes.modes[ selection ];
     err = dc1394_video_set_iso_speed( m_camera, speed );
@@ -89,19 +85,24 @@ DC1394Input::DC1394Input( DC1394Ptr dc1394, int node, dc1394speed_t speed,
                   << " not implemented yet" );
     };
     dc1394_get_image_size_from_video_mode( m_camera, videoMode, &m_width, &m_height );
-    if ( forceFrameRate ) {
-      err = dc1394_video_set_framerate( m_camera, frameRate );
-      ERRORMACRO( err == DC1394_SUCCESS, Error, , "Error setting framerate: "
-                  << dc1394_error_get_string( err ) );
+    if ( dc1394_is_video_mode_scalable( videoMode ) ) {
+      ERRORMACRO( !forceFrameRate, Error, , "Cannot set framerate in format6 or "
+                  "format7 mode" );
     } else {
-      dc1394framerates_t frameRates;
-      err = dc1394_video_get_supported_framerates( m_camera, videoMode, &frameRates );
-      ERRORMACRO( err == DC1394_SUCCESS, Error, , "Error querying supported frame "
-                  "rates: " << dc1394_error_get_string( err ) );
-      err = dc1394_video_set_framerate( m_camera,
-                                        frameRates.framerates[ frameRates.num - 1 ] );
-      ERRORMACRO( err == DC1394_SUCCESS, Error, , "Error setting framerate: "
-                  << dc1394_error_get_string( err ) );
+      if ( forceFrameRate ) {
+        err = dc1394_video_set_framerate( m_camera, frameRate );
+        ERRORMACRO( err == DC1394_SUCCESS, Error, , "Error setting framerate: "
+                    << dc1394_error_get_string( err ) );
+      } else {
+        dc1394framerates_t frameRates;
+        err = dc1394_video_get_supported_framerates( m_camera, videoMode, &frameRates );
+        ERRORMACRO( err == DC1394_SUCCESS, Error, , "Error querying supported frame "
+                    "rates: " << dc1394_error_get_string( err ) );
+        err = dc1394_video_set_framerate( m_camera,
+                                          frameRates.framerates[ frameRates.num - 1 ] );
+        ERRORMACRO( err == DC1394_SUCCESS, Error, , "Error setting framerate: "
+                    << dc1394_error_get_string( err ) );
+      };
     };
     err = dc1394_capture_setup( m_camera, 4, DC1394_CAPTURE_FLAGS_DEFAULT );
     ERRORMACRO( err == DC1394_SUCCESS, Error, , "Could not setup camera (video mode "
@@ -419,7 +420,7 @@ VALUE DC1394Input::wrapNew( VALUE rbClass, VALUE rbDC1394, VALUE rbNode,
   try {
     DC1394Ptr *dc1394; Data_Get_Struct( rbDC1394, DC1394Ptr, dc1394 );
     DC1394SelectPtr select( new DC1394Select );
-    DC1394InputPtr ptr( new DC1394Input( *dc1394, NUM2INT( rbNode ),
+    DC1394InputPtr ptr( new DC1394Input( *dc1394, NUM2UINT( rbNode ),
                                          (dc1394speed_t)NUM2INT( rbSpeed ),
                                          select, rbForceFrameRate != Qfalse,
                                          (dc1394framerate_t)NUM2INT( rbFrameRate ) ) );
@@ -556,7 +557,7 @@ VALUE DC1394Input::wrapFeatureModes( VALUE rbSelf, VALUE rbFeature )
     dc1394feature_modes_t retVal = (*self)->
       featureModes( (dc1394feature_t)NUM2INT( rbFeature ) );
     rbRetVal = rb_ary_new();
-    for ( int i=0; i<retVal.num; i++ )
+    for ( unsigned int i=0; i<retVal.num; i++ )
       rb_ary_push( rbRetVal, INT2NUM( retVal.modes[i] ) );
   } catch ( std::exception &e ) {
     rb_raise( rb_eRuntimeError, "%s", e.what() );

data/ext/dc1394input.hh

@@ -25,7 +25,7 @@
 class DC1394Input
 {
 public:
-  DC1394Input( DC1394Ptr dc1394, int node, dc1394speed_t speed,
+  DC1394Input( DC1394Ptr dc1394, unsigned int node, dc1394speed_t speed,
                DC1394SelectPtr select, bool forceFrameRate,
                dc1394framerate_t frameRate ) throw (Error);
   virtual ~DC1394Input(void);

data/ext/dc1394select.cc

@@ -37,7 +37,7 @@ static VALUE yield( VALUE arg )
   return rb_yield( arg );
 }
 
-int DC1394Select::make(void) throw (Error)
+unsigned int DC1394Select::make(void) throw (Error)
 {
   int error;
   VALUE rbRetVal = rb_protect( yield, m_rbArray, &error );
@@ -48,7 +48,7 @@ int DC1394Select::make(void) throw (Error)
   };
   ERRORMACRO( TYPE( rbRetVal ) == T_FIXNUM, Error, , "Block must return a value of "
               "type 'Fixnum'" );
-  return NUM2INT(rbRetVal);
+  return NUM2UINT(rbRetVal);
 }
 
 VALUE DC1394Select::wrapRescue( VALUE rbValue )

data/ext/dc1394select.hh

@@ -27,7 +27,7 @@ public:
   DC1394Select(void) throw (Error);
   virtual ~DC1394Select(void);
   void add( dc1394color_coding_t coding, unsigned int width, unsigned int height );
-  int make(void) throw (Error);
+  unsigned int make(void) throw (Error);
   static VALUE wrapRescue( VALUE rbValue );
 protected:
   VALUE m_rbArray;

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 +01:00
+date: 2010-10-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency