From 4d0580b160e8203b5cec4a83176f182487452386 Mon Sep 17 00:00:00 2001 From: evazion Date: Tue, 21 Sep 2021 03:56:52 -0500 Subject: [PATCH] MediaFile: remove old libvips compatibility code. 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. --- app/logical/media_file/image.rb | 18 ++---------------- config/sRGB.icm | Bin 3268 -> 0 bytes 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 config/sRGB.icm diff --git a/app/logical/media_file/image.rb b/app/logical/media_file/image.rb index 1ed6a5516..1d3c563c3 100644 --- a/app/logical/media_file/image.rb +++ b/app/logical/media_file/image.rb @@ -3,23 +3,12 @@ # @see https://github.com/libvips/ruby-vips # @see https://libvips.github.io/libvips/API/current 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 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 - if Vips.at_least_libvips?(8, 10) - THUMBNAIL_OPTIONS = { size: :down, 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 + THUMBNAIL_OPTIONS = { size: :down, linear: false, no_rotate: true } + CROP_OPTIONS = { crop: :attention, linear: false, no_rotate: true } def dimensions image.size @@ -74,9 +63,6 @@ class MediaFile::Image < MediaFile def is_animated_gif? 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 def is_animated_png? diff --git a/config/sRGB.icm b/config/sRGB.icm deleted file mode 100644 index 59b4507045831e10007301bab6a8b6e3c0c47ac3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3268 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