free-image 0.6.2 → 0.7.0

data/test/test_memory.rb

@@ -1,85 +1,84 @@
-# encoding: UTF-8
-
-require './test_helper'
-require 'test/unit'
-
-class MemoryTest < Test::Unit::TestCase
-  def memory(image = 'sample.png')
-    data = image_data(image)
-    FreeImage::Memory.new(data)
-  end
-
-  def test_wrap
-    assert_not_nil(memory)
-  end
-
-  def test_format
-    assert_equal(:png, memory.format)
-  end
-
-  def test_format_unknown
-    assert_equal(:unknown, memory('not_an_image.txt').format)
-  end
-
-  def test_load
-    bitmap = memory.open
-    assert_kind_of(FreeImage::Bitmap, bitmap)
-  end
-
-  def test_load_unknown
-    error = assert_raise(FreeImage::Error) do
-      memory('not_an_image.txt').open
-    end
-    assert_equal("Cannot load :unknown image format",
-                 error.message)
-  end
-
-  def test_load_wrong_format
-    error = assert_raise(FreeImage::Error) do
-      memory.open(:jpeg, 0)
-    end
-    assert_equal("Not a JPEG file: starts with 0x89 0x50", error.to_s)
-  end
-
-  def test_bytes
-    bitmap1 = FreeImage::Bitmap.open(image_path('sample.png'))
-
-    memory = FreeImage::Memory.new(image_data('sample.png'))
-    bitmap2 = memory.open
-
-    assert_equal(bitmap1.bits, bitmap2.bits)
-  end
-
-  def test_save
-    dst = FreeImage::Memory.new
-
-    bitmap = memory.open
-    result = bitmap.save(dst, :png)
-
-    assert(result)
-    assert_not_nil(dst.memory.bytes)
-    if defined?(Encoding)
-      assert_equal(dst.memory.bytes.encoding, Encoding::BINARY)
-    end
-  end
-
-  def test_corrupt
-    data = image_data('corrupt.jpg')
-    memory = FreeImage::Memory.new(data)
-    
-    error = assert_raise(FreeImage::Error) do
-      memory.open
-    end
-    assert_equal("Cannot load :unknown image format", error.message)
-  end
-
-  def test_corrupt_wrong_format
-    data = image_data('corrupt.jpg')
-    memory = FreeImage::Memory.new(data)
-
-    error = assert_raise(FreeImage::Error) do
-      memory.open(:png)
-    end
-    assert_equal("Could not load the image", error.message)
-  end
+# encoding: UTF-8
+require File.join(File.dirname(__FILE__),'test_helper')
+require 'test/unit'
+
+class MemoryTest < Test::Unit::TestCase
+  def memory(image = 'sample.png')
+    data = image_data(image)
+    FreeImage::Memory.new(data)
+  end
+
+  def test_wrap
+    assert_not_nil(memory)
+  end
+
+  def test_format
+    assert_equal(:png, memory.format)
+  end
+
+  def test_format_unknown
+    assert_equal(:unknown, memory('not_an_image.txt').format)
+  end
+
+  def test_load
+    bitmap = memory.open
+    assert_kind_of(FreeImage::Bitmap, bitmap)
+  end
+
+  def test_load_unknown
+    error = assert_raise(FreeImage::Error) do
+      memory('not_an_image.txt').open
+    end
+    assert_equal("Cannot load :unknown image format",
+                 error.message)
+  end
+
+  def test_load_wrong_format
+    error = assert_raise(FreeImage::Error) do
+      memory.open(:jpeg, 0)
+    end
+    assert_equal("Not a JPEG file: starts with 0x89 0x50", error.to_s)
+  end
+
+  def test_bytes
+    bitmap1 = FreeImage::Bitmap.open(image_path('sample.png'))
+
+    memory = FreeImage::Memory.new(image_data('sample.png'))
+    bitmap2 = memory.open
+
+    assert_equal(bitmap1.bits, bitmap2.bits)
+  end
+
+  def test_save
+    dst = FreeImage::Memory.new
+
+    bitmap = memory.open
+    result = bitmap.save(dst, :png)
+
+    assert(result)
+    assert_not_nil(dst.memory.bytes)
+    if defined?(Encoding)
+      assert_equal(dst.memory.bytes.encoding, Encoding::BINARY)
+    end
+  end
+
+  def test_corrupt
+    data = image_data('corrupt.jpg')
+    memory = FreeImage::Memory.new(data)
+    
+    error = assert_raise(FreeImage::Error) do
+      memory.open
+    end
+    assert_equal("Cannot load :unknown image format", error.message)
+  end
+
+  def test_corrupt_wrong_format
+    data = image_data('corrupt.jpg')
+    memory = FreeImage::Memory.new(data)
+
+    error = assert_raise(FreeImage::Error) do
+      memory.open(:png)
+    end
+    assert_equal("Could not load the image", error.message)
+  end
 end

