free-image 0.6.2 → 0.7.0

data/lib/free-image/types/rgb16.rb

@@ -7,5 +7,36 @@ module FreeImage
     layout :red, :word,
            :green, :word,
            :blue, :word
+    # The high order bit in 16-bit 555 is empty
+    # Define masks to extract colors from bytes
+    if FFI::Platform::BYTE_ORDER == FFI::Platform::LITTLE_ENDIAN
+      # Little Endian (x86 / MS Windows, Linux, MacOSX) : BGR(A) order
+      RED_MASK =   0x7C00
+      GREEN_MASK = 0x03E0
+      BLUE_MASK =  0x001F
+    else
+      # Big Endian (PPC / Linux, MaxOSX) : RGB(A) order
+      RED_MASK =   0x003E
+      GREEN_MASK = 0x07C0
+      BLUE_MASK =  0xF800
+    end
+    RGB_MASK  = (RED_MASK | GREEN_MASK | BLUE_MASK)
+
+  end
+
+  class RGB16BF565 < RGB16
+    # The 565 bitfield uses 16 bits, with 6 bits for Green
+    if FFI::Platform::BYTE_ORDER == FFI::Platform::LITTLE_ENDIAN
+      # Little Endian (x86 / MS Windows, Linux, MacOSX) : BGR(A) order
+      RED_MASK =   0xF800
+      GREEN_MASK = 0x07E0
+      BLUE_MASK =  0x001F
+    else
+      # Big Endian (PPC / Linux, MaxOSX) : RGB(A) order
+      RED_MASK =   0x001F
+      GREEN_MASK = 0x03E0
+      BLUE_MASK =  0xFC00
+    end
+    RGB_MASK  = (RED_MASK | GREEN_MASK | BLUE_MASK)
   end
 end

data/test/cookbook.rb

@@ -1,46 +1,45 @@
-# encoding: UTF-8
-
-require './test_helper'
-require 'test/unit'
-
-def set_to_red(color)
-  color[:red] = 255
-  color[:green] = 0
-  color[:blue] = 0
-end
-
-image = FreeImage::Bitmap.open('images/lena.png')
-thumbnail = image.make_thumbnail(100)
-
-# Make the bottom row red
-scanline = thumbnail.scanline(0)
-
-# Draw bottom border
-(0..3).each do |index|
-  scanline = thumbnail.scanline(index)
-  scanline.each do |color|
-    set_to_red(color)
-  end
-end
-
-# Draw top border
-((thumbnail.height - 5)..(thumbnail.height - 1)).each do |index|
-  scanline = thumbnail.scanline(index)
-  scanline.each do |color|
-    set_to_red(color)
-  end
-end
-
-# Draw left and right borders
-(1..(thumbnail.height - 2)).each do |index|
-  scanline = thumbnail.scanline(index)
-  (0..4).each do |index|
-    set_to_red(scanline[index])
-  end
-
-  ((thumbnail.width - 5)..(thumbnail.width - 1)).each do |index|
-    set_to_red(scanline[index])
-  end
-end
-
-thumbnail.save("images/lena_thumbnail_border_scanline.png", :png)
+# encoding: UTF-8
+require File.join(File.dirname(__FILE__),'test_helper')
+require 'test/unit'
+
+def set_to_red(color)
+  color[:red] = 255
+  color[:green] = 0
+  color[:blue] = 0
+end
+
+image = FreeImage::Bitmap.open('images/lena.png')
+thumbnail = image.make_thumbnail(100)
+
+# Make the bottom row red
+scanline = thumbnail.scanline(0)
+
+# Draw bottom border
+(0..3).each do |index|
+  scanline = thumbnail.scanline(index)
+  scanline.each do |color|
+    set_to_red(color)
+  end
+end
+
+# Draw top border
+((thumbnail.height - 5)..(thumbnail.height - 1)).each do |index|
+  scanline = thumbnail.scanline(index)
+  scanline.each do |color|
+    set_to_red(color)
+  end
+end
+
+# Draw left and right borders
+(1..(thumbnail.height - 2)).each do |index|
+  scanline = thumbnail.scanline(index)
+  (0..4).each do |index|
+    set_to_red(scanline[index])
+  end
+
+  ((thumbnail.width - 5)..(thumbnail.width - 1)).each do |index|
+    set_to_red(scanline[index])
+  end
+end
+
+thumbnail.save("images/lena_thumbnail_border_scanline.png", :png)

