hornetseye-frame 0.10.0 → 0.11.0

data/README.md

@@ -14,7 +14,7 @@ Installation
 ------------
 *hornetseye-alsa* requires the software scaling library. If you are running Debian or (K)ubuntu, you can install it like this:
 
-    $ sudo aptitude install libswscale-dev
+    $ sudo aptitude install libswscale-dev libboost-dev
 
 To install this Ruby extension, use the following command:
 

data/Rakefile

@@ -8,7 +8,7 @@ require 'rbconfig'
 require 'tempfile'
 
 PKG_NAME = 'hornetseye-frame'
-PKG_VERSION = '0.10.0'
+PKG_VERSION = '0.11.0'
 CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -154,7 +154,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_development_dependency %q{rake}
   end
   GEM_SOURCE = "#{PKG_NAME}-#{PKG_VERSION}.gem"
@@ -176,7 +176,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' ]
   end
   GEM_BINARY = "#{PKG_NAME}-#{PKG_VERSION}-#{$BINSPEC.platform}.gem"
   desc "Build the gem file #{GEM_SOURCE}"

data/lib/hornetseye-frame/frame.rb

@@ -21,21 +21,17 @@ module Hornetseye
 
     class << self
 
-      attr_accessor :typecode, :width, :height
+      attr_accessor :typecode
 
       def inspect
         to_s
       end
 
       def to_s
-        "Frame(#{typecode},#{@width},#{@height})"
+        "Frame(#{typecode})"
       end
 
-      def shape
-        [ @width, @height ]
-      end
-
-      def storage_size
+      def storage_size(width, height)
         case typecode
         when BGR
           width * height * 3
@@ -69,8 +65,7 @@ module Hornetseye
       def ==( other )
         if other.is_a? Class
           if other < Frame_
-            [ other.typecode, other.width, other.height ] ==
-              [ typecode, width, height ]
+            other.typecode == typecode
           else
             false
           end
@@ -80,7 +75,7 @@ module Hornetseye
       end
 
       def hash
-        [ :Frame_, typecode, width, height ].hash
+        [:Frame_, typecode].hash
       end
 
       def eql?( other )
@@ -89,14 +84,19 @@ module Hornetseye
 
     end
 
+    attr_reader :width
+
+    attr_reader :height
+
     attr_reader :memory
 
-    def initialize( value = nil )
-      @memory = value || Malloc.new( self.class.storage_size )
+    def initialize(width, height, options = {})
+      @width, @height = width, height
+      @memory = options[:memory] || Malloc.new(self.class.storage_size(width, height))
     end
 
     def inspect
-      "#{self.class.inspect}(#{ "0x%08x" % @memory.object_id })"
+      "#{self.class.inspect}(#{@width},#{@height},#{ "0x%08x" % @memory.object_id })"
     end
 
     def dup
@@ -108,15 +108,7 @@ module Hornetseye
     end
 
     def shape
-      self.class.shape
-    end
-
-    def width
-      self.class.width
-    end
-
-    def height
-      self.class.height
+      [@width, @height]
     end
 
     def memorise
@@ -124,7 +116,7 @@ module Hornetseye
     end
 
     def storage_size
-      self.class.storage_size
+      self.class.storage_size @width, @height
     end
 
     def rgb?
@@ -150,15 +142,13 @@ module Hornetseye
 
   end
 
-  def Frame( typecode, width, height )
+  def Frame(typecode)
     if typecode.is_a? FourCC
       retval = Class.new Frame_
       retval.typecode = typecode
-      retval.width = width
-      retval.height = height
       retval
     else
-      Hornetseye::MultiArray typecode, width, height
+      Hornetseye::MultiArray typecode, 2
     end
   end
 
@@ -168,16 +158,16 @@ module Hornetseye
 
     class << self
 
-      def new( typecode, width, height )
-        Hornetseye::Frame( typecode, width, height ).new
+      def new(typecode, width, height)
+        Hornetseye::Frame(typecode).new width, height
       end
 
-      def import( typecode, width, height, memory )
-        Hornetseye::Frame( typecode, width, height ).new memory
+      def import(typecode, width, height, memory)
+        Hornetseye::Frame(typecode).new width, height, :memory => memory
       end
 
-      def storage_size( typecode, width, height )
-        Hornetseye::Frame( typecode, width, height ).storage_size
+      def storage_size(typecode, width, height)
+        Hornetseye::Frame(typecode).storage_size width, height
       end
 
     end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 10
+  - 11
   - 0
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 +01: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