From 4570561049838bb8b1b9f08d939c06df6af16b3f Mon Sep 17 00:00:00 2001 From: Daniel Pierce Date: Fri, 31 Mar 2017 13:29:11 -0400 Subject: [PATCH] Specify .jp2 mime type to prevent .txt being used by default. Don't use '-quiet' because it is already hardcoded in the kdu_compress command string. --- spec/units/transcoding_spec.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/spec/units/transcoding_spec.rb b/spec/units/transcoding_spec.rb index e2d3216..98d5d5d 100644 --- a/spec/units/transcoding_spec.rb +++ b/spec/units/transcoding_spec.rb @@ -58,10 +58,10 @@ def create_derivatives(_filename) when 'image/tiff' Jpeg2kImageDerivatives.create(self, source: :original_file, outputs: [ - { label: :resized, recipe: :default, processor: 'jpeg2k_image', resize: "600x600>", url: "#{uri}/resized" }, - { label: :config_lookup, recipe: :default, processor: 'jpeg2k_image', url: "#{uri}/config_lookup" }, - { label: :string_recipe, recipe: '-quiet', processor: 'jpeg2k_image', url: "#{uri}/string_recipe" }, - { label: :diy, processor: 'jpeg2k_image', url: "#{uri}/original_file_diy" }]) + { label: :resized, format: 'jp2', recipe: :default, processor: 'jpeg2k_image', resize: "600x600>", url: "#{uri}/resized" }, + { label: :config_lookup, format: 'jp2', recipe: :default, processor: 'jpeg2k_image', url: "#{uri}/config_lookup" }, + { label: :string_recipe, format: 'jp2', recipe: '-jp2_space sRGB', processor: 'jpeg2k_image', url: "#{uri}/string_recipe" }, + { label: :diy, format: 'jp2', processor: 'jpeg2k_image', url: "#{uri}/original_file_diy" }]) when 'image/x-adobe-dng' ImageDerivatives.create(self, source: :original_file, outputs: [ @@ -318,6 +318,7 @@ def create_derivatives(_filename) let(:file) do GenericFile.new(mime_type_from_fits: 'image/tiff').tap do |t| t.original_file.content = attachment + t.original_file.mime_type = 'image/tiff' t.save end end