rmagick4j 0.3.6 → 0.3.7

data/Manifest.txt

@@ -4,147 +4,162 @@ README.txt
 Rakefile
 LICENSE.txt
 lib/RMagick.rb
-lib/rmagick4j/constants.rb
-lib/rmagick4j/draw.rb
-lib/rmagick4j/enum.rb
-lib/rmagick4j/gradient_fill.rb
-lib/rmagick4j/image.rb
-lib/rmagick4j/image_list.rb
-lib/rmagick4j/pixel.rb
-lib/rmagick4j/rmagick4j.rb
-lib/rmagick4j/texture_fill.rb
-lib/rmagick4j/type_metric.rb
-lib/rmagick4j/version.rb
-lib/rvg/clippath.rb
-lib/rvg/container.rb
+lib/rvg/stylable.rb
 lib/rvg/deep_equal.rb
-lib/rvg/describable.rb
-lib/rvg/embellishable.rb
+lib/rvg/pathdata.rb
+lib/rvg/units.rb
+lib/rvg/container.rb
 lib/rvg/misc.rb
 lib/rvg/paint.rb
-lib/rvg/pathdata.rb
-lib/rvg/rvg.rb
-lib/rvg/stretchable.rb
-lib/rvg/stylable.rb
+lib/rvg/embellishable.rb
+lib/rvg/describable.rb
 lib/rvg/text.rb
 lib/rvg/transformable.rb
-lib/rvg/units.rb
-lib/jhlabs-filters.jar
-lib/magick4j.jar
+lib/rvg/rvg.rb
+lib/rvg/clippath.rb
+lib/rvg/stretchable.rb
+lib/rmagick4j/constants.rb
+lib/rmagick4j/gradient_fill.rb
+lib/rmagick4j/draw.rb
+lib/rmagick4j/pixel.rb
+lib/rmagick4j/rmagick4j.rb
+lib/rmagick4j/image.rb
+lib/rmagick4j/image_list.rb
+lib/rmagick4j/version.rb
+lib/rmagick4j/enum.rb
+lib/rmagick4j/type_metric.rb
+lib/rmagick4j/texture_fill.rb
 lib/svgsalamander.jar
+lib/magick4j.jar
 test/implemented_methods.rb
 test/RMagickTestSuite.rb
 test/eyetests/bullseye.rb
-test/eyetests/tests/draw_arc_basic.rb
-test/eyetests/tests/draw_circle_affine.rb
-test/eyetests/tests/draw_circle_basic.rb
-test/eyetests/tests/draw_clip_path.rb
-test/eyetests/tests/draw_ellipse_affine.rb
-test/eyetests/tests/draw_ellipse_basic.rb
-test/eyetests/tests/draw_line_affine.rb
+test/eyetests/doc.rb
+test/eyetests/tests/path_c_command_01.rb
 test/eyetests/tests/draw_line_basic.rb
-test/eyetests/tests/draw_multiline_type_metrics.rb
-test/eyetests/tests/draw_pattern_1.rb
-test/eyetests/tests/draw_polygon_affine.rb
-test/eyetests/tests/draw_polygon_basic.rb
+test/eyetests/tests/gruff_stacked_bar_2.rb
+test/eyetests/tests/effect_blur.rb
+test/eyetests/tests/draw_clip_path.rb
+test/eyetests/tests/gruff_sidestacked_bar_1.rb
+test/eyetests/tests/store_pixel_smiley.rb
+test/eyetests/tests/gruff_bar_1.rb
 test/eyetests/tests/draw_polyline_affine.rb
-test/eyetests/tests/draw_polyline_basic.rb
-test/eyetests/tests/draw_pop_push_translate.rb
-test/eyetests/tests/draw_rectangle_affine.rb
-test/eyetests/tests/draw_rectangle_basic.rb
-test/eyetests/tests/draw_rmagick_test_01.rb
+test/eyetests/tests/effect_charcoal.rb
 test/eyetests/tests/draw_rmagick_test_02.rb
+test/eyetests/tests/path_m_command_02.rb
+test/eyetests/tests/draw_circle_affine.rb
+test/eyetests/tests/gruff_pie_2.rb
+test/eyetests/tests/effect_negate_true.rb
+test/eyetests/tests/draw_pattern_1.rb
+test/eyetests/tests/draw_arc_basic.rb
+test/eyetests/tests/gruff_net_1.rb
+test/eyetests/tests/path_h_command_01.rb
+test/eyetests/tests/path_a_command_02.rb
+test/eyetests/tests/path_m_command_03.rb
+test/eyetests/tests/effect_implode.rb
 test/eyetests/tests/draw_rmagick_test_03.rb
-test/eyetests/tests/draw_rmagick_test_04.rb
-test/eyetests/tests/draw_rotate_01.rb
+test/eyetests/tests/gruff_scene_2.rb
+test/eyetests/tests/path_h_command_02.rb
 test/eyetests/tests/draw_roundrectangle_affine.rb
-test/eyetests/tests/draw_roundrectangle_basic.rb
-test/eyetests/tests/draw_scale_01.rb
-test/eyetests/tests/draw_skewx_01.rb
-test/eyetests/tests/draw_skewy_01.rb
-test/eyetests/tests/draw_stroke_miterlimit.rb
-test/eyetests/tests/gradient_fill_horizontal_diagonal_fill.rb
-test/eyetests/tests/gradient_fill_horizontal_fill.rb
-test/eyetests/tests/gradient_fill_point_fill.rb
-test/eyetests/tests/gradient_fill_vertical_diagonal_fill.rb
-test/eyetests/tests/gradient_fill_vertical_fill.rb
-test/eyetests/tests/gruff_accumulator_bar.rb
-test/eyetests/tests/gruff_area_1.rb
-test/eyetests/tests/gruff_area_2.rb
-test/eyetests/tests/gruff_bar_1.rb
 test/eyetests/tests/gruff_bar_2.rb
-test/eyetests/tests/gruff_line_1.rb
-test/eyetests/tests/gruff_line_2.rb
-test/eyetests/tests/gruff_net_1.rb
-test/eyetests/tests/gruff_net_2.rb
-test/eyetests/tests/gruff_pie_1.rb
-test/eyetests/tests/gruff_pie_2.rb
-test/eyetests/tests/gruff_scene_1.rb
-test/eyetests/tests/gruff_scene_2.rb
-test/eyetests/tests/gruff_sidebar.rb
-test/eyetests/tests/gruff_sidestacked_bar_1.rb
-test/eyetests/tests/gruff_sidestacked_bar_2.rb
-test/eyetests/tests/gruff_spider_1.rb
-test/eyetests/tests/gruff_spider_2.rb
-test/eyetests/tests/gruff_stacked_bar_1.rb
-test/eyetests/tests/gruff_stacked_bar_2.rb
-test/eyetests/tests/hatch_fill.rb
-test/eyetests/tests/image_list_flatten_images.rb
-test/eyetests/tests/new_image.rb
-test/eyetests/tests/path_a_command_01.rb
-test/eyetests/tests/path_a_command_02.rb
-test/eyetests/tests/path_c_command_01.rb
+test/eyetests/tests/gruff_area_1.rb
 test/eyetests/tests/path_c_command_02.rb
+test/eyetests/tests/hatch_fill.rb
+test/eyetests/tests/gruff_line_1.rb
 test/eyetests/tests/path_complex_01.rb
-test/eyetests/tests/path_espiral_01.rb
-test/eyetests/tests/path_h_command_01.rb
-test/eyetests/tests/path_h_command_02.rb
-test/eyetests/tests/path_l_command_01.rb
 test/eyetests/tests/path_l_command_02.rb
-test/eyetests/tests/path_m_command_01.rb
-test/eyetests/tests/path_m_command_02.rb
-test/eyetests/tests/path_m_command_03.rb
-test/eyetests/tests/path_q_command_01.rb
-test/eyetests/tests/path_q_command_02.rb
 test/eyetests/tests/path_q_command_03.rb
-test/eyetests/tests/path_s_command_01.rb
-test/eyetests/tests/path_s_command_02.rb
 test/eyetests/tests/path_star_01.rb
+test/eyetests/tests/gruff_stacked_area_1.rb
+test/eyetests/tests/effect_normalize.rb
+test/eyetests/tests/path_espiral_01.rb
+test/eyetests/tests/effect_solarize.rb
+test/eyetests/tests/draw_rotate_01.rb
+test/eyetests/tests/gruff_area_2.rb
+test/eyetests/tests/gruff_net_2.rb
+test/eyetests/tests/draw_ellipse_affine.rb
+test/eyetests/tests/draw_rectangle_affine.rb
+test/eyetests/tests/gruff_spider_1.rb
+test/eyetests/tests/gruff_pie_1.rb
 test/eyetests/tests/path_t_command_01.rb
+test/eyetests/tests/gruff_sidebar.rb
+test/eyetests/tests/gruff_scene_1.rb
+test/eyetests/tests/draw_pop_push.rb
+test/eyetests/tests/draw_ellipse_basic.rb
+test/eyetests/tests/draw_rmagick_test_01.rb
+test/eyetests/tests/gruff_dot_1.rb
+test/eyetests/tests/gradient_fill_horizontal_fill.rb
 test/eyetests/tests/path_t_command_02.rb
-test/eyetests/tests/path_v_command_01.rb
 test/eyetests/tests/path_v_command_02.rb
-test/eyetests/tests/store_pixel_smiley.rb
+test/eyetests/tests/gruff_accumulator_bar.rb
+test/eyetests/tests/path_l_command_01.rb
+test/eyetests/tests/gruff_line_2.rb
+test/eyetests/tests/path_s_command_02.rb
+test/eyetests/tests/draw_multiline_type_metrics.rb
+test/eyetests/tests/effect_wave.rb
+test/eyetests/tests/path_q_command_01.rb
+test/eyetests/tests/draw_rmagick_test_04.rb
+test/eyetests/tests/draw_stroke_miterlimit.rb
+test/eyetests/tests/draw_roundrectangle_basic.rb
+test/eyetests/tests/gruff_spider_2.rb
+test/eyetests/tests/gradient_fill_horizontal_diagonal_fill.rb
+test/eyetests/tests/path_s_command_01.rb
+test/eyetests/tests/image_list_flatten_images.rb
+test/eyetests/tests/effect_shade.rb
+test/eyetests/tests/draw_pop_push_translate.rb
+test/eyetests/tests/draw_polygon_basic.rb
+test/eyetests/tests/path_q_command_02.rb
+test/eyetests/tests/draw_polyline_basic.rb
+test/eyetests/tests/path_v_command_01.rb
+test/eyetests/tests/draw_skewy_01.rb
+test/eyetests/tests/gradient_fill_vertical_diagonal_fill.rb
+test/eyetests/tests/gruff_sidestacked_bar_2.rb
+test/eyetests/tests/path_m_command_01.rb
+test/eyetests/tests/effect_edge.rb
+test/eyetests/tests/draw_skewx_01.rb
+test/eyetests/tests/gradient_fill_vertical_fill.rb
+test/eyetests/tests/gruff_stacked_bar_1.rb
+test/eyetests/tests/draw_polygon_affine.rb
+test/eyetests/tests/draw_circle_basic.rb
+test/eyetests/tests/new_image.rb
+test/eyetests/tests/effect_negate.rb
 test/eyetests/tests/texture_fill.rb
