rmagick 1.13.0 → 1.14.0

data/lib/rvg/stretchable.rb

@@ -1,5 +1,5 @@
 #--
-# $Id: stretchable.rb,v 1.2 2005/12/31 14:41:04 rmagick Exp $
+# $Id: stretchable.rb,v 1.3 2006/07/18 22:24:59 rmagick Exp $
 # Copyright (C) 2006 Timothy P. Hunter
 #++
 
@@ -39,9 +39,9 @@ class Magick::RVG
     module Stretchable
 
       private
+        # Scale to fit
         def set_viewbox_none(width, height)
             sx, sy = 1.0, 1.0
-            tx, ty = @vbx_x, @vbx_y
 
             if @vbx_width
                 sx = width / @vbx_width
@@ -50,13 +50,12 @@ class Magick::RVG
                 sy = height / @vbx_height
             end
 
-            return [tx, ty, sx, sy]
+            return [sx, sy]
         end
 
         # Use align attribute to compute x- and y-offset from viewport's upper-left corner.
         def align_to_viewport(width, height, sx, sy)
-            tx, ty = @vbx_x, @vbx_y
-            tx += case @align
+            tx = case @align
                      when /\AxMin/
                          0
                      when NilClass, /\AxMid/
@@ -65,7 +64,7 @@ class Magick::RVG
                          width - @vbx_width*sx
             end
 
-            ty += case @align
+            ty = case @align
                      when /YMin\z/
                          0
                      when NilClass, /YMid\z/
@@ -79,15 +78,13 @@ class Magick::RVG
         # Scale to smaller viewbox dimension
         def set_viewbox_meet(width, height)
             sx = sy = [width / @vbx_width, height / @vbx_height].min
-            tx, ty = align_to_viewport(width, height, sx, sy)
-            return [tx, ty, sx, sy]
+            return [sx, sy]
         end
 
         # Scale to larger viewbox dimension
         def set_viewbox_slice(width, height)
             sx = sy = [width / @vbx_width, height / @vbx_height].max
-            tx, ty = align_to_viewport(width, height, sx, sy)
-            return [tx, ty, sx, sy]
+            return [sx, sy]
         end
 
         # Establish the viewbox as necessary
@@ -98,11 +95,14 @@ class Magick::RVG
             @vbx_y ||= 0.0
 
             if @align == 'none'
-                tx, ty, sx, sy = set_viewbox_none(width, height)
+                sx, sy = set_viewbox_none(width, height)
+                tx, ty = 0, 0
             elsif @meet_or_slice == 'meet'
-                tx, ty, sx, sy = set_viewbox_meet(width, height)
+                sx, sy = set_viewbox_meet(width, height)
+                tx, ty = align_to_viewport(width, height, sx, sy)
             else
-                tx, ty, sx, sy = set_viewbox_slice(width, height)
+                sx, sy = set_viewbox_slice(width, height)
+                tx, ty = align_to_viewport(width, height, sx, sy)
             end
 
             # Establish clipping path around the current viewport
@@ -112,8 +112,12 @@ class Magick::RVG
             end
 
             gc.clip_path(name)
+            # Add a non-scaled translation if meet or slice
             gc.translate(tx, ty) if (tx.abs > 1.0e-10 || ty.abs > 1.0e-10)
+            # Scale viewbox as necessary
             gc.scale(sx, sy) if (sx != 1.0 || sy != 1.0)
+            # Add a scaled translation if non-0 origin
+            gc.translate(-@vbx_x, -@vbx_y) if (@vbx_x.abs != 0.0 || @vbx_y.abs != 0)
         end
 
         def initialize(*args, &block)

data/rmagick.gemspec

@@ -1,7 +1,7 @@
 require 'date'
 Gem::Specification.new do |s|
   s.name = %q{rmagick}
-  s.version = "1.13.0"
+  s.version = "1.14.0"
   s.date = Date.today.to_s
   s.summary = %q{RMagick is an interface between the Ruby programming language and the ImageMagick and GraphicsMagick image processing libraries.}
   s.description =<<DESCRIPTION

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.99.1
+rubygems_version: 0.9.0
 specification_version: 1
 name: rmagick
 version: !ruby/object:Gem::Version 
-  version: 1.13.0
-date: 2006-06-28 00:00:00 -04:00
+  version: 1.14.0
+date: 2006-09-28 00:00:00 -04:00
 summary: RMagick is an interface between the Ruby programming language and the ImageMagick and GraphicsMagick image processing libraries.
 require_paths: 
 - lib
@@ -63,6 +63,7 @@ files:
 - doc/index.html
 - doc/info.html
 - doc/magick.html