data/test/test_modify.rb

@@ -1,59 +1,76 @@
-# encoding: UTF-8
-
-require './test_helper'
-require 'test/unit'
-
-class ModifyTest < Test::Unit::TestCase
-  def test_copy
-    bitmap1 = FreeImage::Bitmap.open(image_path('sample.png'))
-    bitmap2 = bitmap1.copy(0, 0, 50, 60)
-
-    assert_kind_of(FreeImage::Bitmap, bitmap2)
-    assert_equal(50, bitmap2.width)
-    assert_equal(60, bitmap2.height)
-  end
-
-  def test_expand_canvas
-    bitmap = FreeImage::Bitmap.open(image_path('sample.png'))
-    color = FreeImage::RGBQuad.create(15, 30, 45)
-
-    result = bitmap.enlarge_canvas(1, 1, 1, 1, color)
-    assert_kind_of(FreeImage::Bitmap, result)
-  end
-
-  def test_fill_background
-    bitmap = FreeImage::Bitmap.open(image_path('sample.png'))
-    color = FreeImage::RGBQuad.create(15, 30, 45)
-
-    result = bitmap.fill_background!(color)
-    assert(result)
-  end
-
-  def test_paste
-    bitmap1 = FreeImage::Bitmap.open(image_path('sample.png'))
-    bitmap2 = FreeImage::Bitmap.open(image_path('sample.png'))
-    result = bitmap1.paste!(bitmap2, 0, 0, 0.5)
-
-    assert_kind_of(TrueClass, result)
-    assert_equal(240, bitmap2.width)
-    assert_equal(215, bitmap2.height)
-  end
-
-  def test_rescale
-    bitmap1 = FreeImage::Bitmap.open(image_path('sample.png'))
-    bitmap2 = bitmap1.rescale(120, 100, :box)
-
-    assert_kind_of(FreeImage::Bitmap, bitmap2)
-    assert_equal(120, bitmap2.width)
-    assert_equal(100, bitmap2.height)
-  end
-
-  def test_thumbnail
-    bitmap1 = FreeImage::Bitmap.open(image_path('sample.png'))
-    bitmap2 = bitmap1.make_thumbnail(100)
-
-    assert_kind_of(FreeImage::Bitmap, bitmap2)
-    assert_equal(100, bitmap2.width)
-    assert_equal(90, bitmap2.height)
-  end
+# encoding: UTF-8
+require File.join(File.dirname(__FILE__),'test_helper')
+require 'test/unit'
+
+class ModifyTest < Test::Unit::TestCase
+  def test_copy
+    bitmap1 = FreeImage::Bitmap.open(image_path('sample.png'))
+    bitmap2 = bitmap1.copy(0, 0, 50, 60)
+
+    assert_kind_of(FreeImage::Bitmap, bitmap2)
+    assert_equal(50, bitmap2.width)
+    assert_equal(60, bitmap2.height)
+  end
+
+  def test_expand_canvas
+    bitmap = FreeImage::Bitmap.open(image_path('sample.png'))
+    color = FreeImage::RGBQuad.create(15, 30, 45)
+
+    result = bitmap.enlarge_canvas(1, 1, 1, 1, color)
+    assert_kind_of(FreeImage::Bitmap, result)
+  end
+
+  def test_fill_background
+    bitmap = FreeImage::Bitmap.open(image_path('sample.png'))
+    color = FreeImage::RGBQuad.create(15, 30, 45)
+
+    result = bitmap.fill_background!(color)
+    assert(result)
+  end
+
+  def test_paste
+    bitmap1 = FreeImage::Bitmap.open(image_path('sample.png'))
+    bitmap2 = FreeImage::Bitmap.open(image_path('sample.png'))
+    result = bitmap1.paste!(bitmap2, 0, 0, 0.5)
+
+    assert_kind_of(TrueClass, result)
+    assert_equal(240, bitmap2.width)
+    assert_equal(215, bitmap2.height)
+  end
+
+  def test_rescale
+    bitmap1 = FreeImage::Bitmap.open(image_path('sample.png'))
+    bitmap2 = bitmap1.rescale(120, 100, :box)
+
+    assert_kind_of(FreeImage::Bitmap, bitmap2)
+    assert_equal(120, bitmap2.width)
+    assert_equal(100, bitmap2.height)
+  end
+
+  def test_thumbnail
+    bitmap1 = FreeImage::Bitmap.open(image_path('sample.png'))
+    bitmap2 = bitmap1.make_thumbnail(100)
+
+    assert_kind_of(FreeImage::Bitmap, bitmap2)
+    assert_equal(100, bitmap2.width)
+    assert_equal(90, bitmap2.height)
+  end
+
+  def test_composite
+    image = FreeImage::Bitmap.open(image_path('sample.png'))
+    color = FreeImage::RGBQuad.create(0, 255, 0, 0)
+    composite = image.composite_with_color(color)
+    assert(composite)
+  end
+
+  def test_composite_with_color
+    image = FreeImage::Bitmap.open(image_path('sample.png'))
+
+    # Get background that is 24 bits and the same size as the original image
+    background = FreeImage::Bitmap.open(image_path('gradient.png'))
+    background = background.rescale(image.width, image.height, :box)
+
+    composite = image.composite(background)
+    assert(composite)
+  end
 end

