image_voodoo 0.4 → 0.5

data/lib/image_voodoo.rb

@@ -30,11 +30,11 @@ class ImageVoodoo
   import java.awt.RenderingHints
   import java.awt.color.ColorSpace
   import java.awt.geom.AffineTransform
+  import java.awt.image.BufferedImage
   import java.awt.image.ByteLookupTable
   import java.awt.image.ColorConvertOp
   import java.awt.image.LookupOp
   import java.awt.image.RescaleOp
-  import java.awt.image.BufferedImage
   JFile = java.io.File
   import java.io.ByteArrayInputStream
   import java.io.ByteArrayOutputStream
@@ -43,6 +43,9 @@ class ImageVoodoo
 
   NEGATIVE_OP = LookupOp.new(ByteLookupTable.new(0, (0...254).to_a.reverse.to_java(:byte)), nil)
   GREY_OP = ColorConvertOp.new(ColorSpace.getInstance(ColorSpace::CS_GRAY), nil)
+  ARGB = BufferedImage::TYPE_INT_ARGB
+  RGB = BufferedImage::TYPE_INT_RGB
+  SCALE_SMOOTH = java.awt.Image::SCALE_SMOOTH
 
   def initialize(src)
     @src = src
@@ -61,18 +64,16 @@ class ImageVoodoo
     style = options[:style]
     style = nil if style.to_sym == :plain
     new_width, new_height = width + 2*border_width, height + 2*border_width
-    target = BufferedImage.new(new_width, new_height, color_type)
-    graphics = target.graphics
-    graphics.color = color
-    if style
-      raised = style.to_sym == :raised ? true : false
-      graphics.fill3DRect(0, 0, new_width, new_height, raised)
-    else
-      graphics.fill_rect(0, 0, new_width, new_height)
+    target = paint(BufferedImage.new(new_width, new_height, color_type)) do |g|
+      g.color = color
+      if style
+        raised = style.to_sym == :raised ? true : false
+        g.fill3DRect(0, 0, new_width, new_height, raised)
+      else
+        g.fill_rect(0, 0, new_width, new_height)
+      end
+      g.draw_image(@src, nil, border_width, border_width)
     end
-    graphics.draw_image(@src, nil, border_width, border_width)
-    graphics.dispose
-    target = ImageVoodoo.new target
     block_given? ? yield(target) : target
   end
 
@@ -81,7 +82,7 @@ class ImageVoodoo
   # new_pixel = pixel * scale + offset
   #
   def adjust_brightness(scale, offset)
-    image = ImageVoodoo.new internal_transform(RescaleOp.new(scale, offset, nil))
+    image = internal_transform(RescaleOp.new(scale, offset, nil))
     block_given? ? yield(image) : image
   end
 
@@ -91,17 +92,15 @@ class ImageVoodoo
   #
   def alpha(rgb)
     color = hex_to_color(rgb)
-    target = BufferedImage.new(width, height, BufferedImage::TYPE_INT_ARGB)
-    graphics = target.graphics
-    graphics.set_composite(java.awt.AlphaComposite::Src)
-    graphics.draw_image(@src, nil, 0, 0)
-    graphics.dispose
-    0.upto(height-1) do |i|
-      0.upto(width-1) do |j|
-        target.setRGB(j, i, 0x8F1C1C) if target.getRGB(j, i) == color.getRGB
+    target = paint(BufferedImage.new(width, height, ARGB)) do |g|
+      g.set_composite(java.awt.AlphaComposite::Src)
+      g.draw_image(@src, nil, 0, 0)
+      0.upto(height-1) do |i|
+        0.upto(width-1) do |j|
+          target.setRGB(j, i, 0x8F1C1C) if target.getRGB(j, i) == color.getRGB
+        end
       end
     end
-    target = ImageVoodoo.new target
     block_given? ? yield(target) : target
   end
 
@@ -131,11 +130,9 @@ class ImageVoodoo
   # Flips the image horizontally and yields/returns the new image.
   #
   def flip_horizontally
-    target = BufferedImage.new(width, height, color_type)
-    graphics = target.graphics
-    graphics.draw_image(@src, 0, 0, width, height, width, 0, 0, height, nil)
-    graphics.dispose
-    target = ImageVoodoo.new target
+    target = paint do |g|
+      g.draw_image @src, 0, 0, width, height, width, 0, 0, height, nil
+    end
     block_given? ? yield(target) : target
   end
 
@@ -143,11 +140,9 @@ class ImageVoodoo
   # Flips the image vertically and yields/returns the new image.
   #
   def flip_vertically
-    target = BufferedImage.new(width, height, color_type)
-    graphics = target.graphics
-    graphics.draw_image(@src, 0, 0, width, height, 0, height, width, 0, nil)
-    graphics.dispose
-    target = ImageVoodoo.new target
+    target = paint do |g|
+      g.draw_image @src, 0, 0, width, height, 0, height, width, 0, nil
+    end
     block_given? ? yield(target) : target
   end
 
