From af4078d982df7687b610bda1484e36c00b5caff1 Mon Sep 17 00:00:00 2001 From: Gregorius Marco Date: Fri, 8 Sep 2023 17:37:21 +1000 Subject: [PATCH] Use latest version of rmagick for Ruby 3.2 --- carrierwave.gemspec | 6 +++++- lib/carrierwave/processing/rmagick.rb | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/carrierwave.gemspec b/carrierwave.gemspec index 46bf95044..f959e2739 100644 --- a/carrierwave.gemspec +++ b/carrierwave.gemspec @@ -40,7 +40,11 @@ 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" + if RUBY_VERSION < '3.2' + s.add_development_dependency "rmagick", "~> 2.16" + else + s.add_development_dependency "rmagick" + end 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 743a39434..50a99e5ff 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) { |options| options.background_color = background == :transparent ? 'rgba(255,255,255,0)' : background.to_s } if background == :transparent filled = new_img.matte_floodfill(1, 1) else