data/test/test_palette.rb

@@ -1,45 +1,44 @@
-# encoding: UTF-8
-
-require './test_helper'
-require 'test/unit'
-
-class PaletteTest < Test::Unit::TestCase
-  def test_palette
-    palette = sample_image.palette
-    assert_not_nil(palette)
-    assert_kind_of(FreeImage::Palette, palette)
-  end
-
-  def test_size
-    palette = sample_image.palette
-    assert_equal(256, palette.size)
-  end
-
-  def test_index
-    palette = sample_image.palette
-    rgb = palette[27]
-
-    assert_kind_of(FreeImage::RGBQuad, rgb)
-    assert_equal(201, rgb[:red])
-    assert_equal(253, rgb[:green])
-    assert_equal(0, rgb[:blue])
-  end
-
-  def test_index_too_small
-    palette = sample_image.palette
-
-    error = assert_raise(RangeError) do
-      palette[-1]
-    end
-    assert_equal("Value is out of range 0..256. Value: -1", error.message)
-  end
-
-  def test_index_too_large
-    palette = sample_image.palette
-
-    error = assert_raise(RangeError) do
-      palette[300]
-    end
-    assert_equal("Value is out of range 0..256. Value: 300", error.message)
-  end
-end
+# encoding: UTF-8
+require File.join(File.dirname(__FILE__),'test_helper')
+require 'test/unit'
+
+class PaletteTest < Test::Unit::TestCase
+  def test_palette
+    palette = sample_image.palette
+    assert_not_nil(palette)
+    assert_kind_of(FreeImage::Palette, palette)
+  end
+
+  def test_size
+    palette = sample_image.palette
+    assert_equal(256, palette.size)
+  end
+
+  def test_index
+    palette = sample_image.palette
+    rgb = palette[27]
+
+    assert_kind_of(FreeImage::RGBQuad, rgb)
+    assert_equal(201, rgb[:red])
+    assert_equal(253, rgb[:green])
+    assert_equal(0, rgb[:blue])
+  end
+
+  def test_index_too_small
+    palette = sample_image.palette
+
+    error = assert_raise(RangeError) do
+      palette[-1]
+    end
+    assert_equal("Value is out of range 0..256. Value: -1", error.message)
+  end
+
+  def test_index_too_large
+    palette = sample_image.palette
+
+    error = assert_raise(RangeError) do
+      palette[300]
+    end
+    assert_equal("Value is out of range 0..256. Value: 300", error.message)
+  end
+end

