From 1f5ed7d22991e1cab539b8435dd86bbebb32b8a8 Mon Sep 17 00:00:00 2001 From: Guoxweii Date: Tue, 21 Oct 2025 11:54:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=20magick=20=E6=9B=BF?= =?UTF-8?q?=E4=BB=A3=20convert=20=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/simple_captcha/image.rb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/simple_captcha/image.rb b/lib/simple_captcha/image.rb index 2d82abc..7e8fd7a 100644 --- a/lib/simple_captcha/image.rb +++ b/lib/simple_captcha/image.rb @@ -70,20 +70,18 @@ def generate_simple_captcha_image(simple_captcha_key) #:nodoc params = ImageHelpers.image_params(SimpleCaptcha.image_style).dup params << "-size #{SimpleCaptcha.image_size}" - params << "-wave #{amplitude}x#{frequency}" params << "-gravity Center" params << "-pointsize 22" - params << "-implode #{ImageHelpers.implode}" - unless SimpleCaptcha.font.empty? - params << "-font #{SimpleCaptcha.font}" - end + params << "-font #{SimpleCaptcha.font}" unless SimpleCaptcha.font.empty? params << "label:#{text}" - if SimpleCaptcha.noise and SimpleCaptcha.noise > 0 + params << "-wave #{amplitude}x#{frequency}" + params << "-implode #{ImageHelpers.implode}" + if SimpleCaptcha.noise && SimpleCaptcha.noise > 0 params << "-evaluate Uniform-noise #{SimpleCaptcha.noise}" end params << "jpeg:-" - SimpleCaptcha::Utils::run("convert", params.join(' ')) + SimpleCaptcha::Utils::run("magick", params.join(' ')) end end end