From a87083fa7641267339e06a77773601594570d0fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Thu, 26 Mar 2015 18:16:15 +0100
Subject: [PATCH] FIX: use 'resize' option instead of 'thumbnail' when
downsizing emojis
---
app/jobs/regular/resize_emoji.rb | 2 +-
app/models/optimized_image.rb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/jobs/regular/resize_emoji.rb b/app/jobs/regular/resize_emoji.rb
index 61ae0248c2e..e46879f8e07 100644
--- a/app/jobs/regular/resize_emoji.rb
+++ b/app/jobs/regular/resize_emoji.rb
@@ -11,7 +11,7 @@ module Jobs
force_aspect_ratio: SiteSetting.enforce_square_emoji
}
# make sure emoji aren't too big
- OptimizedImage.downsize(path, path, 60, 60, opts)
+ OptimizedImage.downsize(path, path, 100, 100, opts)
end
end
diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb
index f736ea4aaae..6fdc3869ed3 100644
--- a/app/models/optimized_image.rb
+++ b/app/models/optimized_image.rb
@@ -112,7 +112,7 @@ class OptimizedImage < ActiveRecord::Base
#{from}[0]
-gravity center
-background transparent
- -thumbnail #{dimensions}#{!!opts[:force_aspect_ratio] ? "\\!" : "\\>"}
+ -resize #{dimensions}#{!!opts[:force_aspect_ratio] ? "\\!" : "\\>"}
#{to}
}
end
@@ -123,7 +123,7 @@ class OptimizedImage < ActiveRecord::Base
-coalesce
-gravity center
-background transparent
- -thumbnail #{dimensions}#{!!opts[:force_aspect_ratio] ? "\\!" : "\\>"}
+ -resize #{dimensions}#{!!opts[:force_aspect_ratio] ? "\\!" : "\\>"}
#{to}
}
end