catch exiftool parse errors

[minime.git] / termimg

diff --git a/termimg b/termimg
index b7fa9340fb6ac20d49c7180721f99d02ba7b7c81..d51790613d64346bc58439aab97beae6c80a544e 100755 (executable)
--- a/termimg
+++ b/termimg
@@ -5,6 +5,7 @@ my ($file, $size) = @ARGV;
 my @info = eval {
        require Image::ExifTool;
        my $exif = Image::ExifTool->new->ImageInfo($file);
+       die "exiftool: $exif->{Error}\n" if $exif->{Error};
        return (
                $exif->{MIMEType},
                $exif->{ImageSize} ? "$exif->{ImageSize} ($exif->{Megapixels}MP)" : (),
@@ -35,7 +36,8 @@ my @info = eval {
                (map "> $_", $exif->{'Description-nl'} // ()),
                $exif->{Warning} ? "! $exif->{Warning}" : (),
        );
-} or warn $@;
+};
+warn $@ if $@;
 
 my $filesize = (stat $file)[7];
 eval {
@@ -49,14 +51,14 @@ eval {
 open my $pgm, '-|', convert => (
        -compress => 'none',
        '+distort' => SRT => '0,0 1,.56 0',
-       -thumbnail => $size || '66x23',
+       -thumbnail => $size || '40x12',
        $file => 'pgm:-'
 ) or die $!;
 
 if (<$pgm> eq "P2\n") {
        my ($width, $height) = split ' ', <$pgm>;
        <$pgm>;  # ignore depth
-       my @ch = split //, " .:coO@";
+       my @ch = split //, " .:oO@";
        while (<$pgm>) {
                print $ch[ $_ * @ch >> 8 ] for /\d+/g;
                print ' ', shift @info if @info;