word: webp images at double resolution

[sheet.git] / Shiar_Sheet / ImagePrep.pm

diff --git a/Shiar_Sheet/ImagePrep.pm b/Shiar_Sheet/ImagePrep.pm
index 4fc33b64639a82ae1cfb71c745ecb1617bf4d3d0..f76cb31d7f4f3a448d91c6799c9fc8277a18a19a 100644 (file)
--- a/Shiar_Sheet/ImagePrep.pm
+++ b/Shiar_Sheet/ImagePrep.pm
@@ -3,7 +3,7 @@ package Shiar_Sheet::ImagePrep;
 use 5.014;
 use warnings;
 
-our $VERSION = '1.00';
+our $VERSION = '1.01';
 
 sub new {
        my ($class, $target) = @_;
@@ -23,23 +23,40 @@ sub download {
                or die "Download from <q>$download</q> failed: ".$status->status_line."\n";
 }
 
+sub dimensions {
+       my ($imgpath) = @_;
+       require IPC::Run;
+       IPC::Run::run(
+               [identify => -format => '%w %h', $$imgpath],
+               '<' => \undef, '>&' => \my $xy
+       ) or die ["Image dimensions could not be determined.", $$imgpath];
+       return split /\s/, $xy, 3;
+}
+
 sub convert {
-       my ($imgpath, $thumbpath, $cmds) = @_;
+       my ($imgpath, $thumbpath, $cmds, $xyres) = @_;
        if (not -e $$imgpath) {
                return !-e $thumbpath || unlink $thumbpath;
        }
 
-       my $xyres = 0 ? '600x400' : '300x200'; # cover
+       #my ($w, $h) = $imgpath->dimensions;
+       $xyres //= '300x200'; # cover
+       my $aspect = 3/2;
        my @cmds = @{ $cmds // [] };
        if (my ($cmdarg) = grep { $cmds[$_] eq '-area' } 0 .. $#cmds) {
                # replace option by permillage crop
                my @dim = map { $_ / 1000 } split /\D/, $cmds[$cmdarg + 1];
+               $dim[$_] ||= 1 for 2, 3; # optional end
+               push @dim, $dim[2 + $_] - $dim[$_] for 0, 1; # add width, height
                splice @cmds, $cmdarg, 2, (
+                       #crop="%[fx:floor(w*$ratio)]x%[fx:floor(h*$ratio)]"
+                       #crop="$crop+%[fx:ceil((w-w*$ratio)/2)]+%[fx:ceil((h-h*$ratio)/2)]"
                        -set => 'option:distort:viewport' => sprintf(
-                               '%%[fx:w*%s]x%%[fx:h*%s]+%%[fx:w*%s]+%%[fx:h*%s]',
-                               ($dim[2] || 1) - $dim[0], # width  = x2 - x1
-                               ($dim[3] || 1) - $dim[1], # height = y2 - y1
-                               @dim[0, 1]                # offset = x1,y1
+                               '%%[fx:%s]x%%[fx:%s]+%%[fx:%s]+%%[fx:%s]',
+                               "w*$dim[4]", "h*$dim[5]", # width x height
+                               #"max(w*$dim[4], h*$dim[5]*$aspect)", # width
+                               #"max(h*$dim[5], w*$dim[4]/$aspect)", # height
+                               "w*$dim[0]", "h*$dim[1]", # x+y offset
                        ),
                        -distort => SRT => 0, # noop transform to apply viewport
                );