hornetseye-rmagick 0.1.0 → 0.2.0

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/packagetask'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-rmagick'
-PKG_VERSION = '0.1.0'
+PKG_VERSION = '0.2.0'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
 TC_FILES = FileList[ 'test/tc_*.rb' ]
 TS_FILES = FileList[ 'test/ts_*.rb' ]

data/lib/hornetseye-rmagick/image.rb

@@ -55,7 +55,37 @@ module Magick
       Hornetseye::MultiArray.import typecode,
         export_pixels_to_str( 0, 0, columns, rows, format, pixel_type ),
         columns, rows
-      
+    end
+
+    def to_multiarray
+      case image_type
+      when BilevelType, GrayscaleType, GrayscaleMatteType
+        case depth
+        when 32
+          to_type UINT
+        when 16
+          to_type USINT
+        when 1, 8
+          to_type UBYTE
+        else
+          Kernel.raise "Conversion for grayscale image with depth #{depth} not " +
+            "implemented"
+        end
+      when PaletteType, PaletteMatteType, TrueColorType, TrueColorMatteType
+        case depth
+        when 32
+          to_type UINTRGB
+        when 16
+          to_type USINTRGB
+        when 8
+          to_type UBYTERGB
+        else
+          Kernel.raise "Conversion for colour image with depth #{depth} not " +
+            "implemented"
+        end
+      else
+        Kernel.raise "Unknown image type #{image_type.inspect}"
+      end
     end
 
   end

data/lib/hornetseye-rmagick/node.rb

@@ -0,0 +1,76 @@
+# hornetseye-rmagick - RMagick 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 Hornetseye
+
+  class Node
+
+    def to_magick
+      unless dimension == 2
+        raise "Array must have two dimensions (but has #{dimension})"
+      end
+      case typecode
+      when UBYTE
+        pixel_type = Magick::CharPixel
+        colourspace = 'I'
+        depth = 8
+      when USINT
+        pixel_type = Magick::ShortPixel
+        colourspace = 'I'
+        depth = 16
+      when UINT
+        pixel_type = Magick::IntegerPixel
+        colourspace = 'I'
+        depth = 32
+      when SFLOAT
+        pixel_type = Magick::FloatPixel
+        colourspace = 'I'
+        depth = nil
+      when DFLOAT
+        pixel_type = Magick::DoublePixel
+        colourspace = 'I'
+        depth = nil
+      when UBYTERGB
+        pixel_type = Magick::CharPixel
+        colourspace = 'RGB'
+        depth = 8
+      when USINTRGB
+        pixel_type = Magick::ShortPixel
+        colourspace = 'RGB'
+        depth = 16
+      when UINTRGB
+        pixel_type = Magick::IntegerPixel
+        colourspace = 'RGB'
+        depth = 32
+      when SFLOATRGB
+        pixel_type = Magick::FloatPixel
+        colourspace = 'RGB'
+        depth = nil
+      when DFLOATRGB
+        pixel_type = Magick::DoublePixel
+        colourspace = 'RGB'
+        depth = nil
+      else
+        raise "Conversion from #{typecode} to Magick::Image not implemented"
+      end
+      retval = Magick::Image.new( *shape ) { self.depth = depth if depth }
+      str = memory.read memory.size
+      retval.import_pixels 0, 0, shape[0], shape[1], colourspace, str, pixel_type
+      retval
+    end
+
+  end
+
+end

data/lib/hornetseye_rmagick.rb

@@ -18,5 +18,6 @@ require 'RMagick'
 require 'malloc'
 require 'multiarray'
 require 'hornetseye_frame'
+require 'hornetseye-rmagick/node'
 require 'hornetseye-rmagick/image'
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.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-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,6 +87,7 @@ files:
 - .document
 - lib/hornetseye_rmagick.rb
 - lib/hornetseye-rmagick/image.rb
+- lib/hornetseye-rmagick/node.rb
 has_rdoc: yard
 homepage: http://wedesoft.github.com/hornetseye-rmagick/
 licenses: []