hornetseye-opencv 0.2.0 → 0.3.0

data/README.md

@@ -1,5 +1,25 @@
 hornetseye-opencv
-======
-This Ruby extension provides conversions from {Hornetseye::MultiArray} to {OpenCV::CvMat} and vice versa.
+===============
 
+**Author**:       Jan Wedekind
+**Copyright**:    2010, 2011
+**License**:      GPL
+
+Synopsis
+--------
+
+This Ruby extension implements conversions between {OpenCV::CvMat} and {Hornetseye::MultiArray}.
+
+Installation
+------------
+To install this Ruby extension, use the following command:
+
+    $ sudo gem install hornetseye-opencv
+
+Alternatively you can build and install the Ruby extension from source as follows:
+
+    $ rake
+    $ sudo rake install
+
+See [https://github.com/wedesoft/ruby-opencv](https://github.com/wedesoft/ruby-opencv) for more information on how to install *opencv* for Ruby.
 

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-opencv'
-PKG_VERSION = '0.2.0'
+PKG_VERSION = '0.3.0'
 CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -81,8 +81,7 @@ end
 begin
   require 'yard'
   YARD::Rake::YardocTask.new :yard do |y|
-    y.options << '--no-private'
-    y.files << FileList[ 'lib/**/*.rb' ]
+    y.files << RB_FILES
   end
 rescue LoadError
   STDERR.puts 'Please install \'yard\' if you want to generate documentation'
@@ -115,7 +114,7 @@ begin
     s.extra_rdoc_files = []
     s.rdoc_options = %w{--no-private}
     s.add_dependency %<malloc>, [ '~> 1.1' ]
-    s.add_dependency %<multiarray>, [ '~> 0.15' ]
+    s.add_dependency %<multiarray>, [ '~> 0.23' ]
     s.add_dependency %<opencv>, [ '~> 0.0' ]
     s.add_development_dependency %q{rake}
   end
@@ -138,7 +137,7 @@ begin
     s.extra_rdoc_files = []
     s.rdoc_options = %w{--no-private}
     s.add_dependency %<malloc>, [ '~> 1.1' ]
-    s.add_dependency %<multiarray>, [ '~> 0.15' ]
+    s.add_dependency %<multiarray>, [ '~> 0.23' ]
     s.add_dependency %<opencv>, [ '~> 0.0' ]
   end
   GEM_BINARY = "#{PKG_NAME}-#{PKG_VERSION}-#{$BINSPEC.platform}.gem"

data/ext/cvmat.cc

@@ -83,11 +83,9 @@ VALUE CvMatExt::wrapToMultiArray( VALUE rbSelf )
     VALUE rbDest = rb_funcall( cMalloc, rb_intern( "new" ), 1, INT2NUM( size ) );
     char *dest; Data_Get_Struct( rbDest, char, dest );
     copy( cvMat->data.ptr, cvMat->data.ptr + size, dest );
-    VALUE rbMultiArray = rb_funcall( mHornetseye, rb_intern( "MultiArray" ), 4,
-                                     rbTypecode, INT2NUM( channels ),
-                                     INT2NUM( width ), INT2NUM( height ) );
-    VALUE rbImport = rb_funcall( rbMultiArray, rb_intern( "new" ), 1, rbDest );
-    rbRetVal = rbImport;
+    rbRetVal = rb_funcall(rb_const_get(mHornetseye, rb_intern("MultiArray")),
+      rb_intern("import"), 5, rbTypecode, rbDest,
+      INT2NUM(channels), INT2NUM(width), INT2NUM(height));
   } catch( std::exception &e ) {
     rb_raise( rb_eRuntimeError, "%s", e.what() );
   };

data/ext/init.cc

@@ -31,8 +31,8 @@ extern "C" {
 
   void Init_hornetseye_opencv(void)
   {
-    rb_require( "opencv" );
-    rb_require( "multiarray" );
+    rb_eval_string("require 'opencv'");
+    rb_eval_string("require 'multiarray'");
     VALUE mOpenCV = rb_define_module( "OpenCV" );
     VALUE mHornetseye = rb_define_module( "Hornetseye" );
     CvMatExt::registerRubyClass( mOpenCV );

data/ext/node.cc

@@ -86,8 +86,8 @@ VALUE Node::wrapToCvMat( VALUE rbSelf )
                   "Conversion to CvMat only supports UBYTE, BYTE, USINT, "
                   "SINT, INT, SFLOAT, DFLOAT as basic types" );
     };