+- doc/optequiv.html
 - doc/rvg.html
 - doc/rvgclip.html
 - doc/rvggroup.html
@@ -136,7 +137,7 @@ files:
 - doc/ex/cubic01.rb
 - doc/ex/cubic02.rb
 - doc/ex/cycle_colormap.rb
-- doc/ex/demo.rb
+- doc/ex/dissolve.rb
 - doc/ex/drawcomp.rb
 - doc/ex/drop_shadow.rb
 - doc/ex/edge.rb
@@ -164,11 +165,11 @@ files:
 - doc/ex/image.rb
 - doc/ex/implode.rb
 - doc/ex/level.rb
-- doc/ex/level_channel.rb
 - doc/ex/line.rb
 - doc/ex/line01.rb
 - doc/ex/map.rb
 - doc/ex/map_f.rb
+- doc/ex/mask.rb
 - doc/ex/matte_fill_to_border.rb
 - doc/ex/matte_floodfill.rb
 - doc/ex/matte_replace.rb
@@ -185,7 +186,6 @@ files:
 - doc/ex/normalize.rb
 - doc/ex/oil_paint.rb
 - doc/ex/opacity.rb
-- doc/ex/opaque.rb
 - doc/ex/ordered_dither.rb
 - doc/ex/path.rb
 - doc/ex/pattern1.rb
@@ -223,6 +223,7 @@ files:
 - doc/ex/shadow.rb
 - doc/ex/shave.rb
 - doc/ex/shear.rb
+- doc/ex/sketch.rb
 - doc/ex/skewx.rb
 - doc/ex/skewy.rb
 - doc/ex/smile.rb
@@ -260,6 +261,7 @@ files:
 - doc/ex/unsharp_mask.rb
 - doc/ex/viewex.rb
 - doc/ex/vignette.rb
+- doc/ex/watermark.rb
 - doc/ex/wave.rb
 - doc/ex/writing_mode01.rb
 - doc/ex/writing_mode02.rb
@@ -338,6 +340,7 @@ files:
 - doc/ex/images/smile.miff
 - doc/ex/images/spin.gif
 - doc/scripts/doc.js
+- doc/scripts/stripeTables.js
 - ext/RMagick
 - ext/RMagick/MANIFEST
 - ext/RMagick/extconf.rb.in
@@ -351,6 +354,8 @@ files:
 - ext/RMagick/rmmain.c
 - ext/RMagick/rmutil.c
 - examples/describe.rb
+- examples/demo.rb
+- examples/find_similar_region.rb
 - examples/histogram.rb
 - examples/identify.rb
 - examples/image_opacity.rb

data/doc/ex/level_channel.rb

@@ -1,33 +0,0 @@
-#! /usr/local/bin/ruby -w
-require 'RMagick'
-
-# Demonstrate the Image#level_channel method
-
-before = Magick::Image.read('images/Flower_Hat.jpg').first
-
-# Let the final argument default
-begin
-    red   = before.level_channel(Magick::RedChannel,  Magick::MaxRGB, 2)
-    green = before.level_channel(Magick::GreenChannel,Magick::MaxRGB, 2)
-    blue  = before.level_channel(Magick::BlueChannel, Magick::MaxRGB, 2)
-
-    # Composite the green image over the middle of the red image.
-    # Composite the blue image over the right-hand side of the red image.
-    green.crop!(red.columns/3, 0, red.columns/3, red.rows)
-    blue.crop!(red.columns/3*2+1, 0, red.columns/3+1, red.rows)
-    result = red.composite(green, Magick::CenterGravity, Magick::OverCompositeOp)
-    result = result.composite(blue, Magick::EastGravity, Magick::OverCompositeOp)
-
-    # Draw a black line between each of the three images.
-    line = Magick::Draw.new
-    line.line(result.columns/3, 0, result.columns/3, result.rows)
-    line.line(result.columns/3*2+1, 0, result.columns/3*2+1, result.rows)
-    line.draw(result)
-
-# Substitute the standard "Not Implemented" image
-rescue NotImplementedError
-    result = Magick::Image.read("images/notimplemented.gif").first
-end
-
-result.write('level_channel.jpg')
-exit

data/doc/ex/opaque.rb

@@ -1,14 +0,0 @@
-#! /usr/local/bin/ruby -w
-require 'RMagick'
-include Magick
-
-# Demonstrate the Image#opaque method.
-
-img = Image.read('images/Flower_Hat.jpg').first
-
-# Allow non-exact matches
-img.fuzz = 25
-img = img.opaque('white', 'red')
-
-img.write('opaque.jpg')
-