-test/gruff_tests/test/gruff_test_case.rb
-test/gruff_tests/test/monkey_gruff.rb
-test/gruff_tests/test/test_accumulator_bar.rb
-test/gruff_tests/test/test_area.rb
-test/gruff_tests/test/test_bar.rb
+test/eyetests/tests/draw_rectangle_basic.rb
+test/eyetests/tests/path_a_command_01.rb
+test/eyetests/tests/draw_scale_01.rb
+test/eyetests/tests/gradient_fill_point_fill.rb
+test/eyetests/tests/draw_line_affine.rb
 test/gruff_tests/test/test_base.rb
-test/gruff_tests/test/test_bullet.rb
-test/gruff_tests/test/test_legend.rb
-test/gruff_tests/test/test_line.rb
-test/gruff_tests/test/test_mini_bar.rb
-test/gruff_tests/test/test_mini_pie.rb
-test/gruff_tests/test/test_mini_side_bar.rb
-test/gruff_tests/test/test_net.rb
+test/gruff_tests/test/test_scene.rb
 test/gruff_tests/test/test_photo.rb
+test/gruff_tests/test/test_legend.rb
+test/gruff_tests/test/test_dot.rb
+test/gruff_tests/test/test_bullet.rb
+test/gruff_tests/test/test_area.rb
+test/gruff_tests/test/test_bar.rb
 test/gruff_tests/test/test_pie.rb
-test/gruff_tests/test/test_scene.rb
-test/gruff_tests/test/test_side_bar.rb
+test/gruff_tests/test/test_net.rb
+test/gruff_tests/test/test_mini_bar.rb
+test/gruff_tests/test/test_stacked_bar.rb
+test/gruff_tests/test/monkey_gruff.rb
+test/gruff_tests/test/test_accumulator_bar.rb
+test/gruff_tests/test/test_stacked_area.rb
 test/gruff_tests/test/test_sidestacked_bar.rb
+test/gruff_tests/test/test_line.rb
+test/gruff_tests/test/test_side_bar.rb
+test/gruff_tests/test/test_mini_side_bar.rb
+test/gruff_tests/test/gruff_test_case.rb
+test/gruff_tests/test/test_mini_pie.rb
 test/gruff_tests/test/test_spider.rb
-test/gruff_tests/test/test_stacked_bar.rb
 test/spec/draw_spec.rb
+test/spec/pixel_spec.rb
 test/spec/image_constants.rb
 test/spec/image_spec.rb
-test/spec/pixel_spec.rb
+test/spec/stories/image_filling_steps.rb
+test/spec/stories/geometry_story.rb
+test/spec/stories/image_filling_story.rb
 test/spec/stories/geometry_runner.rb
 test/spec/stories/geometry_steps.rb
-test/spec/stories/geometry_story.rb
 test/spec/stories/image_filling_runner.rb
-test/spec/stories/image_filling_steps.rb
-test/spec/stories/image_filling_story.rb
 test/images/clown.jpg
 test/images/texture.jpg

data/lib/RMagick.rb

@@ -1,4 +1,4 @@
-# $Id: RMagick.rb,v 1.72 2008/06/08 13:41:39 rmagick Exp $
+# $Id: RMagick.rb,v 1.80 2009/01/02 21:08:14 rmagick Exp $
 #==============================================================================
 #                  Copyright (C) 2008 by Timothy P. Hunter
 #   Name:       RMagick.rb
@@ -364,6 +364,30 @@ class Draw
         primitive "gravity #{GRAVITY_NAMES[grav.to_i]}"
     end
 
+    # IM 6.4.8-3 and later
+    def interword_spacing(space)
+        begin
+            Float(space)
+        rescue ArgumentError
+            Kernel.raise ArgumentError, "invalid value for interword_spacing"
+        rescue TypeError
+            Kernel.raise TypeError, "can't convert #{space.class} into Float"
+        end
+        primitive "interword-spacing #{space}"
+    end
+
+    # IM 6.4.8-3 and later
+    def kerning(space)
+        begin
+            Float(space)
+        rescue ArgumentError
+            Kernel.raise ArgumentError, "invalid value for kerning"
+        rescue TypeError
+            Kernel.raise TypeError, "can't convert #{space.class} into Float"
+        end
+        primitive "kerning #{space}"
+    end
+
     # Draw a line
     def line(startX, startY, endX, endY)
         primitive "line " + sprintf("%g,%g %g,%g", startX, startY, endX, endY)