data/test/test_bitmap.rb

@@ -1,63 +1,61 @@
-# encoding: UTF-8
-
-require './test_helper'
-require 'test/unit'
-
-class BitmapTest < Test::Unit::TestCase
-  def test_bits
-    bytes = sample_image.bits
-    assert_equal(6466, bytes.size)
-
-    if defined?(Encoding)
-      assert_equal(Encoding::BINARY, bytes.encoding)
-      assert_equal(bytes.size, bytes.bytesize)
-    end
-  end
-
-  def test_open
-    bitmap = FreeImage::Bitmap.open('images/lena.png')
-    assert_kind_of(FreeImage::Bitmap, bitmap)
-  end
-
-  def test_open_yield
-    result = FreeImage::Bitmap.open('images/lena.png') do |bitmap|
-      assert_kind_of(FreeImage::Bitmap, bitmap)
-    end
-    assert_equal(true, result)
-  end
-
-  def test_open_yield_error
-    assert_raise(ArgumentError) do
-      FreeImage::Bitmap.open('images/lena.png') do |bitmap|
-        raise(ArgumentError, "Let's mess things up")
-      end
-    end
-  end
-
-  def test_new_from_nil
-    ptr = FFI::Pointer::NULL
-    error = assert_raise(FreeImage::Error) do
-      FreeImage::Bitmap.new(ptr)
-    end
-    assert_equal("Cannot create a bitmap from a null pointer", error.message)
-  end
-
-  def test_clone
-    image = lena_image
-    clone = image.clone
-    assert(!clone.equal?(image))
-  end
-
-  def test_clone_block
-    lena_image.clone do |image|
-      assert_not_nil(image)
-    end
-  end
-
-  def test_free
-    1000.times do
-      image = sample_image
-      image.free
-    end
-  end
-end
+# encoding: UTF-8
+require File.join(File.dirname(__FILE__),'test_helper')
+require 'test/unit'
+
+class BitmapTest < Test::Unit::TestCase
+  def test_bits
+    bytes = sample_image.bits
+    assert_equal(6466, bytes.size)
+
+    if defined?(Encoding)
+      assert_equal(Encoding::BINARY, bytes.encoding)
+      assert_equal(bytes.size, bytes.bytesize)
+    end
+  end
+
+  def test_open
+    bitmap = FreeImage::Bitmap.open(image_path('lena.png'))
+    assert_kind_of(FreeImage::Bitmap, bitmap)
+  end
+
+  def test_open_yield
+    FreeImage::Bitmap.open(image_path('lena.png')) do |bitmap|
+      assert_kind_of(FreeImage::Bitmap, bitmap)
+    end
+  end
+
+  def test_open_yield_error
+    assert_raise(ArgumentError) do
+      FreeImage::Bitmap.open(image_path('lena.png')) do |bitmap|
+        raise(ArgumentError, "Let's mess things up")
+      end
+    end
+  end
+
+  def test_new_from_nil
+    ptr = FFI::Pointer::NULL
+    error = assert_raise(FreeImage::Error) do
+      FreeImage::Bitmap.new(ptr)
+    end
+    assert_equal("Cannot create a bitmap from a null pointer", error.message)
+  end
+
+  def test_clone
+    image = lena_image
+    clone = image.clone
+    assert(!clone.equal?(image))
+  end
+
+  def test_clone_block
+    lena_image.clone do |image|
+      assert_not_nil(image)
+    end
+  end
+
+  def test_free
+    1000.times do
+      image = sample_image
+      image.free
+    end
+  end
+end

data/test/test_conversions.rb

