Merge pull request #520 from bhollis/image_sizes
Make :automatic_image_sizes work for absolute image paths
This commit is contained in:
commit
d52e555dcd
|
@ -32,19 +32,19 @@ module Middleman
|
|||
def image_tag(path, params={})
|
||||
if !params.has_key?(:width) && !params.has_key?(:height) && !path.include?("://")
|
||||
params[:alt] ||= ""
|
||||
http_prefix = http_images_path rescue images_dir
|
||||
|
||||
begin
|
||||
real_path = File.join(source, images_dir, path)
|
||||
full_path = File.expand_path(real_path, root)
|
||||
http_prefix = http_images_path rescue images_dir
|
||||
real_path = path
|
||||
real_path = File.join(images_dir, real_path) unless real_path =~ %r{^/}
|
||||
full_path = File.join(source_dir, real_path)
|
||||
|
||||
if File.exists? full_path
|
||||
dimensions = ::FastImage.size(full_path, :raise_on_failure => true)
|
||||
params[:width] = dimensions[0]
|
||||
params[:height] = dimensions[1]
|
||||
end
|
||||
begin
|
||||
width, height = ::FastImage.size(full_path, :raise_on_failure => true)
|
||||
params[:width] = width
|
||||
params[:height] = height
|
||||
rescue
|
||||
# $stderr.puts params.inspect
|
||||
warn "Couldn't determine dimensions for image #{path}: #{$!.message}"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue