Skip to content

使用 magick 替代 convert 命令 #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Guoxweii wants to merge 1 commit into
base: master
Choose a base branch
from
Open

使用 magick 替代 convert 命令 #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions lib/simple_captcha/image.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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