hornetseye-opencv 0.1.2 → 0.2.0

data/Rakefile

@@ -7,15 +7,15 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-opencv'
-PKG_VERSION = '0.1.2'
+PKG_VERSION = '0.2.0'
+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-opencv/}
 
 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} -lcv -lhighgui -lcvaux -lcxcore -lml #{$LIBRUBYARG}"
-   # sh "#{STRIP} --strip-all #{t.name}"
 end
 
 task :test => [ SO_FILE ]
@@ -115,7 +115,7 @@ begin
     s.extra_rdoc_files = []
     s.rdoc_options = %w{--no-private}
     s.add_dependency %<malloc>, [ '~> 1.1' ]
-    s.add_dependency %<multiarray>, [ '~> 0.10' ]
+    s.add_dependency %<multiarray>, [ '~> 0.15' ]
     s.add_dependency %<opencv>, [ '~> 0.0' ]
     s.add_development_dependency %q{rake}
   end
@@ -138,7 +138,7 @@ begin
     s.extra_rdoc_files = []
     s.rdoc_options = %w{--no-private}
     s.add_dependency %<malloc>, [ '~> 1.1' ]
-    s.add_dependency %<multiarray>, [ '~> 0.10' ]
+    s.add_dependency %<multiarray>, [ '~> 0.15' ]
     s.add_dependency %<opencv>, [ '~> 0.0' ]
   end
   GEM_BINARY = "#{PKG_NAME}-#{PKG_VERSION}-#{$BINSPEC.platform}.gem"
@@ -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/lib/hornetseye-opencv/cvmat.rb

@@ -28,7 +28,6 @@ module OpenCV
         Hornetseye::MultiArray( Hornetseye::COMPLEX( retval.typecode ),
                                 width, height ).new retval.memory
       when 3
-        # swap rgb!
         Hornetseye::MultiArray( Hornetseye::RGB( retval.typecode ),
                                 width, height ).new retval.memory
       else

data/lib/hornetseye-opencv/iplimage.rb

@@ -0,0 +1,27 @@
+# hornetseye-opencv - OpenCV integration for Hornetseye
+# 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/>.
+module OpenCV
+
+  class IplImage
+
+    def to_multiarray
+      to_CvMat.to_multiarray
+    end
+
+  end
+
+end
+

data/lib/hornetseye-opencv/node.rb

@@ -20,16 +20,16 @@ module Hornetseye
     alias_method :orig_to_cvmat, :to_cvmat
 
     def to_cvmat
+      data = memorise
       if typecode < Composite
-        # swap RGB!
-        Hornetseye::MultiArray( typecode.element_type,
-                                typecode.num_elements, *shape ).new( memory ).
-          orig_to_cvmat
+        Hornetseye::MultiArray( data.typecode.element_type,
+                                data.typecode.num_elements, *data.shape ).
+          new( data.memory ).orig_to_cvmat
       elsif dimension == 2
-        Hornetseye::MultiArray( typecode, 1, *shape ).new( memory ).
+        Hornetseye::MultiArray( data.typecode, 1, *data.shape ).new( data.memory ).
           orig_to_cvmat
       else
-        orig_to_cvmat
+        data.orig_to_cvmat
       end
     end
 

data/lib/hornetseye_opencv_ext.rb

@@ -14,5 +14,6 @@
 # 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 'hornetseye-opencv/cvmat'
+require 'hornetseye-opencv/iplimage'
 require 'hornetseye-opencv/node'
 

data/test/tc_hornetseye_opencv.rb

@@ -0,0 +1,59 @@
+# 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/>.
+
+require 'test/unit'
+begin
+  require 'rubygems'
+rescue LoadError
+end
+Kernel::require 'hornetseye_opencv'
+
+class TC_Hornetseye_OpenCV < Test::Unit::TestCase
+
+  I = Hornetseye::INT
+  X = Hornetseye::SCOMPLEX
+  C = Hornetseye::UBYTERGB
+
+  def M( *args )
+    Hornetseye::MultiArray *args
+  end
+
+  def C( *args )
+    Hornetseye::RGB *args
+  end
+
+  def X( *args )
+    Complex *args
+  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 ] ] ]
+  end
+
+  def teardown
+  end
+
+  def test_to_cvmat
+    assert_equal @m1, @m1.to_cvmat.to_multiarray
+    assert_equal @m2, @m2.to_cvmat.to_multiarray
+    assert_equal @m3, @m3.to_cvmat.to_multiarray
+    assert_equal @m4, @m4.to_cvmat.to_multiarray
+  end
+
+end

data/test/ts_hornetseye_opencv.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# 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/>.
+require 'tc_hornetseye_opencv'
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +01:00
+date: 2010-12-20 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,8 +41,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 10
-        version: "0.10"
+        - 15
+        version: "0.15"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,7 @@ files:
 - README.md
 - COPYING
 - .document
+- lib/hornetseye-opencv/iplimage.rb
 - lib/hornetseye-opencv/node.rb
 - lib/hornetseye-opencv/cvmat.rb
 - lib/hornetseye_opencv_ext.rb
@@ -97,6 +98,8 @@ files:
 - ext/error.hh
 - ext/node.hh
 - ext/rubytools.tcc
+- test/ts_hornetseye_opencv.rb
+- test/tc_hornetseye_opencv.rb
 has_rdoc: yard
 homepage: http://wedesoft.github.com/hornetseye-opencv/
 licenses: []
@@ -130,5 +133,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: OpenCV integration for Hornetseye
-test_files: []
-
+test_files: 
+- test/tc_hornetseye_opencv.rb