ndav-magick-image 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0996608a78022414f8bd891b56e9505ae3f0f1784efe2b32e55b158ddfe53fce'
-  data.tar.gz: a6e1042355ee3cc29adfe82d1b50d805eefc151d0961e8304fc61f0284eb0fcc
+  metadata.gz: 96acb84dd6f8a244f0951db50db36caf76cdf29d87804a45cac2fb356b699e28
+  data.tar.gz: 5a5c8fce397292d41afa18d60cbdbd6e8948c40a014143ce3a003b88aea66444
 SHA512:
-  metadata.gz: 07c973f3747bd2358672c1729700f1a09f0d0d95cf33ee292e133962cf1f54e2158a5189001f2848246678c6e3d49136e05aeb1975f7947546cbbf0f61210c23
-  data.tar.gz: b8062885f5f5e2e53ca33cbab91ca36ca1aff098001b66444f3da463e611e20ea951600e7b863eed7b09942604d274bfc97184db8a0a199ed9f06226c1792c35
+  metadata.gz: d2dcc5754ad77b221630fde7deb4a6f8b36067bc938e3b0d3a2f3d5623c675d44cfba2c41527cade9e7eb4e5a2acda4dbf7cf53dbfb8c5ee9a62aec5df4825a9
+  data.tar.gz: 2b76f5e90698374a5788c212837a6cb466977479e18514606b10061be1da6e43047e712530824a6ca67f51e1e9060ba3a7e170f3e78a404d4a0238ea503cd451

data/README.md

@@ -60,9 +60,9 @@ The shape is `[height, width, channels]`. Channels vary based on the image attri
 
 ### format and item size ###
 
-Currently, this bridge exports `Magick::Image`'s MemoryCiew using `Magick::QuantumPixel`. Therefore, the MemoryView's format and item_size depend on the build options of ImageMagick. You can check the format with `NDAV::Magick::Image::MemoryViewable::FORMAT`.
+Currently, this bridge exports `Magick::Image`'s MemoryView and imports from `NDAV` using `Magick::QuantumPixel`. Therefore, the MemoryView's format and item_size depend on the build options of ImageMagick. You can check the format with `NDAV::Magick::Image::MemoryViewable::FORMAT`.
 
-On the other hand, this bridge can import MemoryViews whose format differs from `NDAV::Magick::Image::MemoryViewable::FORMAT`. Formats that are not currently supported might be supported in the future.
+It's under consideration whether other formats should be supported or not.
 
 EXAMPLE
 -------

data/lib/ndav/magick/image.rb

@@ -5,6 +5,15 @@ class NDAV
   module Magick
     module Image
       IS_HDRI_SUPPORTED = ::Magick::Magick_features.match?(/\bHDRI\b/)
+      is_little_endian = IO::Buffer::HOST_ENDIAN == IO::Buffer::LITTLE_ENDIAN
+      SUPPORTED_FORMATS =
+        case [::Magick::MAGICKCORE_QUANTUM_DEPTH, IS_HDRI_SUPPORTED]
+        in [ 8, false] then ["C"]
+        in [16, false] then ["S", is_little_endian ? "v" : "n"]
+        in [32, false] then ["L", is_little_endian ? "V" : "N"]
+        in [ 8, true ] | [16, true] | [32, true] then ["f", is_little_endian ? "e" : "g"]
+        in [64, true ] then ["d", is_little_endian ? "E" : "G"]
+        end
       COLORSPACE_TO_MAP = {
         ::Magick::GRAYColorspace        => "I",
         ::Magick::LinearGRAYColorspace  => "I",
@@ -21,55 +30,32 @@ class NDAV
         3   => "RGB",
         4   => "RGBA"
       }
-      FORMAT_TO_TYPE = Hash.new {|types, format| types[format] = type_from_format(format)}
-
-      class << self
-        # TODO: Support more formats like "CCC"
-        def type_from_format(format)
-          item_desc = NDAV::ITEM_DESCS[format]
-          return unless item_desc.length == 1
-
-          component = item_desc[0]
-          return unless component.repeat == 1
-
-          case component.format
-          when MemoryViewable::FORMAT then ::Magick::QuantumPixel
-          when "C"                    then ::Magick::CharPixel
-          when "S"                    then ::Magick::ShortPixel
-          when "L"                    then ::Magick::IntegerPixel
-          when "f"                    then ::Magick::FloatPixel
-          when "d"                    then ::Magick::DoublePixel
-          else raise "Unsupported format: #{format}"
-          end
-        end
-      end
 
       module FromNDAV
         # TODO: Support more formats
+        # TODO: Support CMYK
         def from_ndav(ndav)
