imagetiler 0.1.5 → 0.1.6

data/.gitignore

@@ -0,0 +1,4 @@
+test/*
+test*
+*~
+*.swp

data/README.markdown

@@ -23,6 +23,7 @@ Install the gem:
 `gem install imagetiler`
 
 Use it in your code:  
+	require 'rubygems' # if you installed imagetiler as a gem
 	require 'imagetiler' 
 	t = Tiler.new   
 	t.make_tiles(image_source, opts)
@@ -43,7 +44,7 @@ If you set an option in get_tiles, that will be the new default for that instanc
 `output_dir` : Defaults to the current directory. Don't include the ending '/'  
 `bg_color` : The background fill color, transparent by default.  
 `autocreate_dirs` : Whether or not to create the directory if it exists. Default true  
-`format` : The format for the output, defaults to 'jpg'. Can be png, gif, or anything that ImageMagick supports. 
+`format` : The format for the output, defaults to 'png'. Can be png, jpg, gif, or anything that ImageMagick supports. 
 `prefix` : Prefix for the output files. Defaults to 'tile'
 
 
@@ -61,7 +62,6 @@ Tiles in the output folder with format
 
 ## Other things
 * Requires rmagick and ImageMagick.
-* Might not work on Windows as written -- change the '/' for the output to '\\'
 
 
 ## Credits

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/imagetiler.gemspec

@@ -5,18 +5,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{imagetiler}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anna, Guilhem Vellut"]
-  s.date = %q{2010-09-04}
+  s.date = %q{2010-10-14}
   s.description = %q{imagetiler is a simple command-line and ruby image tiler with support for multiple zoom levels and different image formats.}
   s.email = %q{tanna22@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
   ]
   s.files = [
-    "README.markdown",
+    ".gitignore",
+     "README.markdown",
      "Rakefile",
      "VERSION",
      "imagetiler.gemspec",

data/lib/imagetiler.rb

@@ -31,7 +31,7 @@ class Tiler
 	def initialize()
 		@zoom_levels = 0..4
 		@bg_color = Magick::Pixel.new(255,255,255,Magick::TransparentOpacity)
-		@format = "jpg"
+		@format = "png"
 		@autocreate_dirs = true
 		@output_dir = "."
 		@prefix = "tile"
@@ -42,14 +42,9 @@ class Tiler
 
 		# initializing and setting options and stuff
 		image = get_image(image_source)
-		if opts[:zoom_levels]
-			@zoom_levels = opts[:zoom_levels]
-		end
-		if opts[:bg_color] then @bg_color = opts[:bg_color] end
-		if opts[:format] then @format = opts[:format] end
-		if opts[:autocreate_dirs] then @autocreate_dirs = opts[:autocreate_dirs] end
-		if opts[:output_dir] then @output_dir = opts[:output_dir] end
-		@prefix = opts[:prefix] if opts[:prefix]
+		opts.each_pair do |key,value|
+       instance_variable_set "@#{key}", value
+    end
 
 		if @autocreate_dirs
 			create_dir(output_dir)
@@ -77,7 +72,8 @@ class Tiler
 					tile.resize!(TILE_SIZE,TILE_SIZE)
 
 					# output tile
-					tile.write("#{@output_dir}/#{prefix}_#{zoom}_#{col}_#{row}.#{@format}")
+					filename = File.join(@output_dir, "#{prefix}_#{zoom}_#{col}_#{row}.#{@format}")
+					tile.write(filename)
 				end
 			end
 		end
@@ -98,14 +94,10 @@ class Tiler
 	# image is square and that the max number of pixels
 	# is evenly divisible by the max number of tiles per side
 	def pad_image(image)
-		dimension_image = calc_side_length(image)
+		dim = calc_side_length(image)
 		
-		bg_color = @bg_color
-		image_sq = Magick::Image.new(dimension_image, dimension_image) do
-			self.background_color = bg_color
-		end
-
-		image_sq.import_pixels(0,0,image.columns,image.rows,"RGBA",image.export_pixels(0,0,image.columns,image.rows,"RGBA"))
+		image.background_color = @bg_color
+		image.extent(dim, dim)
 	end
 
 	def get_image(image_source)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: imagetiler
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Anna, Guilhem Vellut
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-04 00:00:00 -04:00
+date: 2010-10-14 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -28,6 +28,7 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
+- .gitignore
 - README.markdown
 - Rakefile
 - VERSION