From 88f24451352bda128825f857cde473107d98fca7 Mon Sep 17 00:00:00 2001 From: "M.Shibuya" Date: Sun, 17 Jan 2021 15:55:05 +0900 Subject: [PATCH] Support the latest version of rmagick --- carrierwave.gemspec | 2 +- lib/carrierwave/processing/rmagick.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/carrierwave.gemspec b/carrierwave.gemspec index 8fdc32ec9..4bcfec28f 100644 --- a/carrierwave.gemspec +++ b/carrierwave.gemspec @@ -42,7 +42,7 @@ Gem::Specification.new do |s| s.add_development_dependency "fog-rackspace" s.add_development_dependency "mini_magick", ">= 3.6.0" if RUBY_ENGINE != 'jruby' - s.add_development_dependency "rmagick", "~> 2.16" + s.add_development_dependency "rmagick", ">= 2.16" end s.add_development_dependency "timecop" s.add_development_dependency "generator_spec", ">= 0.9.1" diff --git a/lib/carrierwave/processing/rmagick.rb b/lib/carrierwave/processing/rmagick.rb index 129fb4de4..45d57039c 100644 --- a/lib/carrierwave/processing/rmagick.rb +++ b/lib/carrierwave/processing/rmagick.rb @@ -228,7 +228,7 @@ def resize_and_pad(width, height, background=:transparent, gravity=::Magick::Cen height = dimension_from height manipulate! do |img| img.resize_to_fit!(width, height) - new_img = ::Magick::Image.new(width, height) { self.background_color = background == :transparent ? 'rgba(255,255,255,0)' : background.to_s } + new_img = ::Magick::Image.new(width, height) { |img| img.background_color = background == :transparent ? 'rgba(255,255,255,0)' : background.to_s } if background == :transparent filled = new_img.matte_floodfill(1, 1) else @@ -378,7 +378,7 @@ def manipulate!(options={}, &block) def create_info_block(options) return nil unless options - assignments = options.map { |k, v| "self.#{k} = #{v}" } + assignments = options.map { |k, v| "img.#{k} = #{v}" } code = "lambda { |img| " + assignments.join(";") + "}" eval code end