-          raise "Currently, supports only row-major contiguous NDAV" unless ndav.row_major_contiguous?
-          raise "ndim must be 2 or 3 but is #{ndav.ndim}" unless [2, 3].include? ndav.ndim
+          Kernel.raise "ndim must be 2 or 3 but is #{ndav.ndim}" unless [2, 3].include? ndav.ndim
+          Kernel.raise "Currently, supports only row-major contiguous NDAV" unless ndav.row_major_contiguous?
+
+          item_desc = NDAV::ITEM_DESCS[ndav.format]
+          Kernel.raise "Unsupported format: #{ndav.format}. Must be single character" unless item_desc.length == 1
+          component = item_desc[0]
+          Kernel.raise "Unsupported format: #{ndav.format}. Must not be repeated" unless component.repeat == 1
+          Kernel.raise "Unsupported format: #{ndav.format}. Supported chars: #{SUPPORTED_FORMATS.join(', ')}" unless SUPPORTED_FORMATS.include? component.format
 
           height, width, channels = ndav.shape
           map = CHANNELS_TO_MAP[channels]          
-          raise "Unsupported channels: #{channels}" unless map
+          Kernel.raise "Unsupported channels: #{channels}" unless map
 
           image = ::Magick::Image.new(width, height)
-          image.import_pixels 0, 0, width, height, map, ndav.to_s, FORMAT_TO_TYPE[ndav.format]
+          image.import_pixels 0, 0, width, height, map, ndav.to_s, ::Magick::QuantumPixel
           image
         end
       end
-  
+
       module MemoryViewable
-        FORMAT = case [::Magick::MAGICKCORE_QUANTUM_DEPTH, NDAV::Magick::Image::IS_HDRI_SUPPORTED]
-                 in [ 8, true ] then "f"
-                 in [ 8, false] then "C"
-                 in [16, true ] then "f"
-                 in [16, false] then "S"
-                 in [32, true ] then "f"
-                 in [32, false] then "L"
-                 in [64, true ] then "d"
-                 end
+        FORMAT = SUPPORTED_FORMATS.first
         ITEM_SIZE = NDAV::ITEM_SIZES[FORMAT]
 
         private
@@ -90,7 +76,7 @@ class NDAV
           }
         end
       end
-  
+
       module Converter
         def MagickImage(array, *, **)
           if array.kind_of? ::Magick::Image

data/ndav-magick-image.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ndav-magick-image"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
   s.authors = ["Kitaiti Makoto"]
   s.summary = "N-Dimensional Array View for RMagick"
   s.licenses = ["MIT"]

data/test/helper.rb

@@ -5,14 +5,15 @@ require "fiddle"
 require "tmpdir"
 
 module Helper
+  FORMAT = NDAV::Magick::Image::MemoryViewable::FORMAT
+
   private
 
-  def make_image(width, height)
+  def make_image(width, height, former = [255, 255, 255], latter = [0, 255, 0])
     ratio = (2 ** ::Magick::MAGICKCORE_QUANTUM_DEPTH - 1) / 255
     [
-      [[255, 255, 255] * width] * (height / 2),
-      [[  0, 255,   0] * width] * (height / 2)
-    # ].flatten.collect {|item| round_trip(item * ratio, NDAV::Magick::Image::MemoryViewable::FORMAT)}
+      [former * width] * (height / 2),
+      [latter * width] * (height / 2)
     ].flatten.collect {|item| item * ratio}
   end
 end

data/test/test_converter.rb

@@ -18,12 +18,9 @@ class TestConverter < Test::Unit::TestCase
   end
 
   def test_magick_image_from_ndav
-    array = [
-              [[255, 255, 255] * @width] * (@height / 2),
-              [[  0, 255,   0] * @width] * (@height / 2)
-            ]
-    ptr = Fiddle::Pointer[array.flatten.pack("C*")]
-    ndav = ::NDAV.new(ptr, shape: [@height, @width, 3])
+    array = make_image(@width, @height)
+    ptr = Fiddle::Pointer[array.flatten.pack("#{FORMAT}*")]
+    ndav = ::NDAV.new(ptr, format: FORMAT, shape: [@height, @width, 3])
 
     assert_instance_of ::Magick::Image, ::NDAV::Converter::MagickImage(ndav)
   end

data/test/test_from_ndav.rb

@@ -7,66 +7,58 @@ class TestFromNDAV < Test::Unit::TestCase
   end
 
   def test_basic