@@ -155,8 +150,8 @@ class ImageVoodoo
   # Creates a grayscale version of image and yields/returns the new image.
   #
   def greyscale
-    image = ImageVoodoo.new internal_transform(GREY_OP)
-    block_given? ? yield(image) : image
+    target = internal_transform(GREY_OP)
+    block_given? ? yield(target) : target
   end
   alias_method :grayscale, :greyscale
 
@@ -164,8 +159,8 @@ class ImageVoodoo
   # Creates a negative and yields/returns the new image.
   #
   def negative
-    image = ImageVoodoo.new internal_transform(NEGATIVE_OP)
-    block_given? ? yield(image) : image
+    target = internal_transform(NEGATIVE_OP)
+    block_given? ? yield(target) : target
   end
 
   #
@@ -173,17 +168,10 @@ class ImageVoodoo
   # yields/returns the new image. 
   #
   def resize(width, height)
-    target = BufferedImage.new(width, height, color_type)
-    graphics = target.graphics
-    graphics.set_rendering_hint(RenderingHints::KEY_INTERPOLATION,
-                                RenderingHints::VALUE_INTERPOLATION_BICUBIC)
-    w_scale = width.to_f / @src.width
-    h_scale = height.to_f / @src.height
-    transform = AffineTransform.get_scale_instance w_scale, h_scale
-    graphics.draw_rendered_image @src, transform
-    graphics.dispose
-
-    target = ImageVoodoo.new target
+    target = paint(BufferedImage.new(width, height, color_type)) do |g|
+      scaled_image = @src.get_scaled_instance width, height, SCALE_SMOOTH
+      g.draw_image scaled_image, 0, 0, nil
+    end
     block_given? ? yield(target) : target
   rescue NativeException => ne
     raise ArgumentError, ne.message
@@ -207,7 +195,6 @@ class ImageVoodoo
   #
   def scale(ratio)
     new_width, new_height = (width * ratio).to_i, (height * ratio).to_i
-
     target = resize(new_width, new_height)
     block_given? ? yield(target) : target
   end
@@ -249,7 +236,7 @@ class ImageVoodoo
     end
 
     def paintComponent(graphics)
-      graphics.drawImage(@image.to_java, @x, @y, nil)
+      graphics.draw_image(@image.to_java, @x, @y, nil)
     end
   end
 
@@ -284,11 +271,9 @@ class ImageVoodoo
     tracker = java.awt.MediaTracker.new(java.awt.Label.new(""))
     tracker.addImage(image, 0);
     tracker.waitForID(0)
-    target = BufferedImage.new(image.getWidth, image.getHeight, BufferedImage::TYPE_INT_RGB)
-    graphics = target.graphics
-    graphics.drawImage(image, 0, 0, nil)
-    graphics.dispose
-    target = ImageVoodoo.new target
+    target = paint(BufferedImage.new(image.width, image.height, RGB)) do |g| 
+      g.draw_image image, 0, 0, nil
+    end
     block_given? ? yield(target) : target
   rescue java.io.IOException, java.net.MalformedURLException
     raise ArgumentError.new "Trouble retrieving image: #{$!.message}"
@@ -351,18 +336,32 @@ class ImageVoodoo
   # existing image contains an alpha channel or not.
   #
   def color_type
-    return BufferedImage::TYPE_INT_ARGB if @src.color_model.has_alpha
-    BufferedImage::TYPE_INT_RGB
+    @src.color_model.has_alpha ? ARGB : RGB
+  end
+
+  #
+  # DRY up drawing setup+teardown
+  # 
+  def paint(src=dup_src)
+    yield src.graphics
+    src.graphics.dispose
+    ImageVoodoo.new src
+  end
+
+  # 
+  # Make a duplicate of the underlying Java src image
+  #
+  def dup_src
+    BufferedImage.new width, height, color_type
   end
 
   #
   # Do simple AWT operation transformation to target.
   #
-  def internal_transform(operation, target=BufferedImage.new(width, height, color_type))
-    graphics = target.graphics
-    graphics.drawImage(@src, 0, 0, nil)
-    graphics.drawImage(operation.filter(target, nil), 0, 0, nil)
-    graphics.dispose
-    target
+  def internal_transform(operation, target=dup_src)
+    paint(target) do |g|
+      g.draw_image(@src, 0, 0, nil)
+      g.draw_image(operation.filter(target, nil), 0, 0, nil)
+    end
   end
 end

data/lib/image_voodoo/version.rb

@@ -1,3 +1,3 @@
 class ImageVoodoo
-  VERSION = "0.4"
+  VERSION = "0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: image_voodoo
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: "0.5"
 platform: ruby
 authors: 
 - Thomas Enebo, Charles Nutter and JRuby contributors
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-28 00:00:00 +09:00
+date: 2009-04-13 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jruby-extras
-rubygems_version: 1.0.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Image manipulation in JRuby with ImageScience compatible API