Fix #6525: Make sure file is opened in LazyThumbnail processor (#6529)

diff --git a/app/models/concerns/account_avatar.rb b/app/models/concerns/account_avatar.rb
index 619644c9a4f2b241cc42dd6d2ad534b73a8d8638..7712a29fd08d615d6ac12a280dba52853aa92c82 100644 (file)
--- a/app/models/concerns/account_avatar.rb
+++ b/app/models/concerns/account_avatar.rb
@@ -8,7 +8,7 @@ module AccountAvatar
   class_methods do
     def avatar_styles(file)
       styles = { original: { geometry: '120x120#', file_geometry_parser: FastGeometryParser } }
-      styles[:static] = { format: 'png', convert_options: '-coalesce', file_geometry_parser: FastGeometryParser } if file.content_type == 'image/gif'
+      styles[:static] = { geometry: '120x120#', format: 'png', convert_options: '-coalesce', file_geometry_parser: FastGeometryParser } if file.content_type == 'image/gif'
       styles
     end
 

diff --git a/app/models/concerns/account_header.rb b/app/models/concerns/account_header.rb
index 5ed8a9c832109a9547caf5c71af35095fa6d6ce9..04c576b289f8b411281621b9e3f6c82f76189b88 100644 (file)
--- a/app/models/concerns/account_header.rb
+++ b/app/models/concerns/account_header.rb
@@ -8,7 +8,7 @@ module AccountHeader
   class_methods do
     def header_styles(file)
       styles = { original: { geometry: '700x335#', file_geometry_parser: FastGeometryParser } }
-      styles[:static] = { format: 'png', convert_options: '-coalesce', file_geometry_parser: FastGeometryParser } if file.content_type == 'image/gif'
+      styles[:static] = { geometry: '700x335#', format: 'png', convert_options: '-coalesce', file_geometry_parser: FastGeometryParser } if file.content_type == 'image/gif'
       styles
     end
 

diff --git a/lib/paperclip/lazy_thumbnail.rb b/lib/paperclip/lazy_thumbnail.rb
index 594f0ce39cf0c631e810497155c1f9af8d390798..42f9a557ac7c567bd50807f75adfcaa575725090 100644 (file)
--- a/lib/paperclip/lazy_thumbnail.rb
+++ b/lib/paperclip/lazy_thumbnail.rb
@@ -3,7 +3,7 @@
 module Paperclip
   class LazyThumbnail < Paperclip::Thumbnail
     def make
-      return @file unless needs_convert?
+      return File.open(@file.path) unless needs_convert?
       Paperclip::Thumbnail.make(file, options, attachment)
     end