-    array = [
-               [[255, 255, 255] * @width] * (@height / 2),
-               [[  0, 255,   0] * @width] * (@height / 2)
-             ]
-    ptr = Fiddle::Pointer[array.flatten.pack("C*")]
-    ndav = ::NDAV.new(ptr, shape: [@height, @width, 3])
+    array = make_image(@width, @height)
+    ptr = Fiddle::Pointer[array.flatten.pack("#{FORMAT}*")]
+    ndav = ::NDAV.new(ptr, format: FORMAT, shape: [@height, @width, 3])
     image = ::Magick::Image.from_ndav(ndav)
 
     assert_equal @width, image.columns
     assert_equal @height, image.rows
     assert_false image.gray?
     assert_false image.alpha?
-    assert_equal array.flatten, image.export_pixels_to_str.unpack("C*")
+    assert_equal array.flatten,
+                 image.export_pixels_to_str(0, 0, @width, @height, "RGB", ::Magick::QuantumPixel).unpack("#{FORMAT}*")
   end
 
   def test_alpha
-    array = [
-              [[255, 255, 255, 128] * @width] * (@height / 2),
-              [[  0, 255,   0, 128] * @width] * (@height / 2)
-            ]
-    ptr = Fiddle::Pointer[array.flatten.pack("C*")]
-    ndav = ::NDAV.new(ptr, shape: [@height, @width, 4])
+    array = make_image(@width, @height, [255, 255, 255, 128], [0, 255, 0, 128])
+    ptr = Fiddle::Pointer[array.flatten.pack("#{FORMAT}*")]
+    ndav = ::NDAV.new(ptr, format: FORMAT, shape: [@height, @width, 4])
     image = ::Magick::Image.from_ndav(ndav)
 
     assert_equal @width, image.columns
     assert_equal @height, image.rows
     assert_false image.gray?
     assert_true image.alpha?
-    assert_equal array.flatten, image.export_pixels_to_str(0, 0, @width, @height, "RGBA").unpack("C*")
+    assert_equal array.flatten,
+                 image.export_pixels_to_str(0, 0, @width, @height, "RGBA", ::Magick::QuantumPixel).unpack("#{FORMAT}*")
   end
 
   def test_grayscale
-    array = [
-              [[255] * @width] * (@height / 2),
-              [[128] * @width] * (@height / 2)
-            ]
-    ptr = Fiddle::Pointer[array.flatten.pack("C*")]
-    ndav = ::NDAV.new(ptr, shape: [@height, @width, 1])
+    array = make_image(@width, @height, [255], [128])
+    ptr = Fiddle::Pointer[array.flatten.pack("#{FORMAT}*")]
+    ndav = ::NDAV.new(ptr, format: FORMAT, shape: [@height, @width, 1])
     image = ::Magick::Image.from_ndav(ndav)
 
     assert_equal @width, image.columns
     assert_equal @height, image.rows
     assert_true image.gray?
     assert_false image.alpha?
-    assert_equal array.flatten, image.export_pixels_to_str(0, 0, @width, @height, "R").unpack("C*")
+    assert_equal array.flatten,
+                 image.export_pixels_to_str(0, 0, @width, @height, "R", ::Magick::QuantumPixel).unpack("#{FORMAT}*")
   end
 
   def test_gray_alpha
-    array = [
-              [[255, 128] * @width] * (@height / 2),
-              [[128, 128] * @width] * (@height / 2)
-            ]
-    ptr = Fiddle::Pointer[array.flatten.pack("C*")]
-    ndav = ::NDAV.new(ptr, shape: [@height, @width, 2])
+    array = make_image(@width, @height, [255, 128], [128, 128])
+    ptr = Fiddle::Pointer[array.flatten.pack("#{FORMAT}*")]
+    ndav = ::NDAV.new(ptr, format: FORMAT, shape: [@height, @width, 2])
     image = ::Magick::Image.from_ndav(ndav)
 
     assert_equal @width, image.columns
     assert_equal @height, image.rows
     assert_true image.gray?
     assert_true image.alpha?
-    assert_equal array.flatten, image.export_pixels_to_str(0, 0, @width, @height, "RA").unpack("C*")
+    assert_equal array.flatten,
+                 image.export_pixels_to_str(0, 0, @width, @height, "RA", ::Magick::QuantumPixel).unpack("#{FORMAT}*")
   end
 end

data/test/test_memory_viewable.rb

@@ -1,7 +1,6 @@
 require_relative "helper"
 
 class TestMemoryViewable < Test::Unit::TestCase
-  FORMAT = NDAV::Magick::Image::MemoryViewable::FORMAT
   ITEM_SIZE = NDAV::ITEM_SIZES[FORMAT]
 
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ndav-magick-image
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kitaiti Makoto