gifenc 0.1.0 → 0.2.1

data/lib/image.rb

@@ -1,5 +1,3 @@
-require 'lzwrb'
-
 module Gifenc
   # Represents a single image. A GIF may contain multiple images, and they need
   # not be animation frames (they could simply be tiles of a static image).
@@ -13,6 +11,9 @@ module Gifenc
   # be chained properly.
   class Image
 
+    # # 1-byte field indicating the beginning of an image block.
+    IMAGE_SEPARATOR = ','.freeze
+
     # Width of the image in pixels. Use the {#resize} method to change it.
     # @return [Integer] Image width.
     # @see #resize
@@ -109,12 +110,13 @@ module Gifenc
         @width  = bbox[2]
         @height = bbox[3]
       end
-      @width     = width  if width
-      @height    = height if height
-      @x         = x      if x
-      @y         = y      if y
-      @lct       = lct
-      @interlace = interlace
+      @width      = width  if width
+      @height     = height if height
+      @x          = x      if x
+      @y          = y      if y
+      @lct        = lct
+      @interlace  = interlace
+      @compressed = false
 
       # Checks
       raise Exception::CanvasError, "The width of the image must be supplied" if !@width
@@ -143,20 +145,17 @@ module Gifenc
       @gce.encode(stream) if @gce
 
       # Image descriptor
-      stream << ','
-      stream << [@x, @y, @width, @height].pack('S<4')
+      stream << IMAGE_SEPARATOR
+      stream << [@x, @y, @width, @height].pack('S<4'.freeze)
       flags = (@interlace ? 1 : 0) << 6
       flags |= @lct.local_flags if @lct
-      stream << [flags].pack('C')
+      stream << [flags].pack('C'.freeze)
 
       # Local Color Table
       @lct.encode(stream) if @lct
 
       # LZW-compressed image data
-      min_bits = 8 #@lct ? @lct.bit_size : 8
-      stream << min_bits.chr
-      lzw = LZWrb.new(preset: LZWrb::PRESET_GIF, min_bits: min_bits, verbosity: :minimal)
-      stream << Util.blockify(lzw.encode(@pixels.pack('C*')))
+      stream << (@compressed ? @pixels : Util.lzw_encode(@pixels.pack('C*'.freeze)))
     end
 
     # Create a duplicate copy of this image.
@@ -168,7 +167,7 @@ module Gifenc
         @width, @height, @x, @y,
         color: @color, gce: gce, delay: @delay, trans_color: @trans_color,
         disposal: @disposal, interlace: @interlace, lct: lct
-      )
+      ).replace(@pixels.dup)
       image
     end
 
@@ -187,6 +186,7 @@ module Gifenc
     # @return (see #delay)
     # @see (see #delay)
     def delay=(value)
+      return if !value
       @gce = Extension::GraphicControl.new if !@gce
       @gce.delay = value
     end
@@ -208,6 +208,7 @@ module Gifenc
     # @return (see #disposal)
     # @see (see #disposal)
     def disposal=(value)
+      return if !value
       @gce = Extension::GraphicControl.new if !@gce
       @gce.disposal = value
     end
@@ -227,10 +228,33 @@ module Gifenc
     # @return (see #trans_color)
     # @see (see #trans_color)
     def trans_color=(value)
+      return if !value
       @gce = Extension::GraphicControl.new if !@gce
       @gce.trans_color = value
     end
 
+    # Fetch one row of pixels from the image.
+    # @param row [Integer] The index of the row to fetch.
+    # @return [Array<Integer>] The row of pixels.
+    # @raise [Exception::CanvasError] If the row is out of bounds.
+    def row(row)
+      if row < 0 || row >= @height
+        raise Exception::CanvasError, "Row out of bounds."
+      end
+      @pixels[row * @width, @width]
+    end
+
+    # Fetch one column of pixels from the image.
+    # @param col [Integer] The index of the column to fetch.
+    # @return [Array<Integer>] The column of pixels.
+    # @raise [Exception::CanvasError] If the column is out of bounds.
+    def col(col)
+      if col < 0 || col >= @width
+        raise Exception::CanvasError, "Column out of bounds."
+      end
+      @height.times.map{ |r| @pixels[col, r] }
+    end
+
     # Change the pixel data (color indices) of the image. The size of the array
     # must match the current dimensions of the canvas, otherwise a manual resize
     # is first required.
@@ -247,6 +271,108 @@ module Gifenc
       self
     end
 
