mason/.perl-lib/TrivGal.pm (Image::scale): Sink parsing the path name.

[tgal] / mason / .perl-lib / TrivGal.pm

diff --git a/mason/.perl-lib/TrivGal.pm b/mason/.perl-lib/TrivGal.pm
index 2d65be54c2155f79147d33c0b59d3f037a378d56..e6bfcf4836dcd929af925c979c50e75783f586d9 100644 (file)
--- a/mason/.perl-lib/TrivGal.pm
+++ b/mason/.perl-lib/TrivGal.pm
@@ -257,9 +257,6 @@ package TrivGal::Image {
          $m->interp->apply_escapes("$SCRIPTURL/$path", "u") .
          "?scale=$scale";
       } else {
-       my ($dir, $base, $ext) = TrivGal::split_path $thumb;
-       my $ty = $TYPE{lc $ext} or die "unknown type `$ext'";
-
        my $img = $me->{img};
        unless (defined $img) {
          my $exif = new Image::ExifTool;
@@ -273,6 +270,8 @@ package TrivGal::Image {
          }
        }
 
+       my ($dir, undef, $ext) = TrivGal::split_path $thumb;
+       my $ty = $TYPE{lc $ext} or die "unknown type `$ext'";
        my $sc = $sz/$me->sz;
        my $scaled = $img->create_scaled_image($sc*$wd, $sc*$ht);
 
@@ -344,7 +343,7 @@ sub listdir ($) {
          die "can't index a folder" if $indexp;
        } else {
          $list = \@f;
-         my ($dir, $base, $ext) = split_path $name;
+         my (undef, undef, $ext) = split_path $name;
          die "unknown image type" unless $TYPE{lc $ext};
          if ($indexp) {
            die "two index images" if defined $ix;
@@ -366,7 +365,7 @@ sub listdir ($) {
     closedir $d;
 
     ENT: for my $e (sort @e) {
-      my ($dir, $base, $ext) = split_path $e;
+      my (undef, undef, $ext) = split_path $e;
       my $dotp = $e =~ /^\./;
       my $st = stat "$path/$e";
       my $list = undef;