data/test/test_pixels.rb

@@ -1,62 +1,61 @@
-# encoding: UTF-8
-
-require './test_helper'
-require 'test/unit'
-
-class PixelTest < Test::Unit::TestCase
-  def test_bits
-    bytes = sample_image.bits
-    assert_not_nil(bytes)
-  end
-
-  def test_pixel_index
-    index = sample_image.pixel_index(0, 0)
-    assert_equal(113, index)
-
-    index = lena_image.pixel_index(0, 0)
-    assert_nil(index)
-  end
-
-  def test_set_pixel_index
-    image = sample_image
-    result = image.set_pixel_index(0, 0, 14)
-    assert(result)
-
-    index = image.pixel_index(0, 0)
-    assert_equal(14, index)
-  end
-
-  def test_set_pixel_invalid
-    image = lena_image
-    result = image.set_pixel_index(0, 0, 14)
-    assert(!result)
-  end
-
-  def test_pixel_color
-    color = lena_image.pixel_color(0, 0)
-    assert_kind_of(FreeImage::RGBQuad, color)
-
-    color = sample_image.pixel_color(0, 0)
-    assert_nil(color)
-  end
-
-  def test_set_pixel_color
-    image = lena_image
-
-    color1 = FreeImage::RGBQuad.create(0, 0, 255)
-    result = image.set_pixel_color(0, 0, color1)
-    assert(result)
-
-    color2 = image.pixel_color(0, 0)
-    assert_equal(color1, color2)
-  end
-
-  def test_set_pixel_invalid
-    # Pixel colors aren't supported on paletted images
-    image = sample_image
-
-    color1 = FreeImage::RGBQuad.create(0, 0, 255)
-    result = image.set_pixel_color(0, 0, color1)
-    assert(!result)
-  end
-end
+# encoding: UTF-8
+require File.join(File.dirname(__FILE__),'test_helper')
+require 'test/unit'
+
+class PixelTest < Test::Unit::TestCase
+  def test_bits
+    bytes = sample_image.bits
+    assert_not_nil(bytes)
+  end
+
+  def test_pixel_index
+    index = sample_image.pixel_index(0, 0)
+    assert_equal(113, index)
+
+    index = lena_image.pixel_index(0, 0)
+    assert_nil(index)
+  end
+
+  def test_set_pixel_index
+    image = sample_image
+    result = image.set_pixel_index(0, 0, 14)
+    assert(result)
+
+    index = image.pixel_index(0, 0)
+    assert_equal(14, index)
+  end
+
+  def test_set_pixel_invalid
+    image = lena_image
+    result = image.set_pixel_index(0, 0, 14)
+    assert(!result)
+  end
+
+  def test_pixel_color
+    color = lena_image.pixel_color(0, 0)
+    assert_kind_of(FreeImage::RGBQuad, color)
+
+    color = sample_image.pixel_color(0, 0)
+    assert_nil(color)
+  end
+
+  def test_set_pixel_color
+    image = lena_image
+
+    color1 = FreeImage::RGBQuad.create(0, 0, 255)
+    result = image.set_pixel_color(0, 0, color1)
+    assert(result)
+
+    color2 = image.pixel_color(0, 0)
+    assert_equal(color1, color2)
+  end
+
+  def test_set_pixel_invalid
+    # Pixel colors aren't supported on paletted images
+    image = sample_image
+
+    color1 = FreeImage::RGBQuad.create(0, 0, 255)
+    result = image.set_pixel_color(0, 0, color1)
+    assert(!result)
+  end
+end