@@ -734,6 +758,8 @@ end # module Magick::IPTC
 class Image
     include Comparable
 
+    alias_method :affinity, :remap
+
     # Provide an alternate version of Draw#annotate, for folks who
     # want to find it in this class.
     def annotate(draw, width, height, x, y, text, &block)
@@ -1409,7 +1435,7 @@ public
     end
 
     [:at, :each, :each_index, :empty?, :fetch,
-     :first, :hash, :include?, :index, :length, :nitems, :rindex, :sort!].each do |mth|
+     :first, :hash, :include?, :index, :length, :rindex, :sort!].each do |mth|
         module_eval <<-END_SIMPLE_DELEGATES
             def #{mth}(*args, &block)
                 @images.#{mth}(*args, &block)
@@ -1418,6 +1444,13 @@ public
     end
     alias_method :size, :length
 
+    # Array#nitems is not available in 1.9
+    if Array.instance_methods.include?("nitems")
+       def nitems()
+          @images.nitems()
+       end
+    end
+
     def clear
         @scene = nil
         @images.clear
@@ -1467,6 +1500,9 @@ public
     alias_method :map!, :collect!
     alias_method :__map__!, :collect!
 
+    # ImageMagic used affinity in 6.4.3, switch to remap in 6.4.4.
+    alias_method :affinity, :remap
+
     def compact
         current = get_current()
         ilist = self.class.new
@@ -1571,11 +1607,11 @@ public
     end
 
     # Initialize new instances
-    def initialize(*filenames)
+    def initialize(*filenames, &block)
         @images = []
         @scene = nil
         filenames.each { |f|
-            Magick::Image.read(f).each { |n| @images << n }
+            Magick::Image.read(f, &block).each { |n| @images << n }
             }
         if length > 0
             @scene = length - 1     # last image in array
@@ -1621,6 +1657,19 @@ public
         return a
     end
 
+    # Custom marshal/unmarshal for Ruby 1.8.
+    def marshal_dump()
+       ary = [@scene]
+       @images.each {|i| ary << Marshal.dump(i)}
+       ary
+    end
+
+    def marshal_load(ary)
+       @scene = ary.shift
+       @images = []
+       ary.each {|a| @images << Marshal.load(a)}
+    end
+
     # The ImageList class supports the Magick::Image class methods by simply sending
     # the method to the current image. If the method isn't explicitly supported,
     # send it to the current image in the array. If there are no images, send
@@ -1833,6 +1882,37 @@ public
 
 end # Magick::ImageList
 
+
+#  Collects non-specific optional method arguments
+class OptionalMethodArguments
+    def initialize(img)
+       @img = img
+    end
+
+    # miscellaneous options like -verbose
+    def method_missing(mth, val)
+       @img.define(mth.to_s.tr('_', '-'), val)
+    end
+
+    # set(key, val) corresponds to -set option:key val
+    def define(key, val = nil)
+       @img.define(key, val)
+    end
+
+    # accepts Pixel object or color name
+    def highlight_color=(color)
+       color = @img.to_color(color) if color.respond_to?(:to_color)
+       @img.define("highlight-color", color)
+    end
+
+    # accepts Pixel object or color name
+    def lowlight_color=(color)
+       color = @img.to_color(color) if color.respond_to?(:to_color)
+       @img.define("lowlight-color", color)
+    end
+end
+
+
 # Example fill class. Fills the image with the specified background
 # color, then crosshatches with the specified crosshatch color.
 # @dist is the number of pixels between hatch lines.

data/lib/rmagick4j/constants.rb