@@ -1,86 +1,85 @@
-# encoding: UTF-8
-
-require './test_helper'
-require 'test/unit'
-
-class ConverstionsTest < Test::Unit::TestCase
-  def test_convert_to_4bits
-    bitmap = sample_image.convert_to_4bits
-    assert_kind_of(FreeImage::Bitmap, bitmap)
-    assert_equal(4, bitmap.bits_per_pixel)
-  end
-
-  def test_convert_to_8bits
-    bitmap = sample_image.convert_to_8bits
-    assert_kind_of(FreeImage::Bitmap, bitmap)
-    assert_equal(8, bitmap.bits_per_pixel)
-  end
-
-  def test_convert_to_greyscale
-    bitmap = sample_image.convert_to_greyscale
-    assert_kind_of(FreeImage::Bitmap, bitmap)
-    assert_equal(8, bitmap.bits_per_pixel)
-  end
-
-  def test_convert_to_16bits_555
-    bitmap = sample_image.convert_to_16bits_555
-    assert_kind_of(FreeImage::Bitmap, bitmap)
-    assert_equal(16, bitmap.bits_per_pixel)
-  end
-
-  def test_convert_to_16bits_565
-    bitmap = sample_image.convert_to_16bits_565
-    assert_kind_of(FreeImage::Bitmap, bitmap)
-    assert_equal(16, bitmap.bits_per_pixel)
-  end
-
-  def test_convert_to_24bits
-    bitmap = sample_image.convert_to_24bits
-    assert_kind_of(FreeImage::Bitmap, bitmap)
-    assert_equal(24, bitmap.bits_per_pixel)
-  end
-
-  def test_convert_to_32bits
-    bitmap = sample_image.convert_to_32bits
-    assert_kind_of(FreeImage::Bitmap, bitmap)
-    assert_equal(32, bitmap.bits_per_pixel)
-  end
-
-  def test_convert_to_standard_type
-    bitmap = sample_image.convert_to_standard_type
-    assert_kind_of(FreeImage::Bitmap, bitmap)
-    assert_equal(8, bitmap.bits_per_pixel)
-  end
-
-  def test_convert_to_type
-    bitmap = sample_image.convert_to_type(:rgb16)
-    assert_kind_of(FreeImage::Bitmap, bitmap)
-    assert_equal(48, bitmap.bits_per_pixel)
-  end
-
-  def test_dither
-    bitmap = sample_image.dither(:bayer4x4)
-    assert_kind_of(FreeImage::Bitmap, bitmap)
-    assert_equal(1, bitmap.bits_per_pixel)
-  end
-
-  def test_threshold
-    bitmap = sample_image.threshold(7)
-    assert_kind_of(FreeImage::Bitmap, bitmap)
-    assert_equal(1, bitmap.bits_per_pixel)
-  end
-
-  def test_threshold_low
-    error = assert_raise(RangeError) do
-      sample_image.threshold(-1)
-    end
-    assert_equal("Value is out of range 0..255. Value: -1", error.message)
-  end
-
-  def test_threshold_hight
-    error = assert_raise(RangeError) do
-      sample_image.threshold(5555)
-    end
-    assert_equal("Value is out of range 0..255. Value: 5555", error.message)
-  end
-end
+# encoding: UTF-8
+require File.join(File.dirname(__FILE__),'test_helper')
+require 'test/unit'
+
+class ConverstionsTest < Test::Unit::TestCase
+  def test_convert_to_4bits
+    bitmap = sample_image.convert_to_4bits
+    assert_kind_of(FreeImage::Bitmap, bitmap)
+    assert_equal(4, bitmap.bits_per_pixel)
+  end
+
+  def test_convert_to_8bits
+    bitmap = sample_image.convert_to_8bits
+    assert_kind_of(FreeImage::Bitmap, bitmap)
+    assert_equal(8, bitmap.bits_per_pixel)
+  end
+
+  def test_convert_to_greyscale
+    bitmap = sample_image.convert_to_greyscale
+    assert_kind_of(FreeImage::Bitmap, bitmap)
+    assert_equal(8, bitmap.bits_per_pixel)
+  end
+
+  def test_convert_to_16bits_555
+    bitmap = sample_image.convert_to_16bits_555
+    assert_kind_of(FreeImage::Bitmap, bitmap)
+    assert_equal(16, bitmap.bits_per_pixel)
+  end
+
+  def test_convert_to_16bits_565
+    bitmap = sample_image.convert_to_16bits_565
+    assert_kind_of(FreeImage::Bitmap, bitmap)
+    assert_equal(16, bitmap.bits_per_pixel)
+  end
+
+  def test_convert_to_24bits
+    bitmap = sample_image.convert_to_24bits
+    assert_kind_of(FreeImage::Bitmap, bitmap)
+    assert_equal(24, bitmap.bits_per_pixel)
+  end
+
+  def test_convert_to_32bits
+    bitmap = sample_image.convert_to_32bits
+    assert_kind_of(FreeImage::Bitmap, bitmap)
+    assert_equal(32, bitmap.bits_per_pixel)
+  end
+
+  def test_convert_to_standard_type
+    bitmap = sample_image.convert_to_standard_type
+    assert_kind_of(FreeImage::Bitmap, bitmap)
+    assert_equal(8, bitmap.bits_per_pixel)
+  end
+
+  def test_convert_to_type
+    bitmap = sample_image.convert_to_type(:rgb16)
+    assert_kind_of(FreeImage::Bitmap, bitmap)
+    assert_equal(48, bitmap.bits_per_pixel)
+  end
+
+  def test_dither
+    bitmap = sample_image.dither(:bayer4x4)
+    assert_kind_of(FreeImage::Bitmap, bitmap)
+    assert_equal(1, bitmap.bits_per_pixel)
+  end
+
+  def test_threshold
+    bitmap = sample_image.threshold(7)
+    assert_kind_of(FreeImage::Bitmap, bitmap)
+    assert_equal(1, bitmap.bits_per_pixel)
+  end
+
+  def test_threshold_low
+    error = assert_raise(RangeError) do
+      sample_image.threshold(-1)
+    end
+    assert_equal("Value is out of range 0..255. Value: -1", error.message)
+  end
+
+  def test_threshold_hight
+    error = assert_raise(RangeError) do
+      sample_image.threshold(5555)
+    end
+    assert_equal("Value is out of range 0..255. Value: 5555", error.message)
+  end
+end