-    VALUE rbTypeSize = rb_funcall( rbSelf, rb_intern( "storage_size" ), 0 );
-    int typesize = NUM2INT( rbTypeSize );
+    VALUE rbTypeSize = rb_funcall(rbTypecode, rb_intern("storage_size"), 0);
+    int typesize = NUM2INT(rbTypeSize) * width * height * channels;
     VALUE cMalloc = rb_define_class_under( mModule, "Malloc", rb_cObject );
     unsigned char *source;
     dataGetStruct( rbMalloc, cMalloc, unsigned char, source );

data/lib/hornetseye-opencv/cvmat.rb

@@ -25,11 +25,9 @@ module OpenCV
       when 1
         retval.roll[ 0 ]
       when 2
-        Hornetseye::MultiArray( Hornetseye::COMPLEX( retval.typecode ),
-                                width, height ).new retval.memory
+        Hornetseye::MultiArray.import Hornetseye::COMPLEX(retval.typecode), retval.memory, width, height
       when 3
-        Hornetseye::MultiArray( Hornetseye::RGB( retval.typecode ),
-                                width, height ).new retval.memory
+        Hornetseye::MultiArray.import Hornetseye::RGB(retval.typecode), retval.memory, width, height
       else
         retval
       end

data/lib/hornetseye-opencv/node.rb

@@ -22,12 +22,11 @@ module Hornetseye
     def to_cvmat
       data = memorise
       if typecode < Composite
-        Hornetseye::MultiArray( data.typecode.element_type,
-                                data.typecode.num_elements, *data.shape ).
-          new( data.memory ).orig_to_cvmat
+        MultiArray.import(data.typecode.basetype, data.memory,
+                          data.typecode.num_elements, *data.shape).orig_to_cvmat
       elsif dimension == 2
-        Hornetseye::MultiArray( data.typecode, 1, *data.shape ).new( data.memory ).
-          orig_to_cvmat
+        MultiArray.import(data.typecode.basetype, data.memory,
+                          1, *data.shape).orig_to_cvmat
       else
         data.orig_to_cvmat
       end

data/lib/hornetseye_opencv_ext.rb

@@ -13,6 +13,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+require 'opencv'
+require 'multiarray'
 require 'hornetseye-opencv/cvmat'
 require 'hornetseye-opencv/iplimage'
 require 'hornetseye-opencv/node'

data/test/tc_hornetseye_opencv.rb

@@ -40,10 +40,10 @@ class TC_Hornetseye_OpenCV < Test::Unit::TestCase
   end
 
   def setup
-    @m1 = M( I, 3, 2 )[ [ 1, 2, 3 ], [ 4, 5, 6 ] ]
-    @m2 = M( X, 1, 2 )[ [ X( 1, 2 ) ], [ X( 3, 4 ) ] ]
-    @m3 = M( C, 2, 1 )[ [ C( 1, 2, 3 ), C( 4, 5, 6 ) ] ]
-    @m4 = M( I, 4, 1, 1 )[ [ [ 1, 2, 3, 4 ] ] ]
+    @m1 = M(I, 2)[ [ 1, 2, 3 ], [ 4, 5, 6 ] ]
+    @m2 = M(X, 2)[ [ X( 1, 2 ) ], [ X( 3, 4 ) ] ]
+    @m3 = M(C, 2)[ [ C( 1, 2, 3 ), C( 4, 5, 6 ) ] ]
+    @m4 = M(I, 3)[ [ [ 1, 2, 3, 4 ] ] ]
   end
 
   def teardown

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 +00:00
+date: 2011-06-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,8 +41,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 15
-        version: "0.15"
+        - 23
+        version: "0.23"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -85,18 +85,18 @@ files:
 - README.md
 - COPYING
 - .document
-- lib/hornetseye-opencv/iplimage.rb
 - lib/hornetseye-opencv/node.rb
 - lib/hornetseye-opencv/cvmat.rb
+- lib/hornetseye-opencv/iplimage.rb
 - lib/hornetseye_opencv_ext.rb
 - ext/init.cc
-- ext/node.cc
 - ext/cvmat.cc
+- ext/node.cc
+- ext/node.hh
 - ext/rubytools.hh
-- ext/cvmat.hh
-- ext/rubyinc.hh
 - ext/error.hh
-- ext/node.hh
+- ext/rubyinc.hh
+- ext/cvmat.hh
 - ext/rubytools.tcc
 - test/ts_hornetseye_opencv.rb
 - test/tc_hornetseye_opencv.rb