jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #3582: Switch from ImageMagick to libvips

Browse Source
This commit is contained in:
evazion
2018-03-26 20:19:13 -05:00
parent 6c790c61d3
commit dc9b7e5bda
10 changed files with 39 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/upload.rb
View File

@@ -226,7 +226,17 @@ class Upload < ApplicationRecord
end
def is_animated_gif?
file_ext == "gif" && Magick::Image.ping(file.path).length > 1
return false if file_ext != "gif"
# Check whether the gif has multiple frames by trying to load the second frame.
result = Vips::Image.gifload(file.path, page: 1) rescue $ERROR_INFO
if result.is_a?(Vips::Image)
true
elsif result.is_a?(Vips::Error) && result.message.match?(/too few frames in GIF file/)
false
else
raise result
end
end
def is_animated_png?
@@ -245,7 +255,7 @@ class Upload < ApplicationRecord
preview_file = DanbooruImageResizer.resize(file, Danbooru.config.small_image_width, Danbooru.config.small_image_width, 85)
if image_width > Danbooru.config.large_image_width
sample_file = DanbooruImageResizer.resize(file, Danbooru.config.large_image_width, nil, 90)
sample_file = DanbooruImageResizer.resize(file, Danbooru.config.large_image_width, image_height, 90)
end
end