free-image 0.6.2 → 0.7.0

data/test/test_free_image.rb

@@ -1,15 +1,14 @@
-# encoding: UTF-8
-
-require './test_helper'
-require 'test/unit'
-
-class FreeImageTest < Test::Unit::TestCase
-  def test_copyright
-    assert_equal("This program uses FreeImage, a free, open source image library supporting all common bitmap formats. See http://freeimage.sourceforge.net for details",
-                 FreeImage.copyright)
-  end
-  
-  def test_version
-    assert_equal("3.15.1", FreeImage.version)
-  end
-end
+# encoding: UTF-8
+require File.join(File.dirname(__FILE__),'test_helper')
+require 'test/unit'
+
+class FreeImageTest < Test::Unit::TestCase
+  def test_copyright
+    assert_equal("This program uses FreeImage, a free, open source image library supporting all common bitmap formats. See http://freeimage.sourceforge.net for details",
+                 FreeImage.copyright)
+  end
+  
+  def test_version
+    assert_equal(['3','17'], FreeImage.version.split('.')[0..1])
+  end
+end

data/test/test_helper.rb

@@ -32,4 +32,18 @@ end
 def lena_image
   path = File.join(ROOT_DIR, 'test', 'images', 'lena.png')
   FreeImage::Bitmap.open(path)
+end
+
+def bit16_bmp(bitfield=nil)
+  suffix = begin
+    if bitfield == 555
+      'bf555'
+    elsif bitfield == 565
+      'bf565'
+    else
+      ''
+    end
+  end
+  path = File.join(ROOT_DIR, 'test', 'images', "test16#{suffix}.bmp")
+  FreeImage::Bitmap.open(path)
 end

data/test/test_information.rb

@@ -1,118 +1,146 @@
-# encoding: UTF-8
-
-require './test_helper'
-require 'test/unit'
-
-class InformationTest < Test::Unit::TestCase
-  def test_background_color
-    background_color = sample_image.background_color
-    assert_kind_of(FreeImage::RGBQuad, background_color)
-    assert_equal(112, background_color[:red])
-    assert_equal(176, background_color[:green])
-    assert_equal(240, background_color[:blue])
-  end
-
-  def test_background_color_set
-    image = sample_image
-    rgb = FreeImage::RGBQuad.create(7, 8, 9)
-
-    image.background_color = rgb
-    background_color = image.background_color
-    assert_equal(rgb, background_color)
-  end
-
-  def test_bits_per_pixel
-    assert_equal(8, sample_image.bits_per_pixel)
-  end
-
-  def test_blue_mask
-    assert_equal(0, sample_image.blue_mask)
-    assert_equal(FreeImage::RGBQuad::BLUE_MASK, lena_image.blue_mask)
-  end
-  
-  def test_color_type
-    assert_equal(:palette, sample_image.color_type)
-  end
-
-  def test_dib_size
-    assert_equal(52664, sample_image.dib_size)
-  end
-
-  def test_dots_per_meter_x
-    assert_equal(2835, sample_image.dots_per_meter_x)
-  end
-
-  def test_dots_per_meter_x_set
-    image = sample_image
-    image.dots_per_meter_x = 3000
-    assert_equal(3000, image.dots_per_meter_x)
-  end
-
-  def test_dots_per_meter_y
-    assert_equal(2835, sample_image.dots_per_meter_y)
-  end
-
-  def test_dots_per_meter_y_set
-    image = sample_image
-    image.dots_per_meter_y = 4000
-    assert_equal(4000, image.dots_per_meter_y)
-  end
-
-  def test_green_mask
-    assert_equal(0, sample_image.green_mask)
-    assert_equal(FreeImage::RGBQuad::GREEN_MASK, lena_image.green_mask)
-  end
-
-  def test_has_background_color
-    assert(sample_image.has_background_color)
-  end
-
-  def test_has_pixels
-    assert(sample_image.has_pixels)
-  end
-
-  def test_height
-    assert_equal(215, sample_image.height)
-  end
-
-  def test_image_type
-    assert_equal(:bitmap, sample_image.image_type)
-  end
-
-  def test_line
-    assert_equal(240, sample_image.line)
-  end
-
-  def test_pitch
-    assert_equal(240, sample_image.pitch)
-  end
-
-  def test_red_mask
-    assert_equal(0, sample_image.red_mask)
-    assert_equal(FreeImage::RGBQuad::RED_MASK, lena_image.red_mask)
-  end
-
-  def test_transparent
-    assert(sample_image.transparent)
-  end
-
-  def test_transparent_set
-    image = sample_image
-    image.transparent = false
-    assert(!image.transparent)
-  end
-
-  def test_transparent_index
-    assert_equal(6, sample_image.transparent_index)
-  end
-
-  def test_transparent_index_set
-    image = sample_image
-    image.transparent_index = 4
-    assert_equal(4, image.transparent_index)
-  end
-
-  def test_width
-    assert_equal(240, sample_image.width)
-  end
+# encoding: UTF-8
+
+require File.join(File.dirname(__FILE__),'test_helper')
+require 'test/unit'
+
+class InformationTest < Test::Unit::TestCase
+  def test_background_color_16bit
+    background_color = bit16_bmp.background_color
+    assert_kind_of(FreeImage::RGBQuad, background_color)
+  end
+
+  def test_background_color
+    background_color = sample_image.background_color
+    assert_kind_of(FreeImage::RGBQuad, background_color)
+    assert_equal(112, background_color[:red])
+    assert_equal(176, background_color[:green])
+    assert_equal(240, background_color[:blue])
+  end
+
+  def test_background_color_set
+    image = sample_image
+    rgb = FreeImage::RGBQuad.create(7, 8, 9)
+
+    image.background_color = rgb
+    background_color = image.background_color
+    assert_equal(rgb, background_color)
+  end
+
+  def test_bits_per_pixel
+    assert_equal(8, sample_image.bits_per_pixel)
+  end
+
+  def test_blue_mask
+    assert_equal(FreeImage::RGBQuad::BLUE_MASK, lena_image.blue_mask)
+    assert_equal(FreeImage::RGB16::BLUE_MASK, bit16_bmp.blue_mask)
+    assert_equal(FreeImage::RGB16::BLUE_MASK, bit16_bmp(555).blue_mask)
+    assert_equal(FreeImage::RGB16::BLUE_MASK, bit16_bmp(565).blue_mask)
+  end
+  
+  def test_color_type
+    assert_equal(:palette, sample_image.color_type)
+    assert_equal(:rgb, bit16_bmp(555).color_type)
+    assert_equal(:rgb, bit16_bmp(565).color_type)
+  end
+
+  def test_dib_size
+    assert_equal(52664, sample_image.dib_size)
+  end
+
+  def test_dots_per_meter_x
+    assert_equal(2835, sample_image.dots_per_meter_x)
+  end
+
+  def test_dots_per_meter_x_set
+    image = sample_image
+    image.dots_per_meter_x = 3000
+    assert_equal(3000, image.dots_per_meter_x)
+  end
+
+  def test_dots_per_meter_y
+    assert_equal(2835, sample_image.dots_per_meter_y)
+  end
+
+  def test_dots_per_meter_y_set
+    image = sample_image
+    image.dots_per_meter_y = 4000
+    assert_equal(4000, image.dots_per_meter_y)
+  end
+
+  def test_green_mask
+    assert_equal(FreeImage::RGB16::GREEN_MASK, bit16_bmp.green_mask)
+    assert_equal(FreeImage::RGB16::GREEN_MASK, bit16_bmp(555).green_mask)
+    assert_equal(FreeImage::RGB16BF565::GREEN_MASK, bit16_bmp(565).green_mask)
+  end
+
+  def test_has_background_color
+    assert(sample_image.has_background_color)
+  end
+
+  def test_has_pixels
+    assert(sample_image.has_pixels)
+  end
+
+  def test_has_rgb_masks
+    assert_equal(false, sample_image.has_rgb_masks)
+    assert_equal(false, lena_image.has_rgb_masks)
+    assert(bit16_bmp.has_rgb_masks)
+  end
+
+  def test_height
+    assert_equal(215, sample_image.height)
+  end
+
+  def test_image_type
+    assert_equal(:bitmap, sample_image.image_type)
+  end
+
+  def test_info_header
+    image = sample_image
+    info = image.info_header
+    assert_equal(215, info[:biHeight])
+    assert_equal(240, info[:biWidth])
+    assert_equal(2835, info[:biXPelsPerMeter])
+    assert_equal(2835, info[:biYPelsPerMeter])
+    assert_equal(0, info[:biCompression])
+  end
+
+  def test_line
+    assert_equal(240, sample_image.line)
+  end
+
+  def test_pitch
+    assert_equal(240, sample_image.pitch)
+  end
+
+  def test_red_mask
+    assert_equal(FreeImage::RGBQuad::RED_MASK, lena_image.red_mask)
+    assert_equal(FreeImage::RGB16::RED_MASK, bit16_bmp.red_mask)
+    assert_equal(FreeImage::RGB16::RED_MASK, bit16_bmp(555).red_mask)
+    assert_equal(FreeImage::RGB16BF565::RED_MASK, bit16_bmp(565).red_mask)
+  end
+
+  def test_transparent
+    assert(sample_image.transparent)
+  end
+
+  def test_transparent_set
+    image = sample_image
+    image.transparent = false
+    assert(!image.transparent)
+  end
+
+  def test_transparent_index
+    assert_equal(6, sample_image.transparent_index)
+  end
+
+  def test_transparent_index_set
+    image = sample_image
+    image.transparent_index = 4
+    assert_equal(4, image.transparent_index)
+  end
+
+  def test_width
+    assert_equal(240, sample_image.width)
+  end
 end

data/test/test_io.rb

@@ -1,75 +1,74 @@
-# encoding: UTF-8
-
-require './test_helper'
-require 'test/unit'
-
-class IoTest < Test::Unit::TestCase
-  def io(image = 'sample.png')
-    path = image_path(image)
-    file = File.open(path)
-    FreeImage::IO.new(file)
-  end
-
-  def test_format
-    assert_equal(:png, io.format)
-  end
-
-  def test_format_unknown
-    assert_equal(:unknown, io('not_an_image.txt').format)
-  end
-
-  def test_load
-    bitmap = io.open
-    assert_kind_of(FreeImage::Bitmap, bitmap)
-  end
-
-  def test_load_unknown
-    error = assert_raise(FreeImage::Error) do
-      io('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
-      io.open(:jpeg)
-    end
-    assert_equal("Not a JPEG file: starts with 0x89 0x50", error.to_s)
-  end
-
-  def test_save
-    tmp_file = Tempfile.new('test_free_image')
-    dst = FreeImage::IO.new(tmp_file)
-
-    bitmap = io.open
-    result = bitmap.save(dst, :png)
-    assert(result)
-    assert(File.exists?(tmp_file))
-  ensure
-    tmp_file.close
-    tmp_file.unlink
-  end
-
-  def test_corrupt
-    path = image_path('corrupt.jpg')
-    file = File.open(path)
-    io = FreeImage::IO.new(file)
-
-    error = assert_raise(FreeImage::Error) do
-      io.open
-    end
-    assert_equal("Cannot load :unknown image format", error.message)
-  end
-
-  def test_corrupt_wrong_format
-    path = image_path('corrupt.jpg')
-    file = File.open(path)
-    io = FreeImage::IO.new(file)
-
-    error = assert_raise(FreeImage::Error) do
-      io.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 IoTest < Test::Unit::TestCase
+  def io(image = 'sample.png')
+    path = image_path(image)
+    file = File.open(path)
+    FreeImage::IO.new(file)
+  end
+
+  def test_format
+    assert_equal(:png, io.format)
+  end
+
+  def test_format_unknown
+    assert_equal(:unknown, io('not_an_image.txt').format)
+  end
+
+  def test_load
+    bitmap = io.open
+    assert_kind_of(FreeImage::Bitmap, bitmap)
+  end
+
+  def test_load_unknown
+    error = assert_raise(FreeImage::Error) do
+      io('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
+      io.open(:jpeg)
+    end
+    assert_equal("Not a JPEG file: starts with 0x89 0x50", error.to_s)
+  end
+
+  def test_save
+    tmp_file = Tempfile.new('test_free_image')
+    dst = FreeImage::IO.new(tmp_file)
+
+    bitmap = io.open
+    result = bitmap.save(dst, :png)
+    assert(result)
+    assert(File.exists?(tmp_file))
+  ensure
+    tmp_file.close
+    tmp_file.unlink
+  end
+
+  def test_corrupt
+    path = image_path('corrupt.jpg')
+    file = File.open(path)
+    io = FreeImage::IO.new(file)
+
+    error = assert_raise(FreeImage::Error) do
+      io.open
+    end
+    assert_equal("Cannot load :unknown image format", error.message)
+  end
+
+  def test_corrupt_wrong_format
+    path = image_path('corrupt.jpg')
+    file = File.open(path)
+    io = FreeImage::IO.new(file)
+
+    error = assert_raise(FreeImage::Error) do
+      io.open(:png)
+    end
+    assert_equal("Could not load the image", error.message)
+  end
 end