hornetseye-frame 0.3.0 → 0.5.0

data/Rakefile

@@ -7,12 +7,12 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-frame'
-PKG_VERSION = '0.3.0'
+PKG_VERSION = '0.5.0'
 CXX = ENV[ 'CXX' ] || 'g++'
 STRIP = ENV[ 'STRIP' ] || 'strip'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
 CC_FILES = FileList[ 'ext/*.cc' ]
-HH_FILES = FileList[ 'ext/*.hh' ]
+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"
@@ -169,7 +169,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/colourspace.cc

@@ -60,8 +60,8 @@ static void setupFormat( const string &typecode, int width, int height, char *me
       width2  = width / 2,
       height2 = height / 2;
     data[ 0 ] = (uint8_t *)memory;
-    data[ 2 ] = (uint8_t *)memory + width * height;
-    data[ 1 ] = (uint8_t *)data[ 2 ] + width2 * height2;
+    data[ 1 ] = (uint8_t *)memory + width * height;
+    data[ 2 ] = (uint8_t *)data[ 1 ] + width2 * height2;
     lineSize[ 0 ] = width;
     lineSize[ 1 ] = width2;
     lineSize[ 2 ] = width2;

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-frame/frame.rb

@@ -85,6 +85,10 @@ module Hornetseye
       self.class.height
     end
 
+    def storage_size
+      self.class.storage_size
+    end
+
     alias_method :orig_to_type, :to_type
 
     def to_type( target )

data/lib/hornetseye-frame/shortcuts.rb

@@ -0,0 +1,71 @@
+# multiarray - Lazy multi-dimensional arrays for Ruby
+# 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
+
+  module FrameConstructor
+
+    def method_missing( name, *args )
+      if name.to_s =~ /^[a-z0-9]+$/
+        target = name.to_s.upcase
+        if Hornetseye.const_defined? target
+          target = Hornetseye.const_get target
+          if target.is_a? FourCC
+            new target, *args
+          else
+            super name, *args
+          end
+        else
+          super name, *args
+        end
+      else
+        super name, *args
+      end
+    end
+
+  end
+
+  Frame.extend FrameConstructor
+
+  module FrameConversion
+
+    def method_missing( name, *args )
+      if name.to_s =~ /^to_[a-z0-9]+$/
+        target = name.to_s[ 3 .. -1 ].upcase
+        if Hornetseye.const_defined? target
+          target = Hornetseye.const_get target
+          if ( target.is_a? Class and target < Element ) or target.is_a? FourCC
+            to_type target, *args
+          else
+            super target, *args
+          end
+        else
+          super name, *args
+        end
+      else
+        super name, *args
+      end
+    end
+
+  end
+
+  Frame_.class_eval { include FrameConversion }
+
+  Node.class_eval { include FrameConversion }
+
+end
+

data/lib/hornetseye_frame_ext.rb

@@ -19,3 +19,5 @@ require 'multiarray'
 require 'hornetseye-frame/fourcc'
 require 'hornetseye-frame/frame'
 require 'hornetseye-frame/node'
+require 'hornetseye-frame/shortcuts'
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 5
   - 0
-  version: 0.3.0
+  version: 0.5.0
 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-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ files:
 - README.md
 - COPYING
 - .document
+- lib/hornetseye-frame/shortcuts.rb
 - lib/hornetseye-frame/fourcc.rb
 - lib/hornetseye-frame/frame.rb
 - lib/hornetseye-frame/node.rb