Making sure full image is loaded when auto_rotate config option is used
because then we need the full image right at the start – as before – and there's no need to load "properties only" first, to then load the full image right after.
This commit is contained in:
parent
fbc35b8ef9
commit
82e868966c
|
@ -6,18 +6,19 @@ module Jekyll
|
||||||
attr_reader :original_image
|
attr_reader :original_image
|
||||||
|
|
||||||
def initialize(original_image_absolute_path, config)
|
def initialize(original_image_absolute_path, config)
|
||||||
@original_image_absolute_path = original_image_absolute_path
|
|
||||||
@original_image = Magick::Image::ping(original_image_absolute_path).first
|
|
||||||
@original_image_pixels_loaded = false
|
|
||||||
@config = config
|
@config = config
|
||||||
end
|
|
||||||
|
|
||||||
def resize_image
|
@original_image_absolute_path = original_image_absolute_path
|
||||||
|
|
||||||
if @config['auto_rotate']
|
if @config['auto_rotate']
|
||||||
load_full_image
|
load_full_image
|
||||||
@original_image.auto_orient!
|
@original_image.auto_orient!
|
||||||
|
else
|
||||||
|
load_image_properties_only
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def resize_image
|
||||||
resized = []
|
resized = []
|
||||||
|
|
||||||
@config['sizes'].each do |size|
|
@config['sizes'].each do |size|
|
||||||
|
@ -92,6 +93,11 @@ module Jekyll
|
||||||
@original_image_pixels_loaded = true
|
@original_image_pixels_loaded = true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def load_image_properties_only
|
||||||
|
@original_image = Magick::Image::ping(@original_image_absolute_path).first
|
||||||
|
@original_image_pixels_loaded = false
|
||||||
|
end
|
||||||
|
|
||||||
def ensure_output_dir_exists!(path)
|
def ensure_output_dir_exists!(path)
|
||||||
dir = File.dirname(path)
|
dir = File.dirname(path)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue