github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-02 06:14:35 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: automatic PNG-to-JPEG conversion should use a default white background

Browse Source
This commit is contained in:
Régis Hanol 2017-06-01 23:10:36 +02:00
parent d1b06624ff
commit a64ef19e39
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/upload_creator.rb
View File

@ -132,7 +132,13 @@ class UploadCreator
jpeg_tempfile = Tempfile.new(["image", ".jpg"]) jpeg_tempfile = Tempfile.new(["image", ".jpg"])
OptimizedImage.ensure_safe_paths!(@file.path, jpeg_tempfile.path) OptimizedImage.ensure_safe_paths!(@file.path, jpeg_tempfile.path)
Discourse::Utils.execute_command('convert', @file.path, '-quality', SiteSetting.png_to_jpg_quality.to_s, jpeg_tempfile.path) Discourse::Utils.execute_command(
'convert', @file.path,
'-background', 'white',
'-flatten',
'-quality', SiteSetting.png_to_jpg_quality.to_s,
jpeg_tempfile.path
)
# keep the JPEG if it's at least 15% smaller # keep the JPEG if it's at least 15% smaller
if File.size(jpeg_tempfile.path) < filesize * 0.85 if File.size(jpeg_tempfile.path) < filesize * 0.85