hornetseye-kinect 0.4.0 → 0.4.1

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-kinect'
-PKG_VERSION = '0.4.0'
+PKG_VERSION = '0.4.1'
 CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -27,7 +27,7 @@ EMAIL = %q{jan@wedesoft.de}
 HOMEPAGE = %q{http://wedesoft.github.com/hornetseye-kinect/}
 
 OBJ = CC_FILES.ext 'o'
-# $CXXFLAGS = "-DNDEBUG #{CFG[ 'CPPFLAGS' ]} #{CFG[ 'CFLAGS' ]}"
+# $CXXFLAGS = "-DNDEBUG -DHAVE_CONFIG_H #{CFG[ 'CPPFLAGS' ]} #{CFG[ 'CFLAGS' ]}"
 $CXXFLAGS = "-g #{CFG[ 'CPPFLAGS' ]} #{CFG[ 'CFLAGS' ]}"
 if CFG[ 'rubyhdrdir' ]
   $CXXFLAGS = "#{$CXXFLAGS} -I#{CFG[ 'rubyhdrdir' ]} " + 
@@ -47,7 +47,7 @@ desc 'Compile Ruby extension (default)'
 task :all => [ SO_FILE ]
 
 file SO_FILE => OBJ do |t|
-   sh "#{CXX} -shared -o #{t.name} #{OBJ} -lfreenect #{$LIBRUBYARG}"
+   sh "#{CXX} -shared -o #{t.name} #{OBJ} -lfreenect -lusb-1.0 #{$LIBRUBYARG}"
 end
 
 task :test => [ SO_FILE ]
@@ -74,6 +74,32 @@ task :uninstall do
   end
 end
 
+desc 'Create config.h'
+task :config_h => 'ext/config.h'
+
+def check_c_header( name )
+  check_program do |c| 
+    c.puts <<EOS
+extern "C" {
+  #include <#{name}>
+}
+int main(void) { return 0; }
+EOS
+  end 
+end
+
+file 'ext/config.h' do |t|
+  s = "/* config.h. Generated from Rakefile by rake. */\n"
+  if check_c_header 'libfreenect/libfreenect.h'
+    s << "#define HAVE_LIBFREENECT_INCDIR 1\n"
+  elsif check_c_header 'libfreenect.h'
+    s << "#undef HAVE_LIBFREENECT_INCDIR 1\n"
+  else
+    raise 'Cannot find swscale.h header file'
+  end
+  File.open(t.name, 'w') { |f| f.puts s }
+end                         
+
 Rake::TestTask.new do |t|
   t.libs << 'ext'
   t.test_files = TC_FILES
@@ -181,5 +207,5 @@ end
 import ".depends.mf"
 
 CLEAN.include 'ext/*.o'
-CLOBBER.include SO_FILE, 'doc', '.yardoc', '.depends.mf'
+CLOBBER.include SO_FILE, 'doc', '.yardoc', '.depends.mf', 'ext/config.h'
 

data/ext/kinectcontext.hh

@@ -16,8 +16,16 @@
 #ifndef HORNETSEYE_KINECTCONTEXT_HH
 #define HORNETSEYE_KINECTCONTEXT_HH
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <boost/smart_ptr.hpp>
+#ifdef HAVE_LIBFREENECT_INCDIR
 #include <libfreenect/libfreenect.h>
+#else
+#include <libfreenect.h>
+#endif
 #include "error.hh"
 #include "rubyinc.hh"
 

data/ext/kinectinput.cc

@@ -53,10 +53,10 @@ KinectInput::KinectInput( KinectContextPtr context, int node ) throw (Error):
     m_depth[i] = (char *)malloc( FREENECT_DEPTH_11BIT_SIZE );
   };
   instances[ m_device ] = this;
-  // freenect_set_depth_format( m_device, FREENECT_DEPTH_11BIT );
-  // freenect_set_video_format( m_device, FREENECT_VIDEO_RGB );
-  freenect_set_video_mode(m_device, freenect_find_video_mode(FREENECT_RESOLUTION_MEDIUM, FREENECT_VIDEO_RGB));
-  freenect_set_depth_mode(m_device, freenect_find_depth_mode(FREENECT_RESOLUTION_MEDIUM, FREENECT_DEPTH_11BIT));
+  freenect_set_depth_format( m_device, FREENECT_DEPTH_11BIT );
+  freenect_set_video_format( m_device, FREENECT_VIDEO_RGB );
+  // freenect_set_video_mode(m_device, freenect_find_video_mode(FREENECT_RESOLUTION_MEDIUM, FREENECT_VIDEO_RGB));
+  // freenect_set_depth_mode(m_device, freenect_find_depth_mode(FREENECT_RESOLUTION_MEDIUM, FREENECT_DEPTH_11BIT));
   freenect_set_depth_buffer( m_device, m_rgb[0] );
   freenect_set_video_buffer( m_device, m_rgb[0] );
   freenect_set_depth_callback( m_device, staticDepthCallBack );
@@ -200,7 +200,7 @@ int KinectInput::getTiltStatus(void) throw (Error)
 {
   ERRORMACRO( m_device != NULL, Error, , "Kinect device is not open. "
               "Did you call \"close\" before?" );
-  return (int)freenect_get_tilt_status( freenect_get_tilt_state( m_device ) );
+  return (int)(freenect_get_tilt_state( m_device )->tilt_status);
 }
 
 void KinectInput::depthCallBack( void *depth, unsigned int timestamp )

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hornetseye-kinect
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: 
-  version: 0.4.0
+  segments: 
+  - 0
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-04 00:00:00 Z
+date: 2012-05-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: malloc
@@ -20,6 +25,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
         version: "1.1"
   type: :runtime
   version_requirements: *id001
@@ -31,6 +40,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 37
+        segments: 
+        - 0
+        - 23
         version: "0.23"
   type: :runtime
   version_requirements: *id002
@@ -42,6 +55,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 11
         version: "0.11"
   type: :runtime
   version_requirements: *id003
@@ -53,6 +70,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -96,17 +116,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: hornetseye
-rubygems_version: 1.8.5
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Acquisition of images and depth maps using libfreenect