Skip to content

ETT-1118: Use AdobeFlate compression with imgsrv #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aelkiss merged 1 commit into from
Dec 8, 2025
Merged

ETT-1118: Use AdobeFlate compression with imgsrv #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions imgsrv/lib/Process/Image.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,10 +493,7 @@ sub _process_output {
push @args, '-color';
push @args, '-truecolor';
}
# Deprecated option:
# "Warning, Creating TIFF with legacy Deflate codec identifier, COMPRESSION_ADOBE_DEFLATE is more widely supported."
# Should replace with -adobeflate ?
push @args, '-flate';
push @args, '-adobeflate';
}
if ( $xres && $yres ) {
# Multiply by 1 in case xres and/or yres is Image::TIFF::Rational
Expand Down
74 changes: 56 additions & 18 deletions imgsrv/t/lib/Process/Image.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,48 +13,86 @@ use TestHelper qw(setup_context_for_volume);
use Auth::Auth;
use Access::Rights;
use Context;
use Image::ExifTool;
use MdpItem;
use Process::Image;

my $C = setup_context_for_volume('test.pd_open');
my $mdpItem = $C->get_object('MdpItem');

=item get_exiftool_fields()

Returns a hash of all the tags found by ExifTool in the specified file.
The keys are in the format GroupName:TagName in the same format as the
tag names returned by exiftool -X $file

$fields_ref = get_exiftool_fields($file)

Adapted from feed - HTFeed/Stage/ImageRemediate.pm

=cut



subtest 'tiff export' => sub {
subtest 'full resolution' => sub {
my $output_file = '/tmp/t_lib_process_image_full.tif';
sub processor {
my $processor = new Process::Image;
$processor->mdpItem($C->get_object('MdpItem'));
my $seq = 1;
my $source_path = $mdpItem->GetFilePathMaybeExtract($seq, 'imagefile');
$processor->source( filename => $source_path);
$processor->output( filename => $output_file);
$processor->quality('full');
$processor->format('tif');
$processor->watermark(1);
#$processor->restricted(0);
$processor->quality('full');

return $processor;
}

sub get_exiftool_fields {
my $file = shift;
my $fields = {};

my $exifTool = new Image::ExifTool;

$exifTool->ExtractInfo($file);

foreach my $tag ($exifTool->GetFoundTags()) {
# get only the groupname we'll use to update it later
my $group = $exifTool->GetGroup($tag, "1");
my $tagname = Image::ExifTool::GetTagName($tag);
$fields->{"$group:$tagname"} = $exifTool->GetValue($tag);
}

return $fields;
}

subtest 'full resolution' => sub {
my $output_file = '/tmp/t_lib_process_image_full.tif';
my $processor = processor();
$processor->output( filename => $output_file);
$processor->process();
ok(-e $output_file, 'output TIFF file exists');
my $identify_output = `identify -verbose $output_file`;
ok($identify_output =~ /Resolution:\s+400x400/, 'image has original (400x400) resolution');

my $fields = get_exiftool_fields($output_file);
is($fields->{"IFD0:XResolution"}, 400, 'image has original (400x400 ppi) resolution');
is($fields->{"IFD0:YResolution"}, 400, 'image has original (400x400 ppi) resolution');
is($fields->{"IFD0:ResolutionUnit"}, "inches", 'image has original (400x400 ppi) resolution');
is($fields->{"IFD0:Compression"}, "Adobe Deflate", 'image has AdobeDeflate compression');
};

subtest '300 ppi resolution' => sub {
my $output_file = '/tmp/t_lib_process_image_300.tif';
my $processor = new Process::Image;
$processor->mdpItem($C->get_object('MdpItem'));
my $seq = 1;
my $source_path = $mdpItem->GetFilePathMaybeExtract($seq, 'imagefile');
$processor->source( filename => $source_path);
my $processor = processor();
$processor->output( filename => $output_file);
$processor->format('tif');
$processor->watermark(1);
#$processor->restricted(0);
$processor->quality('full');
$processor->size('ppi:300');
$processor->process();
ok(-e $output_file, 'output TIFF file exists');
my $identify_output = `identify -verbose $output_file`;
ok($identify_output =~ /Resolution:\s+300x300/, 'image has 300x300 resolution');

my $fields = get_exiftool_fields($output_file);
is($fields->{"IFD0:XResolution"}, 300, 'image has 300x300 ppi resolution');
is($fields->{"IFD0:YResolution"}, 300, 'image has 300x300 ppi resolution');
is($fields->{"IFD0:ResolutionUnit"}, "inches", 'image has 300x300 ppi resolution');
is($fields->{"IFD0:Compression"}, "Adobe Deflate", 'image has AdobeDeflate compression');
};
};

Expand Down