+    # Destroy the pixel data of the image. This simply substitutes the contents
+    # of the array, hoping that the underlying data will go out of scope and
+    # be collected by the garbage collector. This is intended for freeing
+    # space and to simulate "destroying" the image.
+    # @return (see #initialize)
+    def destroy
+      @pixels = nil
+      self
+    end
+
+    # Paint the whole canvas with the base image color.
+    # @return (see #initialize)
+    def clear
+      @pixels = [@color] * (@width * @height)
+      self
+    end
+
+    # Copy a rectangular region from another image to this one. The dimension of
+    # the region, as well as the source offset and the destination offset, can
+    # be provided. If the region would go out of bounds, the function will
+    # just gracefully crop it rather than failing. Additionally, a more restrictive
+    # bounding box (smaller than the full image) can also be provided, to where
+    # the copying will be confined.
+    # @note The two images are assumed to have the same color table, since what
+    #   is copied is the color indexes.
+    # @param src [Image] The source image to copy the contents from.
+    # @param offset [Array<Integer>] The coordinates of the offset of the region
+    #   in the source image.
+    # @param dim [Array<Integer>] The dimensions of the region, in the form `[W, H]`,
+    #   where W is the width and H is the height of the rectangle to copy. If
+    #   unspecified (`nil`), the whole source image will be copied.
+    # @param dest [Array<Integer>] The coordinates of the destination offset of
+    #   the region in this image.
+    # @param trans [Boolean] If enabled, the pixels from the source image whose
+    #   color is the transparent one (for the source image) won't be copied over,
+    #   effectively achieving the usual GIF composition with basic transparency.
+    #   It's a bit slower as a consequence.
+    # @param bbox [Array<Integer>] The bounding box (with respect to this image)
+    #   where the copying should be restricted to. Everything outside this region
+    #   will be left untouched. If unspecified (`nil`), this will be the whole
+    #   image. As usual, the format is `[X, Y, W, H]`, where `[X, Y]` are the
+    #   coordinates of the upper left pixel, and `[W, H]` are the pixel width
+    #   and height, respectively.
+    # @raise [Exception::CanvasError] If no source provided.
+    # @return (see #initialize)
+    def copy(src: nil, offset: [0, 0], dim: nil, dest: [0, 0], trans: false, bbox: nil)
+      raise Exception::CanvasError, "Cannot copy, no source provided." if !src
+
+      # Parse parameters
+      bbox   = [0, 0, @width, @height] unless bbox
+      dim    = [src.width, src.height] unless dim
+      offset = Geometry::Point.parse(offset).round
+      dim    = Geometry::Point.parse(dim).round
+      dest   = Geometry::Point.parse(dest).round
+
+      # Normalize main bbox
+      bbox = Geometry.rect_overlap(bbox, [0, 0, @width, @height])
+      return if !bbox
+      bbox.map!(&:round)
+
+      # Normalize source bbox
+      src_bbox  = [offset.x, offset.y, dim.x, dim.y]
+      src_bbox  = Geometry.rect_overlap(src_bbox, [0, 0, src.width, src.height])
+      return if !src_bbox
+      offset    = Geometry::Point.parse(src_bbox[0, 2])
+      dim       = Geometry::Point.parse(src_bbox[2, 2])
+
+      # Normalize destination bbox
+      dest_bbox = [dest.x, dest.y, dim.x, dim.y]
+      overlap = Geometry.rect_overlap(dest_bbox, bbox)
+      return if !dest_bbox
+      dest      = Geometry::Point.parse(overlap[0, 2])
+      dim       = Geometry::Point.parse(overlap[2, 2])
+
+      # Transform coordinates of source to coordinates of destination
+      offset += Gifenc::Geometry.transform([dest], dest_bbox)[0]
+
+      # Handy fetch
+      dx, dy = dest.x.round,   dest.y.round
+      ox, oy = offset.x.round, offset.y.round
+      lx, ly = dim.x.round,    dim.y.round
+      bg = src.trans_color
+
+      # Copy pixel data. We use a different, slightly faster, algorithm if we
+      # don't have a bg color check to make, by directly copying full rows.
+      if trans && bg
+        c = nil
+        ly.times.each{ |y|
+          lx.times.each{ |x|
+            c = src[ox + x, oy + y]
+            self[dx + x, dy + y] = c unless c == bg
+          }
+        }
+      else
+        ly.times.each{ |y|
+          @pixels[(dy + y) * @width + dx, lx] = src.pixels[(oy + y) * src.width + ox, lx]
+        }
+      end
+
+      self
+    end
+
     # Change the image's width and height. If the provided values are smaller,
     # the image is cropped. If they are larger, the image is padded with the
     # color specified by {#color}.
@@ -288,6 +414,12 @@ module Gifenc
       self
     end
 
+    def compress
+      raise Exception::CanvasError, "Image is already compressed." if @compressed
+      @pixels = Util.lzw_encode(@pixels.pack('C*'))
+      @compressed = true
+    end
+
     # Returns the bounding box of the image. This is a tuple of the form
     # `[X, Y, W, H]`, where `[X, Y]` are the coordinates of its upper left
     # corner - i.e., it's offset in the logical screen - and `[W, H]` are
@@ -303,7 +435,7 @@ module Gifenc
     # @param y [Integer] The Y coordinate of the pixel.
     # @return [Integer] The color index of the pixel.
     def [](x, y)
-      @pixels[y * width + x]
+      @pixels[y * @width + x]
     end
 
     # Set the value (color _index_) of a pixel fast (i.e. without bound checks).
@@ -313,7 +445,7 @@ module Gifenc
     # @param color [Integer] The new color index of the pixel.
     # @return [Integer] The new color index of the pixel.
     def []=(x, y, color)
-      @pixels[y * width + x] = color & 0xFF
+      @pixels[y * @width + x] = color & 0xFF
     end
 
     # Get the values (color _index_) of a list of pixels safely (i.e. with bound
@@ -323,10 +455,10 @@ module Gifenc
     # @return [Array<Integer>] The list of colors, in the same order.
     # @raise [Exception::CanvasError] If any of the specified points is out of bounds.
     def get(points)
-      bound_check(points.min_by(&:first)[0], points.min_by(&:last)[1])
-      bound_check(points.max_by(&:first)[0], points.max_by(&:last)[1])
+      bound_check([points.min_by(&:first)[0], points.min_by(&:last)[1]], false)
+      bound_check([points.max_by(&:first)[0], points.max_by(&:last)[1]], false)
       points.map{ |p|
-        @pixels[p[1] * width + p[0]]
+        @pixels[p[1] * @width + p[0]]
       }
     end
 
@@ -341,15 +473,29 @@ module Gifenc
     # @return (see #initialize)
     # @raise [Exception::CanvasError] If any of the specified points is out of bounds.
     def set(points, colors)
-      bound_check(points.min_by(&:first)[0], points.min_by(&:last)[1])
-      bound_check(points.max_by(&:first)[0], points.max_by(&:last)[1])
+      bound_check([points.min_by(&:first)[0], points.min_by(&:last)[1]], false)
+      bound_check([points.max_by(&:first)[0], points.max_by(&:last)[1]], false)
       single = colors.is_a?(Integer)
       points.each_with_index{ |p, i|
-        @pixels[p[1] * width + p[0]] = single ? color & 0xFF : colors[i] & 0xFF
+        @pixels[p[1] * @width + p[0]] = single ? color & 0xFF : colors[i] & 0xFF
       }
       self
     end
 
+    # Fill a contiguous region with a new color. This implements the classic
+    # flood fill algorithm used in bucket tools.
+    # @param x [Integer] X coordinate of the starting pixel.
+    # @param y [Integer] Y coordinate of the starting pixel.
+    # @param color [Integer] Index of the color to fill the region with.
+    # @return (see #initialize)
+    # @raise [Exception::CanvasError] If the specified point is out of bounds.
+    def fill(x, y, color)
+      bound_check([x, y], false)
+      return self if self[x, y] == color
+      fill_span(x, y, self[x, y], color)
+      self
+    end
+
     # Draw a straight line connecting 2 points. It requires the startpoint `p1`
     # and _either_ of the following:
     # * The endpoint (`p2`).
@@ -368,62 +514,66 @@ module Gifenc
     #   the `direction` or the `angle` method is being used.
     # @param color [Integer] Index of the color of the line.
     # @param weight [Integer] Width of the line in pixels.