data/test/test_file.rb

@@ -1,70 +1,69 @@
-# encoding: UTF-8
-
-require './test_helper'
-require 'test/unit'
-
-class FIFileTest < Test::Unit::TestCase
-  def file(image = 'sample.png')
-    path = image_path(image)
-    FreeImage::File.new(path)
-  end
-
-  def test_format
-    assert_equal(:png, file.format)
-  end
-
-  def test_format_unknown
-    assert_equal(:unknown, file('not_an_image.txt').format)
-  end
-
-  def test_load
-    bitmap = file.open
-    assert_kind_of(FreeImage::Bitmap, bitmap)
-  end
-
-  def test_load_format
-    error = assert_raise(FreeImage::Error) do
-      file('not_an_image.txt').open
-    end
-    assert_equal('Cannot load :unknown image format', error.to_s)
-  end
-
-  def test_load_wrong_format
-    error = assert_raise(FreeImage::Error) do
-      file.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::File.new(tmp_file.path)
-
-    bitmap = file.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 = FreeImage::File.new(path)
-    error = assert_raise(FreeImage::Error) do
-      file.open
-    end
-    assert_equal("Not a JPEG file: starts with 0xaa 0xc0", error.message)
-  end
-
-  def test_corrupt_wrong_format
-    path = image_path('corrupt.jpg')
-    file = FreeImage::File.new(path)
-    error = assert_raise(FreeImage::Error) do
-      # Be sneaky - say png!
-      file.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 FIFileTest < Test::Unit::TestCase
+  def file(image = 'sample.png')
+    path = image_path(image)
+    FreeImage::File.new(path)
+  end
+
+  def test_format
+    assert_equal(:png, file.format)
+  end
+
+  def test_format_unknown
+    assert_equal(:unknown, file('not_an_image.txt').format)
+  end
+
+  def test_load
+    bitmap = file.open
+    assert_kind_of(FreeImage::Bitmap, bitmap)
+  end
+
+  def test_load_format
+    error = assert_raise(FreeImage::Error) do
+      file('not_an_image.txt').open
+    end
+    assert_equal('Cannot load :unknown image format', error.to_s)
+  end
+
+  def test_load_wrong_format
+    error = assert_raise(FreeImage::Error) do
+      file.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::File.new(tmp_file.path)
+
+    bitmap = file.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 = FreeImage::File.new(path)
+    error = assert_raise(FreeImage::Error) do
+      file.open
+    end
+    assert_equal("Not a JPEG file: starts with 0xaa 0xc0", error.message)
+  end
+
+  def test_corrupt_wrong_format
+    path = image_path('corrupt.jpg')
+    file = FreeImage::File.new(path)
+    error = assert_raise(FreeImage::Error) do
+      # Be sneaky - say png!
+      file.open(:png)
+    end
+    assert_equal("Could not load the image", error.message)
+  end
 end