hornetseye-xorg 0.2.0 → 0.2.1

data/README.md

@@ -1,4 +1,4 @@
-Hornetseye-Xorg
+hornetseye-xorg
 ======
 This Ruby extension provides graphical output under X.Org.
 

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-xorg'
-PKG_VERSION = '0.2.0'
+PKG_VERSION = '0.2.1'
 CXX = ENV[ 'CXX' ] || 'g++'
 STRIP = ENV[ 'STRIP' ] || 'strip'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -171,7 +171,9 @@ rule '.o' => '.cc' do |t|
 end
 
 file ".depends.mf" do |t|
-  sh "makedepend -f- -- #{$CXXFLAGS} -- #{CC_FILES.join ' '} > #{t.name}"
+  sh "g++ -MM #{$CXXFLAGS} #{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
 CC_FILES.each do |t|
   file t.ext(".o") => t

data/ext/frame.cc

@@ -23,9 +23,7 @@ Frame::Frame( const string &typecode, int width, int height, char *data ):
   VALUE mModule = rb_define_module( "Hornetseye" );
   VALUE cMalloc = rb_define_class_under( mModule, "Malloc", rb_cObject );
   VALUE cFrame = rb_define_class_under( mModule, "Frame", rb_cObject );
-  VALUE rbSize = rb_funcall( cFrame, rb_intern( "storage_size" ), 3,
-                             rb_const_get( mModule, rb_intern( typecode.c_str() ) ),
-                             INT2NUM( width ), INT2NUM( height ) );
+  VALUE rbSize = INT2NUM( storageSize( typecode, width, height ) );
   VALUE rbMemory;
   if ( data != NULL ) {
     rbMemory = Data_Wrap_Struct( cMalloc, 0, 0, (void *)data );
@@ -67,3 +65,12 @@ void Frame::markRubyMember(void)
   rb_gc_mark( m_frame );
 }
 
+int Frame::storageSize( const std::string &typecode, int width, int height )
+{
+  VALUE mModule = rb_define_module( "Hornetseye" );
+  VALUE cFrame = rb_define_class_under( mModule, "Frame", rb_cObject );
+  return NUM2INT( rb_funcall( cFrame, rb_intern( "storage_size" ), 3,
+                              rb_const_get( mModule, rb_intern( typecode.c_str() ) ),
+                              INT2NUM( width ), INT2NUM( height ) ) );
+}
+ 

data/ext/frame.hh

@@ -32,6 +32,7 @@ public:
   char *data(void);
   VALUE rubyObject(void) { return m_frame; }
   void markRubyMember(void);
+  static int storageSize( const std::string &typecode, int width, int height );
 protected:
   VALUE m_frame;
 };

data/lib/hornetseye-xorg/x11display.rb

@@ -32,9 +32,8 @@ module Hornetseye
 
       def show( *args, &action )
         options = args.last.is_a?( Hash ) ? args.pop : {}
-        options = { :title => 'Hornetseye' }.merge options
+        options = { :title => 'Hornetseye', :output => XImageOutput }.merge options
         unless action
-          options = { :output => XImageOutput }.merge options
           frame, width, height = *args
           width  ||= frame.width
           height ||= ( width.to_f * frame.height / frame.width ).round
@@ -49,8 +48,8 @@ module Hornetseye
           ensure
             window.close
           end
+          frame
         else
-          options = { :output => XVideoOutput }.merge options
           width, height = *args
           result = action.call
           width  ||= result.shape[0]
@@ -77,6 +76,7 @@ module Hornetseye
           ensure
             window.close
           end
+          display
         end
       end
 

data/lib/hornetseye-xorg/x11output.rb

@@ -0,0 +1,33 @@
+# hornetseye-xorg - Graphical output under X.Org
+# Copyright (C) 2010 Jan Wedekind
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Namespace of Hornetseye computer vision library
+module Hornetseye
+
+  class X11Output
+
+    class << self
+
+      def new( *args )
+        raise 'X11Output is an abstract class'
+      end
+
+    end
+
+  end
+
+end
+

data/lib/hornetseye_xorg_ext.rb

@@ -16,6 +16,7 @@
 
 require 'hornetseye_frame'
 require 'hornetseye-xorg/x11display'
+require 'hornetseye-xorg/x11output'
 require 'hornetseye-xorg/ximageoutput'
 require 'hornetseye-xorg/node'
 require 'hornetseye-xorg/frame'

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-05 00:00:00 +01:00
+date: 2010-10-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,7 @@ files:
 - README.md
 - COPYING
 - .document
+- lib/hornetseye-xorg/x11output.rb
 - lib/hornetseye-xorg/frame.rb
 - lib/hornetseye-xorg/ximageoutput.rb
 - lib/hornetseye-xorg/node.rb