-    # @param tip [Boolean] Whether to include the line's final pixel. This
-    #   is useful for when multiple lines are joined to form a polygonal line.
+    # @param anchor [Float] Since the weight can be multiple pixels, this argument
+    #   indicates the position of the line with respect to the coordinates. It
+    #   must be in the interval [-1, 1]. A value of `0` centers the line in its
+    #   width, a value of `-1` draws it on one side, and `1` on the other.
+    # @param bbox [Array<Integer>] Bounding box determining the region to which
+    #   the drawing will be restricted, in the format `[X, Y, W, H]`, where `[X, Y]`
+    #   are the coordinates of the upper left corner of the box, and `[W, H]` are
+    #   the pixel dimensions. If unspecified (`nil`), this defaults to the whole
+    #   image.
+    # @param avoid [Array<Integer>] List of colors over which the line should
+    #   NOT be drawn.
+    # @param style [Symbol] Named style / pattern of the line. Can be `:solid`
+    #   (default), `:dashed` and `:dotted`. Fine grained control can be obtained
+    #   with the `pattern` option.
+    # @param density [Symbol] Density of the line style/ pattern. Can be `:normal`
+    #   (default), `:dense` and `:loose`. Only relevant when the `style` option
+    #   is used (and only makes a difference for dashed and dotted patterns).
+    #   Fine grained control can be obtained with the `pattern` option.
+    # @param pattern [Array<Integer>] A pair of integers specifying what portion
+    #   of the line should be ON (i.e. drawn) and OFF (i.e. spacing). With this
+    #   option, any arbitrary pattern can be achieved. Common patterns, such as
+    #   dotted and dashed, can be achieved more simply using the `style` and
+    #   `density` options instead.
+    # @param pattern_offset [Integer] If the line style is not solid, this integer
+    #   will offset /shift the pattern a fixed number of pixels forward (or backwards).
     # @return (see #initialize)
     # @raise [Exception::CanvasError] If the line would go out of bounds.
     # @todo Add support for anchors and anti-aliasing, better brushes, etc.
-    def line(p1: nil, p2: nil, vector: nil, angle: nil,
-      direction: nil, length: nil, color: 0, weight: 1, tip: true)
+    def line(p1: nil, p2: nil, vector: nil, angle: nil, direction: nil,
+      length: nil, color: 0, weight: 1, anchor: 0, bbox: nil, avoid: [],
+      style: :solid, density: :normal, pattern: nil, pattern_offset: 0)
       # Determine start and end points
       raise Exception::CanvasError, "The line start must be specified." if !p1
-      x0, y0 = p1
+      p1 = Geometry::Point.parse(p1)
       if p2
-        x1, y1 = p2
+        p2 = Geometry::Point.parse(p2)
       else