@@ -1,4 +1,5 @@
 module Magick
+  Effects = Java::Magick4jEffects
   Magick4J = Java::magick4j
   RMagick4J = Java::rmagick4j
 

data/lib/rmagick4j/image.rb

@@ -1,4 +1,3 @@
-
 module Magick
   class Image
     
@@ -52,10 +51,19 @@ module Magick
       value = Pixel.from_color(value) if value.is_a?(String)
       @image.setBackgroundColor(value)
     end
+
+    def blur
+      @image.getBlur
+    end
     
+    def blur=(value)
+      raise TypeError, "no implicit conversion to float from #{value.class.to_s.downcase}" unless value.is_a? Numeric
+      @image.setBlur(value)
+    end
+
     def blur_image(radius=0.0, sigma=1.0)
       # Swap order on purpose. I wanted them the other way around in Magick4J.
-      Image.from_image(@image.blurred(sigma, radius))
+      Image.from_image(Effects.BlurEffect.new(radius,sigma).apply(_image))
     end
     
     def change_geometry(geometry)
@@ -72,6 +80,10 @@ module Magick
             self
     end
 
+    def charcoal(radius=0.0, sigma=1.0)
+      Image.from_image(Effects.CharcoalEffect.new(radius,sigma).apply(_image))
+    end
+
     def columns
       @image.getWidth
     end
@@ -126,7 +138,11 @@ module Magick
       @image.display
       self
     end
-    
+
+    def edge(radius=0.0)
+      Image.from_image(Effects.EdgeEffect.new(radius).apply(_image))
+    end
+
     def erase!
       @image.erase
     end
@@ -156,6 +172,10 @@ module Magick
     def _image=(new_image)
       @image = new_image
     end
+
+    def implode(amount=0.5)
+      Image.from_image(Effects.ImplodeEffect.new(amount).apply(_image))
+    end
     
     def _info
       @info
@@ -171,10 +191,22 @@ module Magick
       fill.fill(self) if fill.respond_to? :fill
     end
 
+    def matte
+      @image.getMatte
+    end
+
     def matte= matte
       @image.setMatte(matte)
     end
 
+    def negate(grayscale=false)
+      Image.from_image(Effects.NegateEffect.new(grayscale).apply(_image))
+    end
+
+    def normalize
+      Image.from_image(Effects.NormalizeEffect.new().apply(_image))
+    end
+
     def quantize(number_colors=256, colorspace=RGBColorspace, dither=true, tree_depth=0, measure_error=false)
       Image.from_image(@image.quantized(number_colors, colorspace._val, dither, tree_depth, measure_error))
     end
@@ -183,6 +215,10 @@ module Magick
       Image.from_image(@image.raised(width, height, raise))
     end
 
+		def remap
+			# TODO: Implement. Just here to avoid warning in RMagick 2.9 file.
+		end
+
     def resize(*args)
       copy.resize!(*args)
     end
@@ -225,7 +261,15 @@ module Magick
     def rows
       @image.getHeight
     end
+
+    def shade(shading=false,azimuth=30,elevation=30)
+      Image.from_image(Effects.ShadeEffect.new(shading,azimuth,elevation).apply(_image))
+    end
     
+    def solarize(threshold=50)
+      Image.from_image(Effects.SolarizeEffect.new(threshold).apply(_image))
+    end
+
     def store_pixels(x, y, columns, rows, pixels)
       ria_size = columns*rows
       raise IndexError, "not enough elements in array - expecting #{ria_size}, got #{pixels.size}" if pixels.size < ria_size
@@ -249,6 +293,10 @@ module Magick
       self
     end
 
+    def wave(amplitude=25.0, wavelength=150.0)
+      Image.from_image(Effects.WaveEffect.new(amplitude,wavelength).apply(_image))
+    end
+
     def write(file, &add)
       # TODO I'm having trouble finding out how this info is used, so I'll skip using it for now.
       info = Info.new(&add)