ropencv 0.0.6 → 0.0.7

data/.gitignore

@@ -11,3 +11,4 @@ lib/ruby/ropencv/ropencv_types.rb
 lib/lib
 lib/include
 *.gem
+doc/*

data/ext/opencv.txt

@@ -245,6 +245,7 @@ cv.RotatedRect.RotatedRect
 cv.RotatedRect.boundingRect Rect
 class cv.FileNode
 class cv.Vec2d
+    double* val
 cv.Vec2d.Vec2d
 cv.Vec2d.Vec2d
     Vec2d vec
@@ -256,12 +257,124 @@ cv.Vec2d.all Vec2d /S
 cv.Vec2d.mul Vec2d
     Vec2d other
 cv.Vec2d.conj Vec2d
-cv.Vec2d.operator[] double
-    int i
+cv.Vec2d.operator== bool
+    Vec2d vec
+cv.Vec2d.operator!= bool
+    Vec2d vec
+cv.Vec2d.operator+ Vec2d
+    Vec2d vec
+cv.Vec2d.operator- Vec2d
+    Vec2d vec
+cv.Vec2d.operator* Vec2d
+    double val
+cv.Vec2d.operator/ Vec2d
+    double val
 class cv.Vec3d
+    double* val
+cv.Vec3d.Vec3d
+cv.Vec3d.Vec3d
+    Vec3d vec
+cv.Vec3d.Vec3d
+    double t1
+    double t2
+    double t3
+cv.Vec3d.all Vec3d /S
+    double alpha
+cv.Vec3d.mul Vec3d
+    Vec3d other
+cv.Vec3d.operator== bool
+    Vec3d vec
+cv.Vec3d.operator!= bool
+    Vec3d vec
+cv.Vec3d.operator+ Vec3d
+    Vec3d vec
+cv.Vec3d.operator- Vec3d
+    Vec3d vec
+cv.Vec3d.operator* Vec3d
+    double val
+cv.Vec3d.operator/ Vec3d
+    double val
 class cv.Vec4d
+    double* val
+cv.Vec4d.Vec4d
+cv.Vec4d.Vec4d
+    Vec4d vec
+cv.Vec4d.Vec4d
+    double t1
+    double t2
+    double t3
+    double t4
+cv.Vec4d.all Vec4d /S
+    double alpha
+cv.Vec4d.mul Vec4d
+    Vec4d other
+cv.Vec4d.conj Vec4d
+cv.Vec4d.operator== bool
+    Vec4d vec
+cv.Vec4d.operator!= bool
+    Vec4d vec
+cv.Vec4d.operator+ Vec4d
+    Vec4d vec
+cv.Vec4d.operator- Vec4d
+    Vec4d vec
+cv.Vec4d.operator* Vec4d
+    double val
+cv.Vec4d.operator/ Vec4d
+    double val
 class cv.Vec4f
+cv.Vec4f.Vec4f
+    float* val
+cv.Vec4f.Vec4f
+    Vec4f vec
+cv.Vec4f.Vec4f
+    float t1
+    float t2
+    float t3
+    float t4
+cv.Vec4f.all Vec4f /S
+    float alpha
+cv.Vec4f.mul Vec4f
+    Vec4f other
+cv.Vec4f.operator== bool
+    Vec4f vec
+cv.Vec4f.operator!= bool
+    Vec4f vec
+cv.Vec4f.operator+ Vec4f
+    Vec4f vec
+cv.Vec4f.operator- Vec4f
+    Vec4f vec
+cv.Vec4f.operator* Vec4f
+    float val
+cv.Vec4f.operator/ Vec4f
+    float val
 class cv.Vec6f
+cv.Vec6f.Vec6f
+    float* val
+cv.Vec6f.Vec6f
+    Vec6f vec
+cv.Vec6f.Vec6f
+    float t1
+    float t2
+    float t3
+    float t4
+    float t5
+    float t6
+cv.Vec6f.all Vec6f /S
+    float alpha
+cv.Vec6f.mul Vec6f
+    Vec6f other
+cv.Vec6f.operator== bool
+    Vec6f vec
+cv.Vec6f.operator!= bool
+    Vec6f vec
+cv.Vec6f.operator+ Vec6f
+    Vec6f vec
+cv.Vec6f.operator- Vec6f
+    Vec6f vec
+cv.Vec6f.operator* Vec6f
+    float val
+cv.Vec6f.operator/ Vec6f
+    float val
 class cv.TermCriteria
 class cv.flann::IndexParams
 class cv.flann::SearchParams
@@ -355,6 +468,8 @@ cv.Mat.cross Mat
     Mat m
 cv.Mat.dot double
     Mat m
+cv.Mat.diag Mat /S
+    Mat d
 cv.Mat.zeros Mat /S
     int rows
     int cols

data/ext/src/CMakeLists.txt

@@ -44,7 +44,7 @@ else()
         MESSAGE(STATUS "Ruby library not found. Cannot install ruby extensions")
     ELSEIF(NOT RUBY_EXTENSIONS_AVAILABLE)
         STRING(REGEX REPLACE ".*lib(32|64)?/?" "lib/" RUBY_LIBRARY_INSTALL_DIR ${RUBY_RUBY_LIB_PATH})
-        INSTALL(DIRECTORY ${ROOT_FOLDER}/lib/ruby DESTINATION ${RUBY_LIBRARY_INSTALL_DIR}
+        INSTALL(DIRECTORY ${ROOT_FOLDER}/lib/ruby/ DESTINATION ${RUBY_LIBRARY_INSTALL_DIR}
             FILES_MATCHING PATTERN "*.rb")
     ENDIF(NOT RUBY_INCLUDE_PATH)
 endif()

data/lib/ruby/ropencv/ropencv_ruby.rb

@@ -30,7 +30,75 @@ module OpenCV
             end
         end
 
+        class Vec2d
+            def [](i)
+                raise "Out of bound #{i}" if i < 0 || i > 1 
+                val.get_float64(i*8)
+            end
+            def []=(i,val0)
+                raise "Out of bound #{i}" if i < 0 || i > 1 
+                val.put_float64(i*8,val0)
+            end
+        end
+
+        class Vec3d
+            def [](i)
+                raise "Out of bound #{i}" if i < 0 || i > 2
+                val.get_float64(i*8)
+            end
+            def []=(i,val0)
+                raise "Out of bound #{i}" if i < 0 || i > 2
+                val.put_float64(i*8,val0)
+            end
+        end
+
+        class Vec4d
+            def [](i)
+                raise "Out of bound #{i}" if i < 0 || i > 3
+                val.get_float64(i*8)
+            end
+            def []=(i,val0)
+                raise "Out of bound #{i}" if i < 0 || i > 3
+                val.put_float64(i*8,val0)
+            end
+        end
+
+        class Vec4f
+            def [](i)
+                raise "Out of bound #{i}" if i < 0 || i > 3
+                val.get_float32(i*4)
+            end
+            def []=(i,val0)
+                raise "Out of bound #{i}" if i < 0 || i > 3
+                val.put_float32(i*4,val0)
+            end
+        end
+        
+        class Vec6f
+            def [](i)
+                raise "Out of bound #{i}" if i < 0 || i > 5
+                val.get_float32(i*4)
+            end
+            def []=(i,val0)
+                raise "Out of bound #{i}" if i < 0 || i > 5
+                val.put_float32(i*4,val0)
+            end
+        end
+
         class Mat
+            class << self
+                alias :rbind_new :new
+
+                def new(*args)
+                    # allow Mat.new([123,23],[2332,32])
+                    if !args.find{|a| !a.is_a?(Array)} && args.size() > 1
+                        rbind_new(args)
+                    else
+                        rbind_new(*args)
+                    end
+                end
+            end
+
             def self.to_native(obj,context)
                 if obj.is_a?(VectorPoint2f)
                     cv::Mat.new(obj.size,2,cv::CV_32FC1,obj.data,cv::Mat::AUTO_STEP).__obj_ptr__

data/ropencv.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name              = 'ropencv'
-    s.version           = '0.0.6'
+    s.version           = '0.0.7'
     s.date              = '2013-07-03'
     s.platform          = Gem::Platform::RUBY
     s.authors           = ['Alexander Duda']

metadata

@@ -1,60 +1,49 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ropencv
-version: !ruby/object:Gem::Version
-  version: 0.0.6
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.7
 platform: ruby
-authors:
+authors: 
 - Alexander Duda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-07-03 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rbind
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.10
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.0.10
-- !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.9.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: ffi
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.9.0
-description: This are automated ffi ruby wrappers for opencv 2.4.4 and higher. For
-  wrapping all marked OpenCV C++ methods the OpenCV hdr parser is used to parse the
-  OpenCV header files. From there rbind generates a C interface and ruby classes.
-  The ruby classes are using the C interface via ffi to give the user the same object
-  oriented experience on the ruby side like he has on the c++ side.
-email:
+  type: :runtime
+  version_requirements: *id002
+description: This are automated ffi ruby wrappers for opencv 2.4.4 and higher. For wrapping all marked OpenCV C++ methods the OpenCV hdr parser is used to parse the OpenCV header files. From there rbind generates a C interface and ruby classes. The ruby classes are using the C interface via ffi to give the user the same object oriented experience on the ruby side like he has on the c++ side.
+email: 
 - Alexander.Duda@dfki.de
 executables: []
-extensions:
+
+extensions: 
 - ext/extconf.rb
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .yardopts
 - CMakeLists.txt
@@ -82,27 +71,31 @@ files:
 - lib/ruby/ropencv/ropencv_types.rb
 homepage: http://github.com/D-Alex/ropencv
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib/ruby
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Automated ffi-bindings for opencv 2.4.4 and higher
 test_files: []
+
 has_rdoc: