chunky_png 1.0.0.beta2 → 1.0.0.rc1

data/.infinity_test

@@ -1,6 +1,6 @@
 infinity_test do
   
-  use :rubies => %w(1.8.7 1.9.2 ree jruby rbx), :test_framework => :rspec
+  use :rubies => %w(1.8.6 1.8.7 1.9.2 ree jruby rbx), :test_framework => :rspec
   
   before(:each_ruby) do |environment|
     environment.system('bundle install')

data/README.rdoc

@@ -35,13 +35,13 @@ provides a massive speed boost to encoding and decoding.
   # Creating an image from scratch, save as an interlaced PNG
   png = ChunkyPNG::Image.new(16, 16, ChunkyPNG::Color::TRANSPARENT)
   png[1,1] = ChunkyPNG::Color.rgba(10, 20, 30, 128)
-  png[2,1] = ChunkyPNG::Color.rgba(0, 0, 0, 128)
+  png[2,1] = ChunkyPNG::Color('black @ 0.5')
   png.save('filename.png', :interlace => true)
 
   # Compose images using alpha blending.
   avatar = ChunkyPNG::Image.from_file('avatar.png')
   badge  = ChunkyPNG::Image.from_file('no_ie_badge.png')
-  avatar.compose(badge, 10, 10)
+  avatar.compose!(badge, 10, 10)
   avatar.save('composited.png', :fast_rgba) # Force the fast saving routine.
   
   # Accessing metadata

data/chunky_png.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
 
   # Do not change the version and date fields by hand. This will be done
   # automatically by the gem release script.
-  s.version = "1.0.0.beta2"
-  s.date    = "2011-01-28"
+  s.version = "1.0.0.rc1"
+  s.date    = "2011-02-24"
 
   s.summary     = "Pure ruby library for read/write, chunk-level access to PNG files"
   s.description = <<-EOT
@@ -38,6 +38,6 @@ Gem::Specification.new do |s|
 
   # Do not change the files and test_files fields by hand. This will be done
   # automatically by the gem release script.
-  s.files      = %w(.gitignore .infinity_test .yardopts BENCHMARKS.rdoc Gemfile LICENSE README.rdoc Rakefile benchmarks/decoding_benchmark.rb benchmarks/encoding_benchmark.rb benchmarks/filesize_benchmark.rb chunky_png.gemspec lib/chunky_png.rb lib/chunky_png/canvas.rb lib/chunky_png/canvas/adam7_interlacing.rb lib/chunky_png/canvas/drawing.rb lib/chunky_png/canvas/operations.rb lib/chunky_png/canvas/png_decoding.rb lib/chunky_png/canvas/png_encoding.rb lib/chunky_png/canvas/stream_exporting.rb lib/chunky_png/canvas/stream_importing.rb lib/chunky_png/chunk.rb lib/chunky_png/color.rb lib/chunky_png/compatibility.rb lib/chunky_png/datastream.rb lib/chunky_png/image.rb lib/chunky_png/palette.rb lib/chunky_png/rmagick.rb spec/chunky_png/canvas/adam7_interlacing_spec.rb spec/chunky_png/canvas/drawing_spec.rb spec/chunky_png/canvas/operations_spec.rb spec/chunky_png/canvas/png_decoding_spec.rb spec/chunky_png/canvas/png_encoding_spec.rb spec/chunky_png/canvas_spec.rb spec/chunky_png/color_spec.rb spec/chunky_png/datastream_spec.rb spec/chunky_png/image_spec.rb spec/chunky_png/rmagick_spec.rb spec/chunky_png_spec.rb spec/png_suite/background_chunks/bgai4a08.png spec/png_suite/background_chunks/bgai4a16.png spec/png_suite/background_chunks/bgan6a08.png spec/png_suite/background_chunks/bgan6a16.png spec/png_suite/background_chunks/bgbn4a08.png spec/png_suite/background_chunks/bggn4a16.png spec/png_suite/background_chunks/bgwn6a08.png spec/png_suite/background_chunks/bgyn6a16.png spec/png_suite/basic/basi0g01.png spec/png_suite/basic/basi0g01.rgba spec/png_suite/basic/basi0g02.png spec/png_suite/basic/basi0g02.rgba spec/png_suite/basic/basi0g04.png spec/png_suite/basic/basi0g04.rgba spec/png_suite/basic/basi0g08.png spec/png_suite/basic/basi0g08.rgba spec/png_suite/basic/basi0g16.png spec/png_suite/basic/basi0g16.rgba spec/png_suite/basic/basi2c08.png spec/png_suite/basic/basi2c08.rgba spec/png_suite/basic/basi2c16.png spec/png_suite/basic/basi2c16.rgba spec/png_suite/basic/basi3p01.png spec/png_suite/basic/basi3p01.rgba spec/png_suite/basic/basi3p02.png spec/png_suite/basic/basi3p02.rgba spec/png_suite/basic/basi3p04.png spec/png_suite/basic/basi3p04.rgba spec/png_suite/basic/basi3p08.png spec/png_suite/basic/basi3p08.rgba spec/png_suite/basic/basi4a08.png spec/png_suite/basic/basi4a08.rgba spec/png_suite/basic/basi4a16.png spec/png_suite/basic/basi4a16.rgba spec/png_suite/basic/basi6a08.png spec/png_suite/basic/basi6a08.rgba spec/png_suite/basic/basi6a16.png spec/png_suite/basic/basi6a16.rgba spec/png_suite/basic/basn0g01.png spec/png_suite/basic/basn0g01.rgba spec/png_suite/basic/basn0g02.png spec/png_suite/basic/basn0g02.rgba spec/png_suite/basic/basn0g04.png spec/png_suite/basic/basn0g04.rgba spec/png_suite/basic/basn0g08.png spec/png_suite/basic/basn0g08.rgba spec/png_suite/basic/basn0g16.png spec/png_suite/basic/basn0g16.rgba spec/png_suite/basic/basn2c08.png spec/png_suite/basic/basn2c08.rgba spec/png_suite/basic/basn2c16.png spec/png_suite/basic/basn2c16.rgba spec/png_suite/basic/basn3p01.png spec/png_suite/basic/basn3p01.rgba spec/png_suite/basic/basn3p02.png spec/png_suite/basic/basn3p02.rgba spec/png_suite/basic/basn3p04.png spec/png_suite/basic/basn3p04.rgba spec/png_suite/basic/basn3p08.png spec/png_suite/basic/basn3p08.rgba spec/png_suite/basic/basn4a08.png spec/png_suite/basic/basn4a08.rgba spec/png_suite/basic/basn4a16.png spec/png_suite/basic/basn4a16.rgba spec/png_suite/basic/basn6a08.png spec/png_suite/basic/basn6a08.rgba spec/png_suite/basic/basn6a16.png spec/png_suite/basic/basn6a16.rgba spec/png_suite/broken/x00n0g01.png spec/png_suite/broken/xcrn0g04.png spec/png_suite/broken/xlfn0g04.png spec/png_suite/chunk_ordering/oi1n0g16.png spec/png_suite/chunk_ordering/oi1n2c16.png spec/png_suite/chunk_ordering/oi2n0g16.png spec/png_suite/chunk_ordering/oi2n2c16.png spec/png_suite/chunk_ordering/oi4n0g16.png spec/png_suite/chunk_ordering/oi4n2c16.png spec/png_suite/chunk_ordering/oi9n0g16.png spec/png_suite/chunk_ordering/oi9n2c16.png spec/png_suite/compression_levels/z00n2c08.png spec/png_suite/compression_levels/z03n2c08.png spec/png_suite/compression_levels/z06n2c08.png spec/png_suite/compression_levels/z09n2c08.png spec/png_suite/filtering/f00n0g08.png spec/png_suite/filtering/f00n0g08.rgba spec/png_suite/filtering/f00n0g08_reference.png spec/png_suite/filtering/f00n0g08_reference.rgba spec/png_suite/filtering/f00n2c08.png spec/png_suite/filtering/f00n2c08.rgba spec/png_suite/filtering/f00n2c08_reference.png spec/png_suite/filtering/f00n2c08_reference.rgba spec/png_suite/filtering/f01n0g08.png spec/png_suite/filtering/f01n0g08.rgba spec/png_suite/filtering/f01n0g08_reference.png spec/png_suite/filtering/f01n0g08_reference.rgba spec/png_suite/filtering/f01n2c08.png spec/png_suite/filtering/f01n2c08.rgba spec/png_suite/filtering/f01n2c08_reference.png spec/png_suite/filtering/f01n2c08_reference.rgba spec/png_suite/filtering/f02n0g08.png spec/png_suite/filtering/f02n0g08.rgba spec/png_suite/filtering/f02n0g08_reference.png spec/png_suite/filtering/f02n0g08_reference.rgba spec/png_suite/filtering/f02n2c08.png spec/png_suite/filtering/f02n2c08.rgba spec/png_suite/filtering/f02n2c08_reference.png spec/png_suite/filtering/f02n2c08_reference.rgba spec/png_suite/filtering/f03n0g08.png spec/png_suite/filtering/f03n0g08.rgba spec/png_suite/filtering/f03n0g08_reference.png spec/png_suite/filtering/f03n0g08_reference.rgba spec/png_suite/filtering/f03n2c08.png spec/png_suite/filtering/f03n2c08.rgba spec/png_suite/filtering/f03n2c08_reference.png spec/png_suite/filtering/f03n2c08_reference.rgba spec/png_suite/filtering/f04n0g08.png spec/png_suite/filtering/f04n0g08.rgba spec/png_suite/filtering/f04n0g08_reference.png spec/png_suite/filtering/f04n0g08_reference.rgba spec/png_suite/filtering/f04n2c08.png spec/png_suite/filtering/f04n2c08.rgba spec/png_suite/filtering/f04n2c08_reference.png spec/png_suite/filtering/f04n2c08_reference.rgba spec/png_suite/gamma/g03n0g16.png spec/png_suite/gamma/g03n2c08.png spec/png_suite/gamma/g03n3p04.png spec/png_suite/gamma/g04n0g16.png spec/png_suite/gamma/g04n2c08.png spec/png_suite/gamma/g04n3p04.png spec/png_suite/gamma/g05n0g16.png spec/png_suite/gamma/g05n2c08.png spec/png_suite/gamma/g05n3p04.png spec/png_suite/gamma/g07n0g16.png spec/png_suite/gamma/g07n2c08.png spec/png_suite/gamma/g07n3p04.png spec/png_suite/gamma/g10n0g16.png spec/png_suite/gamma/g10n2c08.png spec/png_suite/gamma/g10n3p04.png spec/png_suite/gamma/g25n0g16.png spec/png_suite/gamma/g25n2c08.png spec/png_suite/gamma/g25n3p04.png spec/png_suite/metadata/cm0n0g04.png spec/png_suite/metadata/cm7n0g04.png spec/png_suite/metadata/cm9n0g04.png spec/png_suite/other/ccwn2c08.png spec/png_suite/other/ccwn3p08.png spec/png_suite/other/cdfn2c08.png spec/png_suite/other/cdhn2c08.png spec/png_suite/other/cdsn2c08.png spec/png_suite/other/cdun2c08.png spec/png_suite/other/ch1n3p04.png spec/png_suite/other/ch2n3p08.png spec/png_suite/other/cs3n2c16.png spec/png_suite/other/cs3n3p08.png spec/png_suite/other/cs5n2c08.png spec/png_suite/other/cs5n3p08.png spec/png_suite/other/cs8n2c08.png spec/png_suite/other/cs8n3p08.png spec/png_suite/other/ct0n0g04.png spec/png_suite/other/ct1n0g04.png spec/png_suite/other/ctzn0g04.png spec/png_suite/other/pp0n2c16.png spec/png_suite/other/pp0n6a08.png spec/png_suite/other/ps1n0g08.png spec/png_suite/other/ps1n2c16.png spec/png_suite/other/ps2n0g08.png spec/png_suite/other/ps2n2c16.png spec/png_suite/sizes/s01i3p01.png spec/png_suite/sizes/s01n3p01.png spec/png_suite/sizes/s02i3p01.png spec/png_suite/sizes/s02n3p01.png spec/png_suite/sizes/s03i3p01.png spec/png_suite/sizes/s03n3p01.png spec/png_suite/sizes/s04i3p01.png spec/png_suite/sizes/s04n3p01.png spec/png_suite/sizes/s05i3p02.png spec/png_suite/sizes/s05n3p02.png spec/png_suite/sizes/s06i3p02.png spec/png_suite/sizes/s06n3p02.png spec/png_suite/sizes/s07i3p02.png spec/png_suite/sizes/s07n3p02.png spec/png_suite/sizes/s08i3p02.png spec/png_suite/sizes/s08n3p02.png spec/png_suite/sizes/s09i3p02.png spec/png_suite/sizes/s09n3p02.png spec/png_suite/sizes/s32i3p04.png spec/png_suite/sizes/s32n3p04.png spec/png_suite/sizes/s33i3p04.png spec/png_suite/sizes/s33n3p04.png spec/png_suite/sizes/s34i3p04.png spec/png_suite/sizes/s34n3p04.png spec/png_suite/sizes/s35i3p04.png spec/png_suite/sizes/s35n3p04.png spec/png_suite/sizes/s36i3p04.png spec/png_suite/sizes/s36n3p04.png spec/png_suite/sizes/s37i3p04.png spec/png_suite/sizes/s37n3p04.png spec/png_suite/sizes/s38i3p04.png spec/png_suite/sizes/s38n3p04.png spec/png_suite/sizes/s39i3p04.png spec/png_suite/sizes/s39n3p04.png spec/png_suite/sizes/s40i3p04.png spec/png_suite/sizes/s40n3p04.png spec/png_suite/transparency/tbbn1g04.png spec/png_suite/transparency/tbbn2c16.png spec/png_suite/transparency/tbbn3p08.png spec/png_suite/transparency/tbgn2c16.png spec/png_suite/transparency/tbgn3p08.png spec/png_suite/transparency/tbrn2c08.png spec/png_suite/transparency/tbwn1g16.png spec/png_suite/transparency/tbwn3p08.png spec/png_suite/transparency/tbyn3p08.png spec/png_suite/transparency/tp0n1g08.png spec/png_suite/transparency/tp0n2c08.png spec/png_suite/transparency/tp0n3p08.png spec/png_suite/transparency/tp1n3p08.png spec/png_suite_spec.rb spec/resources/adam7.png spec/resources/clock.png spec/resources/clock_base.png spec/resources/clock_flip_horizontally.png spec/resources/clock_flip_vertically.png spec/resources/clock_mask.png spec/resources/clock_mask_updated.png spec/resources/clock_rotate_180.png spec/resources/clock_rotate_left.png spec/resources/clock_rotate_right.png spec/resources/clock_stubbed.png spec/resources/clock_updated.png spec/resources/composited.png spec/resources/cropped.png spec/resources/damaged_chunk.png spec/resources/damaged_signature.png spec/resources/lines.png spec/resources/operations.png spec/resources/pixelstream.rgb spec/resources/pixelstream.rgba spec/resources/pixelstream_best_compression.png spec/resources/pixelstream_fast_rgba.png spec/resources/pixelstream_reference.png spec/resources/rect.png spec/resources/replaced.png spec/resources/text_chunk.png spec/resources/ztxt_chunk.png spec/spec_helper.rb tasks/benchmarks.rake tasks/github-gem.rake)
-  s.test_files = %w(spec/chunky_png/canvas/adam7_interlacing_spec.rb spec/chunky_png/canvas/drawing_spec.rb spec/chunky_png/canvas/operations_spec.rb spec/chunky_png/canvas/png_decoding_spec.rb spec/chunky_png/canvas/png_encoding_spec.rb spec/chunky_png/canvas_spec.rb spec/chunky_png/color_spec.rb spec/chunky_png/datastream_spec.rb spec/chunky_png/image_spec.rb spec/chunky_png/rmagick_spec.rb spec/chunky_png_spec.rb spec/png_suite_spec.rb)
+  s.files      = %w(.gitignore .infinity_test .yardopts BENCHMARKS.rdoc Gemfile LICENSE README.rdoc Rakefile benchmarks/decoding_benchmark.rb benchmarks/encoding_benchmark.rb benchmarks/filesize_benchmark.rb chunky_png.gemspec lib/chunky_png.rb lib/chunky_png/canvas.rb lib/chunky_png/canvas/adam7_interlacing.rb lib/chunky_png/canvas/drawing.rb lib/chunky_png/canvas/masking.rb lib/chunky_png/canvas/operations.rb lib/chunky_png/canvas/png_decoding.rb lib/chunky_png/canvas/png_encoding.rb lib/chunky_png/canvas/resampling.rb lib/chunky_png/canvas/stream_exporting.rb lib/chunky_png/canvas/stream_importing.rb lib/chunky_png/chunk.rb lib/chunky_png/color.rb lib/chunky_png/compatibility.rb lib/chunky_png/datastream.rb lib/chunky_png/dimension.rb lib/chunky_png/image.rb lib/chunky_png/palette.rb lib/chunky_png/point.rb lib/chunky_png/rmagick.rb lib/chunky_png/vector.rb spec/chunky_png/canvas/adam7_interlacing_spec.rb spec/chunky_png/canvas/drawing_spec.rb spec/chunky_png/canvas/masking_spec.rb spec/chunky_png/canvas/operations_spec.rb spec/chunky_png/canvas/png_decoding_spec.rb spec/chunky_png/canvas/png_encoding_spec.rb spec/chunky_png/canvas/resampling_spec.rb spec/chunky_png/canvas/stream_exporting_spec.rb spec/chunky_png/canvas/stream_importing_spec.rb spec/chunky_png/canvas_spec.rb spec/chunky_png/color_spec.rb spec/chunky_png/datastream_spec.rb spec/chunky_png/dimension_spec.rb spec/chunky_png/image_spec.rb spec/chunky_png/point_spec.rb spec/chunky_png/rmagick_spec.rb spec/chunky_png/vector_spec.rb spec/chunky_png_spec.rb spec/png_suite/background_chunks/bgai4a08.png spec/png_suite/background_chunks/bgai4a16.png spec/png_suite/background_chunks/bgan6a08.png spec/png_suite/background_chunks/bgan6a16.png spec/png_suite/background_chunks/bgbn4a08.png spec/png_suite/background_chunks/bggn4a16.png spec/png_suite/background_chunks/bgwn6a08.png spec/png_suite/background_chunks/bgyn6a16.png spec/png_suite/basic/basi0g01.png spec/png_suite/basic/basi0g01.rgba spec/png_suite/basic/basi0g02.png spec/png_suite/basic/basi0g02.rgba spec/png_suite/basic/basi0g04.png spec/png_suite/basic/basi0g04.rgba spec/png_suite/basic/basi0g08.png spec/png_suite/basic/basi0g08.rgba spec/png_suite/basic/basi0g16.png spec/png_suite/basic/basi0g16.rgba spec/png_suite/basic/basi2c08.png spec/png_suite/basic/basi2c08.rgba spec/png_suite/basic/basi2c16.png spec/png_suite/basic/basi2c16.rgba spec/png_suite/basic/basi3p01.png spec/png_suite/basic/basi3p01.rgba spec/png_suite/basic/basi3p02.png spec/png_suite/basic/basi3p02.rgba spec/png_suite/basic/basi3p04.png spec/png_suite/basic/basi3p04.rgba spec/png_suite/basic/basi3p08.png spec/png_suite/basic/basi3p08.rgba spec/png_suite/basic/basi4a08.png spec/png_suite/basic/basi4a08.rgba spec/png_suite/basic/basi4a16.png spec/png_suite/basic/basi4a16.rgba spec/png_suite/basic/basi6a08.png spec/png_suite/basic/basi6a08.rgba spec/png_suite/basic/basi6a16.png spec/png_suite/basic/basi6a16.rgba spec/png_suite/basic/basn0g01.png spec/png_suite/basic/basn0g01.rgba spec/png_suite/basic/basn0g02.png spec/png_suite/basic/basn0g02.rgba spec/png_suite/basic/basn0g04.png spec/png_suite/basic/basn0g04.rgba spec/png_suite/basic/basn0g08.png spec/png_suite/basic/basn0g08.rgba spec/png_suite/basic/basn0g16.png spec/png_suite/basic/basn0g16.rgba spec/png_suite/basic/basn2c08.png spec/png_suite/basic/basn2c08.rgba spec/png_suite/basic/basn2c16.png spec/png_suite/basic/basn2c16.rgba spec/png_suite/basic/basn3p01.png spec/png_suite/basic/basn3p01.rgba spec/png_suite/basic/basn3p02.png spec/png_suite/basic/basn3p02.rgba spec/png_suite/basic/basn3p04.png spec/png_suite/basic/basn3p04.rgba spec/png_suite/basic/basn3p08.png spec/png_suite/basic/basn3p08.rgba spec/png_suite/basic/basn4a08.png spec/png_suite/basic/basn4a08.rgba spec/png_suite/basic/basn4a16.png spec/png_suite/basic/basn4a16.rgba spec/png_suite/basic/basn6a08.png spec/png_suite/basic/basn6a08.rgba spec/png_suite/basic/basn6a16.png spec/png_suite/basic/basn6a16.rgba spec/png_suite/broken/x00n0g01.png spec/png_suite/broken/xcrn0g04.png spec/png_suite/broken/xlfn0g04.png spec/png_suite/chunk_ordering/oi1n0g16.png spec/png_suite/chunk_ordering/oi1n2c16.png spec/png_suite/chunk_ordering/oi2n0g16.png spec/png_suite/chunk_ordering/oi2n2c16.png spec/png_suite/chunk_ordering/oi4n0g16.png spec/png_suite/chunk_ordering/oi4n2c16.png spec/png_suite/chunk_ordering/oi9n0g16.png spec/png_suite/chunk_ordering/oi9n2c16.png spec/png_suite/compression_levels/z00n2c08.png spec/png_suite/compression_levels/z03n2c08.png spec/png_suite/compression_levels/z06n2c08.png spec/png_suite/compression_levels/z09n2c08.png spec/png_suite/filtering/f00n0g08.png spec/png_suite/filtering/f00n0g08.rgba spec/png_suite/filtering/f00n0g08_reference.png spec/png_suite/filtering/f00n0g08_reference.rgba spec/png_suite/filtering/f00n2c08.png spec/png_suite/filtering/f00n2c08.rgba spec/png_suite/filtering/f00n2c08_reference.png spec/png_suite/filtering/f00n2c08_reference.rgba spec/png_suite/filtering/f01n0g08.png spec/png_suite/filtering/f01n0g08.rgba spec/png_suite/filtering/f01n0g08_reference.png spec/png_suite/filtering/f01n0g08_reference.rgba spec/png_suite/filtering/f01n2c08.png spec/png_suite/filtering/f01n2c08.rgba spec/png_suite/filtering/f01n2c08_reference.png spec/png_suite/filtering/f01n2c08_reference.rgba spec/png_suite/filtering/f02n0g08.png spec/png_suite/filtering/f02n0g08.rgba spec/png_suite/filtering/f02n0g08_reference.png spec/png_suite/filtering/f02n0g08_reference.rgba spec/png_suite/filtering/f02n2c08.png spec/png_suite/filtering/f02n2c08.rgba spec/png_suite/filtering/f02n2c08_reference.png spec/png_suite/filtering/f02n2c08_reference.rgba spec/png_suite/filtering/f03n0g08.png spec/png_suite/filtering/f03n0g08.rgba spec/png_suite/filtering/f03n0g08_reference.png spec/png_suite/filtering/f03n0g08_reference.rgba spec/png_suite/filtering/f03n2c08.png spec/png_suite/filtering/f03n2c08.rgba spec/png_suite/filtering/f03n2c08_reference.png spec/png_suite/filtering/f03n2c08_reference.rgba spec/png_suite/filtering/f04n0g08.png spec/png_suite/filtering/f04n0g08.rgba spec/png_suite/filtering/f04n0g08_reference.png spec/png_suite/filtering/f04n0g08_reference.rgba spec/png_suite/filtering/f04n2c08.png spec/png_suite/filtering/f04n2c08.rgba spec/png_suite/filtering/f04n2c08_reference.png spec/png_suite/filtering/f04n2c08_reference.rgba spec/png_suite/gamma/g03n0g16.png spec/png_suite/gamma/g03n2c08.png spec/png_suite/gamma/g03n3p04.png spec/png_suite/gamma/g04n0g16.png spec/png_suite/gamma/g04n2c08.png spec/png_suite/gamma/g04n3p04.png spec/png_suite/gamma/g05n0g16.png spec/png_suite/gamma/g05n2c08.png spec/png_suite/gamma/g05n3p04.png spec/png_suite/gamma/g07n0g16.png spec/png_suite/gamma/g07n2c08.png spec/png_suite/gamma/g07n3p04.png spec/png_suite/gamma/g10n0g16.png spec/png_suite/gamma/g10n2c08.png spec/png_suite/gamma/g10n3p04.png spec/png_suite/gamma/g25n0g16.png spec/png_suite/gamma/g25n2c08.png spec/png_suite/gamma/g25n3p04.png spec/png_suite/metadata/cm0n0g04.png spec/png_suite/metadata/cm7n0g04.png spec/png_suite/metadata/cm9n0g04.png spec/png_suite/other/ccwn2c08.png spec/png_suite/other/ccwn3p08.png spec/png_suite/other/cdfn2c08.png spec/png_suite/other/cdhn2c08.png spec/png_suite/other/cdsn2c08.png spec/png_suite/other/cdun2c08.png spec/png_suite/other/ch1n3p04.png spec/png_suite/other/ch2n3p08.png spec/png_suite/other/cs3n2c16.png spec/png_suite/other/cs3n3p08.png spec/png_suite/other/cs5n2c08.png spec/png_suite/other/cs5n3p08.png spec/png_suite/other/cs8n2c08.png spec/png_suite/other/cs8n3p08.png spec/png_suite/other/ct0n0g04.png spec/png_suite/other/ct1n0g04.png spec/png_suite/other/ctzn0g04.png spec/png_suite/other/pp0n2c16.png spec/png_suite/other/pp0n6a08.png spec/png_suite/other/ps1n0g08.png spec/png_suite/other/ps1n2c16.png spec/png_suite/other/ps2n0g08.png spec/png_suite/other/ps2n2c16.png spec/png_suite/sizes/s01i3p01.png spec/png_suite/sizes/s01n3p01.png spec/png_suite/sizes/s02i3p01.png spec/png_suite/sizes/s02n3p01.png spec/png_suite/sizes/s03i3p01.png spec/png_suite/sizes/s03n3p01.png spec/png_suite/sizes/s04i3p01.png spec/png_suite/sizes/s04n3p01.png spec/png_suite/sizes/s05i3p02.png spec/png_suite/sizes/s05n3p02.png spec/png_suite/sizes/s06i3p02.png spec/png_suite/sizes/s06n3p02.png spec/png_suite/sizes/s07i3p02.png spec/png_suite/sizes/s07n3p02.png spec/png_suite/sizes/s08i3p02.png spec/png_suite/sizes/s08n3p02.png spec/png_suite/sizes/s09i3p02.png spec/png_suite/sizes/s09n3p02.png spec/png_suite/sizes/s32i3p04.png spec/png_suite/sizes/s32n3p04.png spec/png_suite/sizes/s33i3p04.png spec/png_suite/sizes/s33n3p04.png spec/png_suite/sizes/s34i3p04.png spec/png_suite/sizes/s34n3p04.png spec/png_suite/sizes/s35i3p04.png spec/png_suite/sizes/s35n3p04.png spec/png_suite/sizes/s36i3p04.png spec/png_suite/sizes/s36n3p04.png spec/png_suite/sizes/s37i3p04.png spec/png_suite/sizes/s37n3p04.png spec/png_suite/sizes/s38i3p04.png spec/png_suite/sizes/s38n3p04.png spec/png_suite/sizes/s39i3p04.png spec/png_suite/sizes/s39n3p04.png spec/png_suite/sizes/s40i3p04.png spec/png_suite/sizes/s40n3p04.png spec/png_suite/transparency/tbbn1g04.png spec/png_suite/transparency/tbbn2c16.png spec/png_suite/transparency/tbbn3p08.png spec/png_suite/transparency/tbgn2c16.png spec/png_suite/transparency/tbgn3p08.png spec/png_suite/transparency/tbrn2c08.png spec/png_suite/transparency/tbwn1g16.png spec/png_suite/transparency/tbwn3p08.png spec/png_suite/transparency/tbyn3p08.png spec/png_suite/transparency/tp0n1g08.png spec/png_suite/transparency/tp0n2c08.png spec/png_suite/transparency/tp0n3p08.png spec/png_suite/transparency/tp1n3p08.png spec/png_suite_spec.rb spec/resources/adam7.png spec/resources/circles.png spec/resources/clock.png spec/resources/clock_base.png spec/resources/clock_mask.png spec/resources/clock_mask_updated.png spec/resources/clock_nn_xdown_ydown.png spec/resources/clock_nn_xdown_yup.png spec/resources/clock_nn_xup_yup.png spec/resources/clock_updated.png spec/resources/composited.png spec/resources/cropped.png spec/resources/damaged_chunk.png spec/resources/damaged_signature.png spec/resources/lines.png spec/resources/operations.png spec/resources/partial_circles.png spec/resources/pixelstream.rgb spec/resources/pixelstream.rgba spec/resources/pixelstream_best_compression.png spec/resources/pixelstream_fast_rgba.png spec/resources/pixelstream_reference.png spec/resources/polygon_filled_horizontal.png spec/resources/polygon_filled_vertical.png spec/resources/polygon_triangle_filled.png spec/resources/polygon_unfilled.png spec/resources/rect.png spec/resources/replaced.png spec/resources/text_chunk.png spec/resources/ztxt_chunk.png spec/spec_helper.rb tasks/benchmarks.rake tasks/github-gem.rake)
+  s.test_files = %w(spec/chunky_png/canvas/adam7_interlacing_spec.rb spec/chunky_png/canvas/drawing_spec.rb spec/chunky_png/canvas/masking_spec.rb spec/chunky_png/canvas/operations_spec.rb spec/chunky_png/canvas/png_decoding_spec.rb spec/chunky_png/canvas/png_encoding_spec.rb spec/chunky_png/canvas/resampling_spec.rb spec/chunky_png/canvas/stream_exporting_spec.rb spec/chunky_png/canvas/stream_importing_spec.rb spec/chunky_png/canvas_spec.rb spec/chunky_png/color_spec.rb spec/chunky_png/datastream_spec.rb spec/chunky_png/dimension_spec.rb spec/chunky_png/image_spec.rb spec/chunky_png/point_spec.rb spec/chunky_png/rmagick_spec.rb spec/chunky_png/vector_spec.rb spec/chunky_png_spec.rb spec/png_suite_spec.rb)
 end

data/lib/chunky_png.rb

@@ -1,20 +1,26 @@
+# Basic requirements from standard library
 require 'set'
 require 'zlib'
 require 'stringio'
 require 'enumerator'
 
+# Ruby 1.8 / 1.9 compatibility
 require 'chunky_png/compatibility'
+
+# PNG file structure
 require 'chunky_png/datastream'
 require 'chunky_png/chunk'
+
+# Colors
 require 'chunky_png/palette'
 require 'chunky_png/color'
-require 'chunky_png/canvas/png_encoding'
-require 'chunky_png/canvas/png_decoding'
-require 'chunky_png/canvas/adam7_interlacing'
-require 'chunky_png/canvas/stream_exporting'
-require 'chunky_png/canvas/stream_importing'
-require 'chunky_png/canvas/operations'
-require 'chunky_png/canvas/drawing'
+
+# Geometry
+require 'chunky_png/point'
+require 'chunky_png/vector'
+require 'chunky_png/dimension'
+
+# Canvas / Image classes
 require 'chunky_png/canvas'
 require 'chunky_png/image'
 
@@ -28,7 +34,7 @@ module ChunkyPNG
 
   # The current version of ChunkyPNG. This value will be updated automatically
   # by them gem:release rake task.
-  VERSION = "1.0.0.beta2"
+  VERSION = "1.0.0.rc1"
 
   ###################################################
   # PNG international standard defined constants

data/lib/chunky_png/canvas.rb

@@ -1,3 +1,13 @@
+require 'chunky_png/canvas/png_encoding'
+require 'chunky_png/canvas/png_decoding'
+require 'chunky_png/canvas/adam7_interlacing'
+require 'chunky_png/canvas/stream_exporting'
+require 'chunky_png/canvas/stream_importing'
+require 'chunky_png/canvas/operations'
+require 'chunky_png/canvas/drawing'
+require 'chunky_png/canvas/resampling'
+require 'chunky_png/canvas/masking'
+
 module ChunkyPNG
 
   # The ChunkPNG::Canvas class represents a raster image as a matrix of
@@ -30,6 +40,8 @@ module ChunkyPNG
 
     include Operations
     include Drawing
+    include Resampling
+    include Masking
 
     # @return [Integer] The number of columns in this canvas
     attr_reader :width
@@ -61,10 +73,10 @@ module ChunkyPNG
 
       if initial.kind_of?(Integer)
         @pixels = Array.new(width * height, initial)
-      elsif initial.kind_of?(Array) && initial.size == width * height
+      elsif initial.kind_of?(Array) && initial.length == width * height
         @pixels = initial
       else
-        raise ChunkyPNG::ExpectationFailed, "Cannot use this value as initial canvas: #{initial.inspect}!"
+        raise ChunkyPNG::ExpectationFailed, "Cannot use this value as initial #{width}x#{height} canvas: #{initial.inspect}!"
       end
     end
     
@@ -87,41 +99,90 @@ module ChunkyPNG
     # PROPERTIES
     #################################################################
 
-    # Returns the size ([width, height]) for this canvas.
-    # @return Array An array with the width and height of this canvas as elements.
-    def size
-      [@width, @height]
+    # Returns the dimension (width x height) for this canvas.
+    # @return [ChunkyPNG::Dimension] A dimension instante with the width and height set for this canvas.
+    def dimension
+      ChunkyPNG::Dimension.new(width, height)
+    end
+    
+    # Returns the area of this canvas in number of pixels.
+    # @return [Integer] The number of pixels in this canvas
+    def area
+      pixels.length
     end
 
     # Replaces a single pixel in this canvas.
-    # @param [Integer] x The x-coordinate of the pixel (column)
-    # @param [Integer] y The y-coordinate of the pixel (row)
-    # @param [ChunkyPNG::Color] pixel The new pixel for the provided coordinates.
-    # @return [Integer] the new pixel value, i.e. <tt>color</tt>.
+    #
+    # @overload []=(x, y, color)
+    #   Sets the color value of a pixel given a x- and y-coordinate
+    #   @param [Integer] x The x-coordinate of the pixel (column)
+    #   @param [Integer] y The y-coordinate of the pixel (row)
+    #   @param [Integer] color The new color for the provided coordinates.
+    #   @return [Integer] The new color value for this pixel, i.e. <tt>color</tt>. 
+    #
+    # @overload []=(point, color)
+    #   Sets the color value of a pixel given point-like value.
+    #   @param [ChunkyPNG::Point, ...] point The point on the canvas to replace.
+    #   @param [Integer] color The new color for the provided coordinates.
+    #   @return [Integer] The new color value for this pixel, i.e. <tt>color</tt>. 
+    #
     # @raise [ChunkyPNG::OutOfBounds] when the coordinates are outside of the image's dimensions.
-    def []=(x, y, color)
-      assert_xy!(x, y)
-      @pixels[y * width + x] = color
+    # @see #set_pixel
+    def []=(*args)
+      point = args.length == 2 ? ChunkyPNG::Point(args.first) : ChunkyPNG::Point(args[0], args[1])
+      assert_xy!(point.x, point.y)
+      @pixels[point.y * width + point.x] = args.last
     end
 
     # Replaces a single pixel in this canvas, without bounds checking.
-    # @param (see #[]=)
-    # @return [Integer] the new pixel value, i.e. <tt>color</tt>.
+    #
+    # This method return value and effects are undefined for coordinates 
+    # out of bounds of the canvas.
+    #
+    # @param [Integer] x The x-coordinate of the pixel (column)
+    # @param [Integer] y The y-coordinate of the pixel (row)
+    # @param [Inteer] pixel The new color for the provided coordinates.
+    # @return [Integer] The new color value for this pixel, i.e. <tt>color</tt>. 
     def set_pixel(x, y, color)
       @pixels[y * width + x] = color
     end
-
-    # Returns a single pixel from this canvas.
+   
+    # Replaces a single pixel in this canvas, with bounds checking. It will do
+    # noting if the provided coordinates are out of bounds.
+    #
     # @param [Integer] x The x-coordinate of the pixel (column)
     # @param [Integer] y The y-coordinate of the pixel (row)
-    # @return [ChunkyPNG::Color] The current pixel at the provided coordinates.
+    # @param [CInteger] pixel The new color value for the provided coordinates.
+    # @return [Integer] The new color value for this pixel, i.e. <tt>color</tt>, or 
+    #    <tt>nil</tt> if the coordinates are out of bounds.
+    def set_pixel_if_within_bounds(x, y, color)
+      return unless include_xy?(x, y)
+      @pixels[y * width + x] = color
+    end
+
+    # Returns a single pixel's color value from this canvas.
+    #
+    # @overload [](point)
+    #   Returns the color value given a point-like value.
+    #   @param [ChunkyPNG::Point, ...] point The coordinates of the pixel as point.
+    #   @return [Integer] The current color value at the provided coordinates.
+    #
+    # @overload [](x, y)
+    #   Returns the color value given a x- and y-coordinate.
+    #   @param [Integer] x The x-coordinate of the pixel (column)
+    #   @param [Integer] y The y-coordinate of the pixel (row)
+    #   @return [Integer] The current color value at the provided coordinates.
+    #
     # @raise [ChunkyPNG::OutOfBounds] when the coordinates are outside of the image's dimensions.
-    def [](x, y)
-      assert_xy!(x, y)
-      @pixels[y * width + x]
+    # @see #get_pixel
+    def [](*args)
+      point = ChunkyPNG::Point(*args)
+      assert_xy!(point.x, point.y)
+      @pixels[point.y * width + point.x]
     end
 
-    # Returns a single pixel from this canvas, without checking bounds.
+    # Returns a single pixel from this canvas, without checking bounds. The return value for
+    # this method is undefined if the coordinates are out of bounds.
     # @param (see #[])
     # @return [ChunkyPNG::Color] The current pixel at the provided coordinates.
     def get_pixel(x, y)
@@ -163,16 +224,17 @@ module ChunkyPNG
     end
 
     # Checks whether the given coordinates are in the range of the canvas
-    # @param [Integer] x The x-coordinate of the pixel (column)
-    # @param [Integer] y The y-coordinate of the pixel (row)
-    # @return [true, false] True if the x and y coordinate are in the range 
-    #    of this canvas.
-    def include_xy?(x, y)
-      include_x?(x) && include_y?(y)
+    # @param [ChunkyPNG::Point, Array, Hash, String] point_like The point to check.
+    # @return [true, false] True if the x and y coordinates of the point are  
+    #    within the limits of this canvas.
+    # @see ChunkyPNG::Point.single
+    def include_point?(*point_like)
+      dimension.include?(ChunkyPNG::Point(*point_like))
     end
     
-    alias_method :include?, :include_xy?
-
+    alias_method :include?,    :include_point?
+    alias_method :include_xy?, :include_point?
+    
     # Checks whether the given y-coordinate is in the range of the canvas
     # @param [Integer] y The y-coordinate of the pixel (row)
     # @return [true, false] True if the y-coordinate is in the range of this canvas.
@@ -227,34 +289,44 @@ module ChunkyPNG
     
     protected
     
+    # Replaces the image, given a new width, new height, and a new pixel array.
+    def replace_canvas!(new_width, new_height, new_pixels)
+      raise ChunkyPNG::ExpectationFailed, "The provided pixel array should have #{new_width * new_height} items" unless new_pixels.length == new_width * new_height
+      @width, @height, @pixels = new_width, new_height, new_pixels
+      return self
+    end
+    
     # Throws an exception if the x-coordinate is out of bounds.
     def assert_x!(x)
-      raise ChunkyPNG::OutOfBounds, "Column index out of bounds!" unless include_x?(x)
+      raise ChunkyPNG::OutOfBounds, "Column index #{x} out of bounds!" unless include_x?(x)
       return true
     end
     
     # Throws an exception if the y-coordinate is out of bounds.
     def assert_y!(y)