-        x1, y1 = Geometry.endpoint(
+        p2 = Geometry.endpoint(
           point: p1, vector: vector, direction: direction,
           angle: angle, length: length
         )
       end
-      bound_check(x0, y0)
-      bound_check(x1, y1)
-
-      # Normalize coordinates
-      swap = (y1 - y0).abs > (x1 - x0).abs
-      x0, x1, y0, y1 = y0, y1, x0, x1 if swap
-
-      # Precompute useful parameters
-      dx = x1 - x0
-      dy = y1 - y0
-      sx = dx < 0 ? -1 : 1
-      sy = dy < 0 ? -1 : 1
-      dx *= sx
-      dy *= sy
-      x, y = x0, y0
-      s = [sx, sy]
-
-      # If both endpoints are the same, draw a single point and return
-      if dx == 0
-        line_chunk(x0, y0, color, weight, swap)
-        return self
-      end
+      pattern = parse_line_pattern(style, density, weight) unless pattern
 
-      # Rotate weight
-      e_acc = 0
-      e = ((dy << 16) / dx.to_f).round
-      max = (dy <= 1 ? dx - 1 : dx + (weight / 2.0).to_i - 2) + (tip ? 1 : 0)
-      weight *= (1 + (dy.to_f / dx) ** 2) ** 0.5
-
-      # Draw line chunks
-      0.upto(max) do |i|
-        e_acc += e
-        y += sy if e_acc > 0xFFFF unless i == 0 && e == 0x10000
-        e_acc &= 0xFFFF
-        w = 0xFF - (e_acc >> 8)
-        brush_chunk(x, y, color, weight, swap)
-        x += sx
+      if (p2 - p1).norm < Geometry::PRECISION
+        a = Geometry::ORIGIN
+      else
+        a = (p2 - p1).normal_right.normalize_inf
+        a -= a * (1 - anchor)
       end
+      steps = (p2 - p1).norm_inf.ceil + 1
+      delta = (p2 - p1) / [(steps - 1), 1].max
+      point = p1
+      brush = Brush.square(weight, color, [a.x, a.y])
+      steps.times.each_with_index{ |s|
+        if (s - pattern_offset) % pattern.sum < pattern[0]
+          brush.draw(point.x.round, point.y.round, self, bbox: bbox, avoid: avoid)
+        end
+        point += delta
+      }
 
       self
     end
@@ -436,76 +586,690 @@ module Gifenc
     # @param stroke [Integer] Index of the border color.
     # @param fill   [Integer] Index of the fill color (`nil` for no fill).
     # @param weight [Integer] Stroke width of the border in pixels.
+    # @param anchor [Float]   Indicates the position of the border with respect
+    #   to the rectangle's boundary. Must be between -1 and 1. For example:
+    #   * For `0` the border is centered around the boundary.
+    #   * For `1` the border is entirely contained within the boundary.
+    #   * For `-1` the border is entirely surrounding the boundary.
+    # @param style [Symbol] Border line style (`:solid`, `:dashed`, `:dotted`).
+    #   See `style` param in {#line}).
+    # @param density [Symbol] Border line pattern density (`:normal`, `:dense`,
+    #   `:loose`). See `density` param in {#line}.
+    # @param bbox [Array<Integer>] Bounding box determining the region to which
+    #   the drawing will be restricted. See `bbox` param in {#line}.
     # @return (see #initialize)
     # @raise [Exception::CanvasError] If the rectangle would go out of bounds.
-    def rect(x, y, w, h, stroke, fill = nil, weight: 1)
-      # Check coordinates
-      x0, y0, x1, y1 = x, y, x + w - 1, y + h - 1
-      bound_check(x0, y0)
-      bound_check(x1, y1)
+    def rect(x, y, w, h, stroke = nil, fill = nil, weight: 1, anchor: 1,
+      style: :solid, density: :normal, bbox: nil)
+      # Normalize bbox
+      bbox = [0, 0, @width, @height] unless bbox
+      bbox = Geometry.rect_overlap(bbox, [0, 0, @width, @height])
+      return if !bbox
+      bbox.map!(&:round)
+
+      # Intersect bbox with rectangle
+      rect_bbox = Geometry.rect_overlap(bbox, [x, y, w, h])
+      return if !rect_bbox
+      x0 = rect_bbox[0].round
+      y0 = rect_bbox[1].round
+      x1 = (rect_bbox[0] + rect_bbox[2]).round - 1
+      y1 = (rect_bbox[1] + rect_bbox[3]).round - 1
 
       # Fill rectangle, if provided
       if fill
-        for x in (x0 .. x1)
-          for y in (y0 .. y1)
+        (x0 .. x1).each{ |x|
+          (y0 .. y1).each{ |y|
             @pixels[y * @width + x] = fill
-          end
-        end
+          }
+        }
       end
 
       # Rectangle border
-      line(p1: [x0, y0], p2: [x1, y0], color: stroke, weight: weight)
-      line(p1: [x0, y1], p2: [x1, y1], color: stroke, weight: weight)
-      line(p1: [x0, y0], p2: [x0, y1], color: stroke, weight: weight)
-      line(p1: [x1, y0], p2: [x1, y1], color: stroke, weight: weight)
+      if stroke
+        if anchor != 0
+          o = ((weight - 1) / 2.0 * anchor).round
+          w -= 2 * o - (weight % 2 == 0 ? 1 : 0)
+          h -= 2 * o - (weight % 2 == 0 ? 1 : 0)
+          rect(x0 + o, y0 + o, w, h, stroke, weight: weight, anchor: 0)
+        else
+          points = [[x0, y0], [x1, y0], [x1, y1], [x0, y1]]
+          4.times.each{ |i|
+            line(
+              p1:      points[i],
+              p2:      points[(i + 1) % 4],
+              color:   stroke,
+              weight:  weight,
+              anchor:  anchor,
+              style:   style,
+              density: density
+            )
+          }
+        end
+      end
 
       self
     end
 
-    private
+    # Draw a rectangular grid of straight lines.
+    # @param x [Integer] The X offset in the image to begin the grid.
+    # @param y [Integer] The Y offset in the image to begin the grid.
+    # @param w [Integer] The width of the grid in pixels.
+    # @param h [Integer] The height of the grid in pixels.
+    # @param step_x [Integer] The separation of the vertical lines in pixels.
+    # @param step_y [Integer] The separation of the horizontal lines in pixels.
+    # @param off_x [Integer] The initial shift of the vertical lines with respect
+    #   to the grid start, `x`.
+    # @param off_y [Integer] The initial shift of the horizontal lines with respect
+    #   to the grid start, `y`.
+    # @param color [Integer] The index of the color in the color table to use for
+    #   the grid lines.
+    # @param weight [Integer] The size of the brush to use for the grid lines.
+    # @param style [Symbol] Line style (`:solid`, `:dashed`, `:dotted`). See
+    #   `style` param in {#line}).
+    # @param density [Symbol] Line pattern density (`:normal`, `:dense`, `:loose`).
+    #   See `density` param in {#line}.
+    # @param pattern [Array<Integer>] Specifies the pattern of the line style.
+    #   See `pattern` param in {#line}.
+    # @param pattern_offsets [Array<Integer>] Specifies the offsets of the patterns
+    #   on each direction. See `pattern_offset` param in {#line}.
+    # @return (see #initialize)
+    # @raise [Exception::CanvasError] If the grid would go out of bounds.
+    def grid(x, y, w, h, step_x, step_y, off_x = 0, off_y = 0, color: 0, weight: 1,
+      style: :solid, density: :normal, pattern: nil, pattern_offsets: [0, 0])
+
+      if !Geometry.bound_check([[x, y], [x + w - 1, y + h - 1]], self, true)
+        raise Exception::CanvasError, "Grid out of bounds."
+      end
+      pattern = parse_line_pattern(style, density, weight) unless pattern
+
+      # Draw vertical lines
+      (x + off_x ... x + w).step(step_x).each{ |j|
+        line(
+          p1: [j, y], p2: [j, y + h - 1], color: color, weight: weight,
+          anchor: -1, pattern: pattern, pattern_offset: pattern_offsets[0]
+        )
+      }
+
+      # Draw horizontal lines
+      (y + off_y... y + h).step(step_y).each{ |i|
+        line(
+          p1: [x, i], p2: [x + w - 1, i], color: color, weight: weight,
+          anchor: 1, pattern: pattern, pattern_offset: pattern_offsets[1]
+        )
+      }
 
-    # Ensure the provided point is within the image's bounds.
-    def bound_check(x, y)
-      Geometry.bound_check([[x, y]], [0, 0, @width, @height])
+      self
     end
 
-    # Draw one line chunk, used for Xiaolin-Wu line algorithm
-    def line_chunk(x, y, color, weight = 1, swap = false)
-      weight = 1.0 if weight < 1.0
-      weight = weight.to_i
-      min = - weight / 2 + 1
-      max =   weight / 2
+    # Draw an ellipse with the given properties.
+    # @param c [Array<Integer>] The X and Y coordinates of the ellipse's center.
+    # @param r [Array<Float>] The semi axes (major and minor) of the ellipse,
+    #   in pixels. They can be non-integer, which will affect the intermediate
+    #   calculations and result in a different, in-between, shape.
+    # @param stroke [Integer] Index of the color of the border. The border is
+    #   drawn inside the ellipse, i.e., the supplied axes are not enlarged for
+    #   the border. Leave `nil` for no border.
+    # @param fill [Integer] Index of the color for the filling of the ellipse.
+    #   Leave `nil` for no filling.
+    # @param weight [Integer] Thickness of the border, in pixels.
+    # @param style [Symbol] Style of the border. If `:smooth`, the border will
+    #   approximate an elliptical shape as much as possibe. If `:grid`, each
+    #   additional unit of weight is added by simply drawing an additional layer
+    #   of points inside the ellipse with the border's color.
+    # @return (see #initialize)
+    # @raise [Exception::CanvasError] If the ellipse would go out of bounds.
+    def ellipse(c, r, stroke = nil, fill = nil, weight: 1, style: :smooth)
+      # Parse data
+      return self if !stroke && !fill
+      a = r[0]
+      b = r[1]
+      c = Geometry::Point.parse(c).round
+      e1 = Geometry::E1
+      e2 = Geometry::E2
+      upper = (c - e2 * b).round
+      lower = (c + e2 * b).round
+      left  = (c - e1 * a).round
+      right = (c + e1 * a).round
+      if !Geometry.bound_check([upper, lower, left, right], self, true)
+        raise Exception::CanvasError, "Ellipse out of bounds."
+      end
+      if stroke
+        weight = [weight.to_i, 1].max
+        if weight > [a, b].min
+          fill = stroke
+          stroke = nil
+        end
+      end
+      f = (a.to_f / b) ** 2
+
+      # Fill
+      if fill
+        b.round.downto(0).each{ |y|
+          midpoint1 = ((c.y - y) * @width + c.x).round
+          midpoint2 = ((c.y + y) * @width + c.x).round if y > 0
+          partial_r = (y > 0 ? (a ** 2 - f * (y - 0.5) ** 2) ** 0.5 : a).round
+          @pixels[midpoint1 - partial_r, 2 * partial_r + 1] = [fill] * (2 * partial_r + 1)
+          @pixels[midpoint2 - partial_r, 2 * partial_r + 1] = [fill] * (2 * partial_r + 1) if y > 0
+        }
+      end
 
-      w = min
-      if !swap
-        self[x, y + w] = color
-        self[x, y + w] = color while (w += 1) < max
-        self[x, y + w] = color if w <= max
-      else
-        self[y + w, x] = color
-        self[y + w, x] = color while (w += 1) < max
-        self[y + w, x] = color if w <= max
+      # Stroke
+      if stroke
+        prev_r = 0
+        b.round.downto(0).each{ |y|
+          midpoint1 = ((c.y - y) * @width + c.x).round
+          midpoint2 = ((c.y + y) * @width + c.x).round if y > 0
+          partial_r = (y > 0 ? (a ** 2 - f * (y - 0.5) ** 2) ** 0.5 : a).round
+          if style == :grid
+            border = [weight + partial_r - prev_r, 1 + partial_r].min
+            (0 ... [weight, y + 1].min).each{ |w|
+              @pixels[midpoint1 - partial_r                + w * @width, border] = [stroke] * border
+              @pixels[midpoint1 + partial_r - (border - 1) + w * @width, border] = [stroke] * border
+              @pixels[midpoint2 - partial_r                - w * @width, border] = [stroke] * border if y > 0
+              @pixels[midpoint2 + partial_r - (border - 1) - w * @width, border] = [stroke] * border if y > 0
+            }
+            prev_r = partial_r
+          elsif style == :smooth
+            a2 = [a - weight, 0].max
+            b2 = [b - weight, 0].max
+            f2 = (a2.to_f / b2) ** 2
+            partial_r2 = (y > 0 ? (a2 ** 2 >= f2 * (y - 0.5) ** 2 ? (a2 ** 2 - f2 * (y - 0.5) ** 2) ** 0.5 : -1) : a2).round
+            border = partial_r - partial_r2
+            @pixels[midpoint1 - partial_r               , border] = [stroke] * border
+            @pixels[midpoint1 + partial_r - (border - 1), border] = [stroke] * border
+            @pixels[midpoint2 - partial_r               , border] = [stroke] * border if y > 0
+            @pixels[midpoint2 + partial_r - (border - 1), border] = [stroke] * border if y > 0
+          end
+        }
       end
+
+      self
+    end
+
+    # Draw a circle with the given properties.
+    # @param c [Array<Integer>] The X and Y coordinates of the circle's center.
+    # @param r [Float] The radius of the circle, in pixels. It can be non-integer,
+    #   which will affect the intermediate calculations and result in a different
+    #   final shape, which is in-between the ones corresponding to the integer
+    #   values below and above for the radius.
+    # @param stroke [Integer] Index of the color of the border. The border is
+    #   drawn inside the circle, i.e., the supplied radius is not enlarged for
+    #   the border. Leave `nil` for no border.
+    # @param fill [Integer] Index of the color for the filling of the circle.
+    #   Leave `nil` for no filling.
+    # @param weight [Integer] Thickness of the border, in pixels.
+    # @param style [Symbol] Style of the border. If `:smooth`, the border will
+    #   approximate a circular shape as much as possible. If `:grid`, each
+    #   additional unit of weight is added by simply drawing an additional layer
+    #   of points inside the circle with the border's color.
+    # @return (see #initialize)
+    # @raise [Exception::CanvasError] If the circle would go out of bounds.
+    def circle(c, r, stroke = nil, fill = nil, weight: 1, style: :smooth)
+      ellipse(c, [r, r], stroke, fill, weight: weight, style: style)
     end
 
-    def brush_chunk(x, y, color, weight = 1, swap = false)
-      weight = 1.0 if weight < 1.0
-      weight = weight.to_i
-      x, y = y, x if swap
-      cross_brush = [
-        [ 0, -1],
-        [-1,  0],
-        [ 0,  0],
-        [ 1,  0],
-        [ 0,  1]
-      ]
-      two_by_two_brush = [
-        [0, 0],
-        [1, 0],
-        [0, 1],
-        [1, 1]
-      ]
-      two_by_two_brush.each{ |dx, dy| self[x + dx, y + dy] = color }
+    # Draw a polygonal chain connecting a sequence of points. This simply consists
+    # in joining them in order with straight lines.
+    # @param points [Array<Point>] The list of points, in order, to join.
+    # @param line_color [Integer] The index of the color to use for the lines.
+    # @param line_weight [Float] The size of the line stroke, in pixels.
+    # @param node_color [Integer] The index of the color to use for the nodes.
+    #   Default (`nil`) is the same as the line color.
+    # @param node_weight [Float] The radius of the node circles, in pixels. If `0`,
+    #   no nodes will be drawn.
+    # @return (see #initialize)
+    # @raise [Exception::CanvasError] If the chain would go out of bounds. The
+    #   segments that are within bounds will be drawn, even if they come after
+    #   an out of bounds segment.
+    def polygonal(points, line_color: 0, line_weight: 1, node_color: nil,
+        node_weight: 0
+      )
+      node_color = line_color unless node_color
+      0.upto(points.size - 2).each{ |i|
+        next if !points[i] || !points[i + 1]
+        line(p1: points[i], p2: points[i + 1], color: line_color, weight: line_weight) rescue nil
+      }
+      points.each{ |p|
+        next if !p
+        circle(p, node_weight, nil, node_color)
+      }
+      self
+    end
+
+    # Draw a 2D parameterized curve. A lambda function containing the mathematical
+    # expression for each coordinate must be passed.
+    # @param func [Lambda] A lambda function that takes in a single floating
+    #   point parameter (the time) and outputs the pair of coordinates `[X, Y]`
+    #   corresponding to the curve at that given instant.
+    # @param from [Float] The starting time to begin plotting the curve, i.e.,
+    #   the initial value of the time parameter for the lambda.
+    # @param to [Float] The ending time to finish plotting the curve, i.e.,
+    #   the final value of the time parameter for the lambda.
+    # @param step [Float] The time step to use. The points of the curve resulting
+    #   from this time step will be joined via straight lines. The smaller the,
+    #   time step, the smoother the curve will look, resolution permitting.
+    #   Alternatively, one may supply the `dots` argument.
+    # @param dots [Integer] The amount of points to plot. The plotting interval
+    #   will be divided into this many segments of equal size, and the resulting
+    #   points will be joined via straight lines. The more dots, the smoother the
+    #   curve will look. Alternatively, one may supply the `step` argument.
+    # @param line_color [Integer] The index of the color to use for the trace.
+    # @param line_weight [Float] The size of the brush to use for the trace.
+    # @param node_color [Integer] The index of the color to use for the node
+    #   circles. If `nil` (default), the line color will be used.
+    # @param node_weight [Float] The radius of the node circles. If `0` (default),
+    #   nodes joining each segment of the curve will not be drawn.
+    # @return (see #initialize)
+    # @raise [Exception::CanvasError] If the curve goes out of bounds.
+    # @todo Add a way to automatically compute the time step with a reasonable
+    #   value, without having to explicitly send the step or the dots.
+    def curve(func, from, to, step: nil, dots: nil, line_color: 0, line_weight: 1,
+      node_color: nil, node_weight: 0)
+      if !step && !dots
+        raise Exception::GeometryError, "Cannot infer the curve's drawing density,|
+          please specify either the step or the dots argument."
+      end
+      step = (to - from).abs.to_f / (dots + 1) if !step
+      points = (from .. to).step(step).map{ |t| func.call(t) }
+      node_color = line_color unless node_color
+      polygonal(points, line_color: line_color, line_weight: line_weight,
+        node_color: node_color, node_weight: node_weight)
+    end
+
+    # Draw a general spiral given by its scale functions in either direction.
+    # These functions specify, in terms of the time, how the spiral grows
+    # horizontally and vertically. For instance, a linear function would yield
+    # a spiral of constant growth, i.e., an Archimedean spiral.
+    # @param from [Float] The starting time to begin plotting the curve.
+    # @param to [Float] The final time to end the plot.
+    # @param center [Array<Integer>] The coordinates of the center of the spiral.
+    # @param angle [Float] Initial angle of the spiral.
+    # @param scale_x [Lambda(Float)] The function that specifies the spiral's
+    #   growth in the X direction in terms of time.
+    # @param scale_y [Lambda(Float)] The function that specifies the spiral's
+    #   growth in the Y direction in terms of time.
+    # @param speed [Float] Speed at which the spiral is traversed.
+    # @param color [Integer] Index of the line's color.
+    # @param weight [Float] Size of the line.
+    # @param control_points [Integer] The amount of control points to use per
+    #   quadrant when drawing the spiral. The higher, the smoother the curve.
+    # @return (see #initialize)
+    # @raise [Exception::CanvasError] If the spiral would go out of bounds.
+    def spiral_general(
+        from, to,
+        center: [@width / 2, @height / 2],
+        angle: 0,
+        scale_x: -> (t) { t },
+        scale_y: -> (t) { t },
+        speed: 1,
+        color: 0,
+        weight: 1,
+        control_points: 64
+      )
+      center = Geometry::Point.parse(center)
+      curve(
+        -> (t) {
+          [
+            center.x + scale_x.call(t) * Math.cos(angle + speed * t),
+            center.y + scale_y.call(t) * Math.sin(angle + speed * t)
+          ]
+        },
+        from, to, step: 2 * Math::PI / control_points,
+        line_color: color, line_weight: weight
+      )
+    end
+
+    # Draw an Archimedean spiral. This type of spiral is the simplest case,
+    # which grows at a constant rate on either direction.
+    # @param center [Array<Integer>] The coordinates of the center of the spiral.
+    # @param step [Float] Distance between spiral's loops.
+    # @param loops [Float] How many loops to draw.
+    # @param angle [Float] Initial spiral angle.
+    # @param color [Integer] Index of the line's color.
+    # @param weight [Float] Size of the line.
+    # @return (see #initialize)
+    # @raise (see #spiral_general)
+    def spiral(center, step, loops, angle: 0, color: 0, weight: 1)
+      spiral_general(
+        0, loops * 2 * Math::PI, center: center, angle: angle,
+        scale_x: -> (t) {step * t / (2 * Math::PI) },
+        scale_y: -> (t) {step * t / (2 * Math::PI) },
+        color: color, weight: weight
+      )
+    end
+
+    # Plot the graph of a function. In the following, we will distinguish between
+    # "function" coordinates (i.e., the values the function actually takes),
+    # and "pixel" coordinates (i.e., the actual coordinates of the pixels that
+    # will be drawn).
+    # @param func [Lambda] The function to plot. Must take a single Float parameter,
+    #   which represents the function's variable, and return a single Float value,
+    #   the function's value at that point. Both in function coordinates.
+    # @param x_from [Float] The start of the X range to plot, in function coordinates.
+    # @param x_to [Float] The end of the X range to plot, in function coordinates.
+    # @param y_from [Float] The start of the Y range to plot, in function coordinates.
+    # @param y_to [Float] The end of the Y range to plot, in function coordinates.
+    # @param pos [Point] The position of the graph. These are the pixel coordinates
+    #   of the upper left corner of the graph. See also `:origin`.
+    # @param center [Point] The position of the origin. These are the pixel coordinates
+    #   of the origin of the graph, _even if_ the origin isn't actually in the
+    #   plotting range (it'll still be used internally to calculate all the
+    #   other pixel coords relative to this). Takes preference over `:pos`.
+    # @param color [Integer] The index of the color to use for the function's graph.
+    # @param weight [Integer] The width of the graph's line, in pixels.
+    # @param grid [Boolean] Whether to draw a grid or not.
+    # @param grid_color [Integer] Index of the color to be used for the grid lines.
+    # @param grid_weight [Integer] The width of the grid lines in pixels.
+    # @param grid_sep_x [Float] The separation between the vertical grid lines,
+    #   in function coordinates. Takes preference over `:grid_steps_x`.
+    # @param grid_sep_y [Float] The separation between the horizontal grid lines,
+    #   in function coordinates. Takes preference over `:grid_steps_y`.
+    # @param grid_steps_x [Float] How many grid intervals to use for the X range.
+    #   Only used if no explicit separation has been supplied with `:grid_sep_x`.
+    # @param grid_steps_y [Float] How many grid intervals to use for the Y range.
+    #   Only used if no explicit separation has been supplied with `:grid_sep_y`.
+    # @param grid_style [Symbol] Style of the grid lines (`:solid`, `:dashed`,
+    #   `:dotted`). See `style` option in {#line}.
+    # @param grid_density [Symbol] Density of the grid pattern (`:normal`, `:dense`,
+    #   `:loose`). See `density` option in {#line}.
+    # @param axes [Boolean] Whether to draw to axes or not.
+    # @param axes_color [Integer] Index of the color to use for the axes.
+    # @param axes_weight [Integer] Width of the axes line in pixels.
+    # @param axes_style [Symbol] Style of the axes lines (`:solid`, `:dashed`,
+    #   `:dotted`). See `style` option in {#line}.
+    # @param axes_density [Symbol] Density of the axes pattern (`:normal`, `:dense`,
+    #   `:loose`). See `density` option in {#line}.
+    # @param origin [Boolean] Whether to draw the origin or not.
+    # @param origin_color [Integer] The index of the color to use for the origin dot.
+    # @param origin_weight [Float] The radius of the circle to use for the origin,
+    #   in pixels.
+    # @param background [Boolean] Whether to draw a solid rectangle as a background
+    #   for the whole plot.
+    # @param background_color [Integer] Index of the color to use for the
+    #   background rectangle.
+    # @param background_padding [Integer] Amount of extra padding pixels between
+    #   the rectangle's boundary and the elements it surrounds.
+    # @param frame [Boolean] Whether to draw a frame around the plot. If specified,
+    #   it will be the border of the background's rectangle.
+    # @param frame_color [Integer] Index of the color to use for the frame.
+    # @param frame_weight [Integer] Width of the frame lines in pixels.
+    # @param frame_style [Symbol] Style of the frame lines (`:solid`, `:dashed`,
+    #   `:dotted`). See `style` option in {#line}.
+    # @param frame_density [Symbol] Density of the frame pattern (`:normal`, `:dense`,
+    #   `:loose`). See `density` option in {#line}.
+    # @return (see #initialize)
+    # @raise [Exception::CanvasError] If any of the plot's elements would go out
+    #   of bounds.
+    # @todo Desirable features:
+    #   * Calculate the Y range automatically based on the function and the X
+    #     range, unless an explicit Y range is supplied.
+    #   * Change plot's orientation (horizontal, or even arbitrary angle).
+    #   * Add other elements, such as text labels, or axes tips (e.g. arrows).
+    #   * Specify drawing precision (in dots or steps), or even calculate it
+    #     based on the function and the supplied range.
+    #   * Allow to have arbitrary line styles for the graph line too.
+    def graph(func, x_from, x_to, y_from, y_to, pos: [0, 0], center: nil, x_scale: 1,
+      y_scale: 1, color: 0, weight: 1, grid: false, grid_color: 0,
+      grid_weight: 1, grid_sep_x: nil, grid_sep_y: nil, grid_steps_x: nil,
+      grid_steps_y: nil, grid_style: :dotted, grid_density: :normal, axes: true,
+      axes_color: 0, axes_weight: 1, axes_style: :solid, axes_density: :normal,
+      origin: false, origin_color: 0, origin_weight: 2, background: false,
+      background_color: 0, background_padding: 1, frame: false, frame_color: 0,
+      frame_weight: 1, frame_style: :solid, frame_density: :normal
+    )
+      # Normalize parameters
+      center, origin = origin, center
+      if !origin
+        pos = Geometry::Point.parse(pos || [0, 0])
+        origin = [pos.x - x_scale * x_from, pos.y + y_scale * y_to]
+      end
+      origin = Geometry::Point.parse(origin)
+
+      # Background
+      if background
+        rect(
+          # Calculate real position (upper left corner)
+          origin.x + x_scale * x_from - background_padding,
+          origin.y - y_scale * y_to - background_padding,
+
+          # Calculate real dimensions
+          (x_to - x_from).abs * x_scale + 2 * background_padding + 1,
+          (y_to - y_from).abs * y_scale + 2 * background_padding + 1,
+
+          # Stroke and fill color
+          nil, background_color
+        )
+      end
+
+      # Grid
+      if grid
+        grid_sep_x = grid_steps_x ? (x_to - x_from).abs.to_f / grid_steps_x : 10.0 / x_scale if !grid_sep_x
+        grid_sep_y = grid_steps_y ? (y_to - y_from).abs.to_f / grid_steps_y : 10.0 / y_scale if !grid_sep_y
+        grid(
+          # Calculate real position (upper left corner)
+          origin.x + x_scale * x_from,
+          origin.y - y_scale * y_to,
+
+          # Calculate real dimensions
+          (x_to - x_from).abs * x_scale,
+          (y_to - y_from).abs * y_scale,
+
+          # Calculate real separation between grid lines
+          x_scale * grid_sep_x,
+          y_scale * grid_sep_y,
+
+          # Offset the grid lines so that they're centered at the origin
+          (x_from.abs.to_f % grid_sep_x) * x_scale,
+          (y_to.abs.to_f % grid_sep_y) * y_scale,
+
+          # Grid aspect
+          color:   grid_color,
+          weight:  grid_weight,
+          style:   grid_style,
+          density: grid_density
+        )
+      end
+
+      # Axes
+      if axes
+        # X axis
+        line(
+          p1: [origin.x + x_scale * x_from, origin.y],
+          p2: [origin.x + x_scale * x_to, origin.y],
+          color: axes_color,
+          weight: axes_weight,
+          style: axes_style,
+          density: axes_density
+        ) if 0.between?(y_from, y_to)
+
+        # Y axis
+        line(
+          p1: [origin.x, origin.y - y_scale * y_from],
+          p2: [origin.x, origin.y - y_scale * y_to],
+          color: axes_color,
+          weight: axes_weight,
+          style: axes_style,
+          density: axes_density
+        ) if 0.between?(x_from, x_to)
+      end
+
+      # Origin
+      if center
+        circle(origin, origin_weight, nil, origin_color)
+      end
+
+      # Graph
+      curve(
+        -> (t) {
+          x = origin.x + x_scale * t
+          y = origin.y - y_scale * func.call(t)
+          func.call(t).between?(y_from, y_to) ? [x, y] : nil
+        },
+        x_from, x_to, dots: 100, line_color: color, line_weight: weight
+      )
+
+      # Frame
+      if frame
+        rect(
+          # Calculate real position (upper left corner)
+          origin.x + x_scale * x_from - background_padding,
+          origin.y - y_scale * y_to - background_padding,
+
+          # Calculate real dimensions
+          (x_to - x_from).abs * x_scale + 2 * background_padding + 1,
+          (y_to - y_from).abs * y_scale + 2 * background_padding + 1,
+
+          # Stroke and fill color
+          frame_color, nil,
+
+          # Aspect
+          weight:  frame_weight,
+          style:   frame_style,
+          density: frame_density
+        )
+      end
+
+      self
+    end
+
+    # Represents a type of drawing brush, and encapsulates all the logic necessary
+    # to use it, such as the weight, shape, anchor point, color, etc.
+    class Brush
+
+      # Actual pixels that form the brush, and that will be drawn when using it.
+      # It is an array of pairs of coordinates, representing the X and Y offsets
+      # from the drawing point that will be painted. For example, if
+      #   `pixels = [[0, -1], [-1, 0], [0, 0], [1, 0], [0, 1]]`
+      # then the brush will be a small cross centered at the drawing point.
+      # @return [Array<Array<Integer>>] Coordinates of the brush relative to the
+      #   drawing point.
+      attr_accessor :pixels
+
+      # The index in the color table of the default color to use when painting
+      # with this brush. It can be overidden whenever it's actually used.
+      # @return [Integer] Default color index.
+      attr_accessor :color
+
+      # Creates a square brush of a given size.
+      # @param weight [Float] Size of the brush (side of the square) in pixels.
+      # @param color [Integer] Index of the color to use as default for drawing
+      #   when no explicit color is provided.
+      # @param anchor [Array<Float>] The anchor determines the position of the
+      #   brush with respect to the drawing coordinates. It goes from [-1, -1]
+      #   (up and left) to [1, 1] (right and down). [0, 0]  would mean the brush
+      #   is centered.
+      # @return [Brush] The new square brush.
+      def self.square(weight = 1, color = nil, anchor = [0, 0])
+        weight = weight.to_f
+        weight = 1.0 if weight < 1.0
+        shift_x = ((1 - anchor[0]) * (weight - 1) / 2).round
+        shift_y = ((1 - anchor[1]) * (weight - 1) / 2).round
+        weight = weight.round
+
+        xlim_inf = -shift_x
+        xlim_sup = xlim_inf + weight
+        ylim_inf = -shift_y
+        ylim_sup = ylim_inf + weight
+
+        new(
+          (xlim_inf ... xlim_sup).to_a.product((ylim_inf ... ylim_sup).to_a),
+          color
+        )
+      end
+
+      # Create a new brush by providing the raw pixels that form it. For common
+      # shapes, you may instead prefer to use one of the helpers, such as
+      # {.square}.
+      # @param pixels [Array<Array<Integer>>] Relative coordinates of the pixels
+      #   that compose the brush (see {#pixels}).
+      # @param color [Integer] Index of default brush color.
+      # @return [Brush] The new brush.
+      def initialize(pixels, color = nil)
+        @pixels = pixels
+        @color = color
+      end
+
+      # Use the brush to draw once on an image at the specified point. If no
+      # color is specified, the brush's default color will be used. A bounding
+      # box can be provided to restrict where in the image the drawing may
+      # happen. If it's not specified, the whole image will determine this box.
+      # @param x [Integer] X coordinate of the drawing point.
+      # @param y [Integer] Y coordinate of the drawing point.
+      # @param img [Image] Image to draw onto.
+      # @param color [Integer] Index of the color in the color table to use.
+      # @param bbox [Array<Integer>] Bounding box determining the drawing region,
+      #   in the format `[X, Y, W, H]`.
+      # @param avoid [Array<Integer>] List of colors over which the brush should
+      #   NOT paint.
+      def draw(x, y, img, color = @color, bbox: nil, avoid: [])
+        raise Exception::CanvasError, "No provided color nor default color found." if !color
+        bbox = [0, 0, img.width, img.height] if !bbox
+        @pixels.each{ |dx, dy|
+          if Geometry.bound_check([[x + dx, y + dy]], bbox, true) && !avoid.include?(img[x + dx, y + dy])
+            img[x + dx, y + dy] = color
+          end
+        }
+      end
+    end
+
+    # Ensure the given point is within the image's bounds.
+    # @param point [Point] The point to check. Can be provided as a tuple of
+    #   coordinates `[X, Y]`, or as a {Geometry::Point} object.
+    # @param silent [Boolean] Whether to raise an exception or simply return
+    #   false if the bound check fails.
+    def bound_check(point, silent = true)
+      Geometry.bound_check([point], self, silent)
+    end
+
+    private
+
+    # Given a pixel:
+    # * Find the row span which shares that pixel's color.
+    # * Fill it with a new (different) color.
+    # * Repeat recursively for the previous and next row.
+    # Used for flood fill algorithm.
+    def fill_span(x, y, old_color, new_color)
+      # Nothing to fill from this seed
+      return if self[x, y] != old_color
+      self[x, y] = new_color
+
+      # Find negative span and fill it
+      x_min = x - 1
+      while x_min >= 0 && self[x_min, y] == old_color
+        self[x_min, y] = new_color
+        x_min -= 1
+      end
+
+      # Find positive span and fill it
+      x_max = x + 1
+      while x_max < @width && self[x_max, y] == old_color
+        self[x_max, y] = new_color
+        x_max += 1
+      end
+
+      # Recursively test previous and next rows
+      span = (x_min + 1 .. x_max - 1)
+      span.each{ |x| fill_span(x, y - 1, old_color, new_color) } if y > 0
+      span.each{ |x| fill_span(x, y + 1, old_color, new_color) } if y < @height - 1
+    end
+
+    # Parse the line ON/OFF pattern given a few named values.
+    # Style can be solid, dotted or dashed. Density can be normal, dense or loose.
+    def parse_line_pattern(style = :solid, density = :normal, weight = 1)
+      # Normalize params
+      style = :solid if ![:solid, :dotted, :dashed].include?(style)
+      density = :normal if ![:loose, :normal, :dense].include?(density)
+
+      # Length of ON segment depends on style
+      on = style == :dashed ? 4 * weight + 1 : 1
+
+      # Length of OFF segment depends on density
+      off = weight
+      off += on + weight - 1 if [:normal, :loose].include?(density)
+      off += on + weight - 1 if density == :loose
+      off = 0 if style == :solid
+
+      [on, off]
     end
 
   end