luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-22 13:17:13 +00:00
Code Issues Projects Releases Wiki Activity

Add coalesce option to avatar and header convert processor (#4552)

Browse source 
Resolve #3199
This commit is contained in:
Yamagishi Kazutoshi 2017-08-08 22:49:14 +09:00 committed by Eugen Rochko
parent ec3be87a2b
commit 81c41d8681
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/concerns/account_avatar.rb
View file

@ -8,7 +8,7 @@ module AccountAvatar
class_methods do class_methods do
def avatar_styles(file) def avatar_styles(file)
styles = { original: '120x120#' } styles = { original: '120x120#' }
styles[:static] = { format: 'png' } if file.content_type == 'image/gif' styles[:static] = { format: 'png', convert_options: '-coalesce' } if file.content_type == 'image/gif'
styles styles
end end

2
app/models/concerns/account_header.rb
View file

@ -8,7 +8,7 @@ module AccountHeader
class_methods do class_methods do
def header_styles(file) def header_styles(file)
styles = { original: '700x335#' } styles = { original: '700x335#' }
styles[:static] = { format: 'png' } if file.content_type == 'image/gif' styles[:static] = { format: 'png', convert_options: '-coalesce' } if file.content_type == 'image/gif'
styles styles
end end