diff options
| author | ThibG <thib@sitedethib.com> | 2020-06-09 13:00:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 13:00:24 +0200 |
| commit | 3287a10fe9658a6c370431a925abc50d4f68ea08 (patch) | |
| tree | 88a408a943aa421a6ba844d309f673150cd92434 /lib/paperclip/blurhash_transcoder.rb | |
| parent | f328f2faa3fbdb182921366c6a20e745c069b840 (diff) | |
| parent | e9d7ca7645fc37534df1222e8d7ab8f3d533b852 (diff) | |
Merge pull request #1350 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib/paperclip/blurhash_transcoder.rb')
| -rw-r--r-- | lib/paperclip/blurhash_transcoder.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/paperclip/blurhash_transcoder.rb b/lib/paperclip/blurhash_transcoder.rb index 5c33c98b0..1c3a6df02 100644 --- a/lib/paperclip/blurhash_transcoder.rb +++ b/lib/paperclip/blurhash_transcoder.rb @@ -3,7 +3,7 @@ module Paperclip class BlurhashTranscoder < Paperclip::Processor def make - return @file unless options[:style] == :small + return @file unless options[:style] == :small || options[:blurhash] pixels = convert(':source RGB:-', source: File.expand_path(@file.path)).unpack('C*') geometry = options.fetch(:file_geometry_parser).from_file(@file) |