-      raise ChunkyPNG::OutOfBounds, "Row index out of bounds!" unless include_y?(y)
+      raise ChunkyPNG::OutOfBounds, "Row index #{y} out of bounds!" unless include_y?(y)
       return true
     end
     
     # Throws an exception if the x- or y-coordinate is out of bounds.
     def assert_xy!(x, y)
-      raise ChunkyPNG::OutOfBounds, "Coordinates out of bounds!" unless include_xy?(x, y)
+      raise ChunkyPNG::OutOfBounds, "Coordinates (#{x},#{y}) out of bounds!" unless include_xy?(x, y)
       return true
     end
-    
+
+    # Throws an exception if the vector_length does not match this canvas' height.
     def assert_height!(vector_length)
-      raise ChunkyPNG::ExpectationFailed, "The length of the vector does not match the canvas height!" if height != vector_length
+      raise ChunkyPNG::ExpectationFailed, "The length of the vector (#{vector_length}) does not match the canvas height (#{height})!" if height != vector_length
       return true
     end
-    
+
+    # Throws an exception if the vector_length does not match this canvas' width.
     def assert_width!(vector_length)
-      raise ChunkyPNG::ExpectationFailed, "The length of the vector does not match the canvas width!" if width != vector_length
+      raise ChunkyPNG::ExpectationFailed, "The length of the vector (#{vector_length}) does not match the canvas width (#{width})!" if width != vector_length
       return true
     end
-    
+
+    # Throws an exception if the matrix width and height does not match this canvas' dimensions.
     def assert_size!(matrix_width, matrix_height)
       raise ChunkyPNG::ExpectationFailed, "The width of the matrix does not match the canvas width!"   if width  != matrix_width
       raise ChunkyPNG::ExpectationFailed, "The height of the matrix does not match the canvas height!" if height != matrix_height

data/lib/chunky_png/canvas/drawing.rb

@@ -1,63 +1,91 @@
 module ChunkyPNG
   class Canvas
     
+    # Module that adds some primitive drawing methods to {ChunkyPNG::Canvas}.
+    #
+    # All of these methods change the current canvas instance and do not create a new one,
+    # even though the method names do not end with a bang.
+    #
+    # @note Drawing operations will not fail when something is drawn outside of the bounds
+    #       of the canvas; these pixels will simply be ignored.
+    # @see ChunkyPNG::Canvas
     module Drawing
       
-      # Sets a point on the canvas by composing a pixel with its background color.
-      def point(x, y, color)
-        set_pixel(x, y, ChunkyPNG::Color.compose(color, get_pixel(x, y)))
+      # Composes a pixel on the canvas by alpha blending a color with its background color.
+      # @overload compose_pixel(x, y, color)
+      #   @param [Integer] x The x-coordinate of the pixel to blend.
+      #   @param [Integer] y The y-coordinate of the pixel to blend.
+      #   @param [Integer] color The foreground color to blend with
+      # @overload compose_pixel(point, color)
+      #   @param [ChunkyPNG::Point, ...] point The point on the canvas to blend.
+      #   @param [Integer] color The foreground color to blend with
+      def compose_pixel(*args)
+        point = args.length == 2 ? ChunkyPNG::Point(args.first) : ChunkyPNG::Point(args[0], args[1])
+        return unless include?(point)
+        set_pixel(point.x, point.y, ChunkyPNG::Color.compose(args.last, get_pixel(point.x, point.y)))
       end
       
       # Draws an anti-aliased line using Xiaolin Wu's algorithm.
       #
-      def line_xiaolin_wu(x0, y0, x1, y1, color)
-        y0, y1, x0, x1 = y1, y0, x1, x0 if y0 > y1
+      # @param [Integer] x0 The x-coordinate of the first control point.
+      # @param [Integer] y0 The y-coordinate of the first control point.
+      # @param [Integer] x1 The x-coordinate of the second control point.
+      # @param [Integer] y1 The y-coordinate of the second control point.
+      # @param [Integer] stroke_color The color to use for this line.
+      # @param [true, false] inclusive Whether to draw the last pixel. 
+      #    Set to false when drawing multiplelines in a path.
+      # @return [ChunkyPNG::Canvas] Itself, with the line drawn.
+      def line_xiaolin_wu(x0, y0, x1, y1, stroke_color, inclusive = true)
         dx = x1 - x0
         sx = dx < 0 ? -1 : 1
         dx *= sx
         dy = y1 - y0
+        sy = dy < 0 ? -1 : 1
+        dy *= sy
         
         if dy == 0 # vertical line
-          Range.new(*[x0,x1].sort).each do |x|
-            point(x, y0, color)
+          x0.step(inclusive ? x1 : x1 - sx, sx) do |x|
+            compose_pixel(x, y0, stroke_color)
           end
+          
         elsif dx == 0 # horizontal line
-          (y0..y1).each do |y|
-            point(x0, y, color)
+          y0.step(inclusive ? y1 : y1 - sy, sy) do |y|
+            compose_pixel(x0, y, stroke_color)
           end
+          
         elsif dx == dy # diagonal
-          x0.step(x1, sx) do |x|
-            point(x, y0, color)
-            y0 += 1
+          x0.step(inclusive ? x1 : x1 - sx, sx) do |x|
+            compose_pixel(x, y0, stroke_color)
+            y0 += sy
           end
           
         elsif dy > dx  # vertical displacement
-          point(x0, y0, color)
-          e_acc = 0          
+          compose_pixel(x0, y0, stroke_color)
+          e_acc = 0
           e = ((dx << 16) / dy.to_f).round
-          (y0...y1-1).each do |i|
+          (dy - 1).downto(0) do |i|
             e_acc_temp, e_acc = e_acc, (e_acc + e) & 0xffff
-            x0 = x0 + sx if (e_acc <= e_acc_temp)
+            x0 += sx if (e_acc <= e_acc_temp)
             w = 0xff - (e_acc >> 8)
-            point(x0, y0, ChunkyPNG::Color.fade(color, w)) if include_xy?(x0, y0)
-            y0 = y0 + 1
-            point(x0 + sx, y0, ChunkyPNG::Color.fade(color, 0xff - w)) if include_xy?(x0 + sx, y0)
+            compose_pixel(x0, y0, ChunkyPNG::Color.fade(stroke_color, w))
+            compose_pixel(x0 + sx, y0 + sy, ChunkyPNG::Color.fade(stroke_color, 0xff - w)) if inclusive || i > 0
+            y0 += sy
           end
-          point(x1, y1, color)
+          compose_pixel(x1, y1, stroke_color) if inclusive
           
         else # horizontal displacement
-          point(x0, y0, color)
+          compose_pixel(x0, y0, stroke_color)
           e_acc = 0
-          e = (dy << 16) / dx
+          e = ((dy << 16) / dx.to_f).round
           (dx - 1).downto(0) do |i|
             e_acc_temp, e_acc = e_acc, (e_acc + e) & 0xffff
-            y0 += 1 if (e_acc <= e_acc_temp)
+            y0 += sy if (e_acc <= e_acc_temp)
             w = 0xff - (e_acc >> 8)
-            point(x0, y0, ChunkyPNG::Color.fade(color, w)) if include_xy?(x0, y0)
+            compose_pixel(x0, y0, ChunkyPNG::Color.fade(stroke_color, w))
+            compose_pixel(x0 + sx, y0 + sy, ChunkyPNG::Color.fade(stroke_color, 0xff - w)) if inclusive || i > 0
             x0 += sx
-            point(x0, y0 + 1, ChunkyPNG::Color.fade(color, 0xff - w)) if include_xy?(x0, y0 + 1)
           end
-          point(x1, y1, color)
+          compose_pixel(x1, y1, stroke_color) if inclusive
         end
         
         return self
@@ -65,23 +93,136 @@ module ChunkyPNG
       
       alias_method :line, :line_xiaolin_wu
       
-      def rect(x0, y0, x1, y1, line_color, fill_color = ChunkyPNG::Color::TRANSPARENT)
+      
+      # Draws a polygon on the canvas using the stroke_color, filled using the fill_color if any.
+      #
+      # @param [Array, String] The control point vector. Accepts everything {ChunkyPNG.Vector} accepts.
+      # @param [Integer] stroke_color The stroke color to use for this polygon.
+      # @param [Integer] fill_color The fill color to use for this polygon.
+      # @return [ChunkyPNG::Canvas] Itself, with the polygon drawn.
+      def polygon(path, stroke_color = ChunkyPNG::Color::BLACK, fill_color = ChunkyPNG::Color::TRANSPARENT)
+        
+        vector = ChunkyPNG::Vector(*path)
+        raise ChunkyPNG::ExpectationFailed, "A polygon requires at least 3 points" if path.length < 3
+
+        # Fill
+        unless fill_color == ChunkyPNG::Color::TRANSPARENT
+          vector.y_range.each do |y|
+            intersections = []
+            vector.edges.each do |p1, p2|
+              if (p1.y < y && p2.y >= y) || (p2.y < y && p1.y >= y)
+                intersections << (p1.x + (y - p1.y).to_f / (p2.y - p1.y) * (p2.x - p1.x)).round
+              end
+            end
+
+            intersections.sort!
+            0.step(intersections.length - 1, 2) do |i|
+              intersections[i].upto(intersections[i + 1]) do |x|
+                compose_pixel(x, y, fill_color)
+              end
+            end
+          end
+        end
+        
+        # Stroke
+        vector.each_edge do |(from_x, from_y), (to_x, to_y)|
+          line(from_x, from_y, to_x, to_y, stroke_color, false)
+        end
+
+        return self
+      end
+      
+      # Draws a rectangle on the canvas, using two control points.
+      #
+      # @param [Integer] x0 The x-coordinate of the first control point.
+      # @param [Integer] y0 The y-coordinate of the first control point.
+      # @param [Integer] x1 The x-coordinate of the second control point.
+      # @param [Integer] y1 The y-coordinate of the second control point.
+      # @param [Integer] stroke_color The line color to use for this rectangle.
+      # @param [Integer] fill_color The fill color to use for this rectangle.
+      # @return [ChunkyPNG::Canvas] Itself, with the rectangle drawn.
+      def rect(x0, y0, x1, y1, stroke_color = ChunkyPNG::Color::BLACK, fill_color = ChunkyPNG::Color::TRANSPARENT)
       
         # Fill
-        [x0, x1].min.upto([x0, x1].max) do |x|
-          [y0, y1].min.upto([y0, y1].max) do |y|
-            point(x, y, fill_color)
+        unless fill_color == ChunkyPNG::Color::TRANSPARENT
+          [x0, x1].min.upto([x0, x1].max) do |x|
+            [y0, y1].min.upto([y0, y1].max) do |y|
+              compose_pixel(x, y, fill_color)
+            end
           end
         end
         
         # Stroke
-        line(x0, y0, x0, y1, line_color)
-        line(x0, y1, x1, y1, line_color)
-        line(x1, y1, x1, y0, line_color)
-        line(x1, y0, x0, y0, line_color)
+        line(x0, y0, x0, y1, stroke_color, false)
+        line(x0, y1, x1, y1, stroke_color, false)
+        line(x1, y1, x1, y0, stroke_color, false)
+        line(x1, y0, x0, y0, stroke_color, false)
         
         return self
       end
+      
+      # Draws a circle on the canvas.
+      #
+      # @param [Integer] x0 The x-coordinate of the center of the circle.
+      # @param [Integer] y0 The y-coordinate of the center of the circle.
+      # @param [Integer] radius The radius of the circle from the center point.
+      # @param [Integer] stroke_color The color to use for the line.
+      # @param [Integer] fill_color The color to use that fills the circle.
+      # @return [ChunkyPNG::Canvas] Itself, with the circle drawn.
+      def circle(x0, y0, radius, stroke_color = ChunkyPNG::Color::BLACK, fill_color = ChunkyPNG::Color::TRANSPARENT)
+
+        f = 1 - radius
+        ddF_x = 1
+        ddF_y = -2 * radius
+        x = 0
+        y = radius
+
+        compose_pixel(x0, y0 + radius, stroke_color)
+        compose_pixel(x0, y0 - radius, stroke_color)
+        compose_pixel(x0 + radius, y0, stroke_color)
+        compose_pixel(x0 - radius, y0, stroke_color)
+
+        lines = [radius - 1] unless fill_color == ChunkyPNG::Color::TRANSPARENT
+
+        while x < y
+
+          if f >= 0
+            y -= 1
+            ddF_y += 2
+            f += ddF_y
+          end
+
+          x += 1
+          ddF_x += 2
+          f += ddF_x
+
+          unless fill_color == ChunkyPNG::Color::TRANSPARENT
+            lines[y] = lines[y] ? [lines[y], x - 1].min : x - 1
+            lines[x] = lines[x] ? [lines[x], y - 1].min : y - 1
+          end
+
+          compose_pixel(x0 + x, y0 + y, stroke_color)
+          compose_pixel(x0 - x, y0 + y, stroke_color)
+          compose_pixel(x0 + x, y0 - y, stroke_color)
+          compose_pixel(x0 - x, y0 - y, stroke_color)
+
+          unless x == y
+            compose_pixel(x0 + y, y0 + x, stroke_color)
+            compose_pixel(x0 - y, y0 + x, stroke_color)
+            compose_pixel(x0 + y, y0 - x, stroke_color)
+            compose_pixel(x0 - y, y0 - x, stroke_color)
+          end
+        end
+
+        unless fill_color == ChunkyPNG::Color::TRANSPARENT
+          lines.each_with_index do |length, y|
+            line(x0 - length, y0 - y, x0 + length, y0 - y, fill_color) if length > 0
+            line(x0 - length, y0 + y, x0 + length, y0 + y, fill_color) if length > 0 && y > 0
+          end
+        end
+
+        return self
+      end
     end
   end
 end