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

MediaFile: remove old libvips compatibility code.

Browse Source 
Remove code for working with older versions of libvips. This makes
libvips 8.10+ a hard requirement. Older versions were already broken and
failed certain tests in the test suite.
This commit is contained in:
evazion
2021-09-21 03:56:52 -05:00
parent ae7d964bf1
commit 4d0580b160
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/logical/media_file/image.rb
View File

@@ -3,23 +3,12 @@
# @see https://github.com/libvips/ruby-vips # @see https://github.com/libvips/ruby-vips
# @see https://libvips.github.io/libvips/API/current # @see https://libvips.github.io/libvips/API/current
class MediaFile::Image < MediaFile class MediaFile::Image < MediaFile
# Taken from ArgyllCMS 2.0.0 (see also: https://ninedegreesbelow.com/photography/srgb-profile-comparison.html)
SRGB_PROFILE = "#{Rails.root}/config/sRGB.icm"
# http://jcupitt.github.io/libvips/API/current/VipsForeignSave.html#vips-jpegsave # http://jcupitt.github.io/libvips/API/current/VipsForeignSave.html#vips-jpegsave
JPEG_OPTIONS = { Q: 90, background: 255, strip: true, interlace: true, optimize_coding: true } JPEG_OPTIONS = { Q: 90, background: 255, strip: true, interlace: true, optimize_coding: true }
# http://jcupitt.github.io/libvips/API/current/libvips-resample.html#vips-thumbnail # http://jcupitt.github.io/libvips/API/current/libvips-resample.html#vips-thumbnail
if Vips.at_least_libvips?(8, 10) THUMBNAIL_OPTIONS = { size: :down, linear: false, no_rotate: true }
THUMBNAIL_OPTIONS = { size: :down, linear: false, no_rotate: true } CROP_OPTIONS = { crop: :attention, linear: false, no_rotate: true }
CROP_OPTIONS = { crop: :attention, linear: false, no_rotate: true }
elsif Vips.at_least_libvips?(8, 8)
THUMBNAIL_OPTIONS = { size: :down, linear: false, no_rotate: true, export_profile: "srgb" }
CROP_OPTIONS = { crop: :attention, linear: false, no_rotate: true, export_profile: "srgb" }
else
THUMBNAIL_OPTIONS = { size: :down, linear: false, auto_rotate: false, export_profile: SRGB_PROFILE, import_profile: SRGB_PROFILE }
CROP_OPTIONS = { crop: :attention, linear: false, auto_rotate: false, export_profile: SRGB_PROFILE, import_profile: SRGB_PROFILE }
end
def dimensions def dimensions
image.size image.size
@@ -74,9 +63,6 @@ class MediaFile::Image < MediaFile
def is_animated_gif? def is_animated_gif?
file_ext == :gif && image.get("n-pages") > 1 file_ext == :gif && image.get("n-pages") > 1
# older versions of libvips that don't support n-pages will raise an error
rescue Vips::Error
false
end end
def is_animated_png? def is_animated_png?

BIN
config/sRGB.icm
View File

Binary file not shown.