From aa69f78fed754e2060c3db63f59f915da0dca780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Mon, 26 Jun 2017 23:19:48 +0200
Subject: [PATCH] let's not use progressing rendering on images

---
 app/models/optimized_image.rb | 3 +++
 lib/upload_creator.rb         | 1 +
 2 files changed, 4 insertions(+)

diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb
index ad3c025fa00..52c79698ecb 100644
--- a/app/models/optimized_image.rb
+++ b/app/models/optimized_image.rb
@@ -122,6 +122,7 @@ class OptimizedImage < ActiveRecord::Base
       -extent #{dimensions}
       -interpolate bicubic
       -unsharp 2x0.5+0.7+0
+      -interlace none
       -quality 98
       -profile #{File.join(Rails.root, 'vendor', 'data', 'RT_sRGB.icm')}
       #{to}
@@ -153,6 +154,7 @@ class OptimizedImage < ActiveRecord::Base
       -thumbnail #{opts[:width]}
       -crop #{dimensions}+0+0
       -unsharp 2x0.5+0.7+0
+      -interlace none
       -quality 98
       -profile #{File.join(Rails.root, 'vendor', 'data', 'RT_sRGB.icm')}
       #{to}
@@ -181,6 +183,7 @@ class OptimizedImage < ActiveRecord::Base
       -auto-orient
       -gravity center
       -background transparent
+      -interlace none
       -resize #{dimensions}
       -profile #{File.join(Rails.root, 'vendor', 'data', 'RT_sRGB.icm')}
       #{to}
diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index c2101b32519..43ef92c27e1 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -136,6 +136,7 @@ class UploadCreator
       'convert', @file.path,
       '-auto-orient',
       '-background', 'white',
+      '-interlace', 'none',
       '-flatten',
       '-quality', SiteSetting.png_to_jpg_quality.to_s,
       jpeg_tempfile.path