X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/tgal/blobdiff_plain/8b97a4e3e8b71d1dda384dccdff35949e64f7dec..2c1f91c4c2441cde00590f88efc5e0553783410f:/mason/.perl-lib/TrivGal.pm diff --git a/mason/.perl-lib/TrivGal.pm b/mason/.perl-lib/TrivGal.pm index d6d3afb..594b383 100644 --- a/mason/.perl-lib/TrivGal.pm +++ b/mason/.perl-lib/TrivGal.pm @@ -240,9 +240,12 @@ package TrivGal::Image { my $path = $me->{path}; my $sz = $SIZE{$scale} or die "unknown scale `$scale'"; - my $thumb = "$CACHE/scale.$sz/$path"; - my $thumburl = - $m->interp->apply_escapes("$CACHEURL/scale.$sz/$path", "u"); + if ($me->sz <= $sz) + { return $m->interp->apply_escapes("$IMGURL/$path", "u"); } + + my $tail = "scale.$sz/$path"; + my $thumb = "$CACHE/$tail"; + my $thumburl = $m->interp->apply_escapes("$CACHEURL/$tail", "u"); my $st = stat $thumb; if (defined $st && $st->mtime > $me->{mtime}) { return $thumburl; } return @@ -265,8 +268,6 @@ package TrivGal::Image { } } - if ($me->sz <= $sz) - { return $m->interp->apply_escapes("$IMGURL/$path", "u"); } my $sc = $sz/$me->sz; my $scaled = $img->create_scaled_image($sc*$wd, $sc*$ht);