# If we don't know the size, we'll need to read it in anyway
if (!defined($dbwidth) || !defined($dbheight)) {
# If we don't know the size, we'll need to read it in anyway
if (!defined($dbwidth) || !defined($dbheight)) {
- $img = read_original_image($r, $id, $dbwidth, $dbheight);
+ $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight);
my $large_enough = 1;
for my $i (0..($#res/2)) {
my ($xres, $yres) = ($res[$i*2], $res[$i*2+1]);
my $large_enough = 1;
for my $i (0..($#res/2)) {
my ($xres, $yres) = ($res[$i*2], $res[$i*2+1]);
- $img = read_original_image($r, $id, $dbwidth, $dbheight);
+ $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight);
- $img = read_original_image($r, $id, $dbwidth, $dbheight);
+ $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight);
- my ($r, $id, $dbwidth, $dbheight) = @_;
+ my ($r, $filename, $id, $dbwidth, $dbheight) = @_;
# ImageMagick can handle NEF files, but it does it by calling dcraw as a delegate.
# The delegate support is rather broken and causes very odd stuff to happen when
# more than one thread does this at the same time. Thus, we simply do it ourselves.
# ImageMagick can handle NEF files, but it does it by calling dcraw as a delegate.
# The delegate support is rather broken and causes very odd stuff to happen when
# more than one thread does this at the same time. Thus, we simply do it ourselves.
- open DCRAW, "-|", "dcraw", "-w", "-c", $fname
+ open DCRAW, "-|", "dcraw", "-w", "-c", $physical_fname
# This is slow, but should fortunately almost never happen, so don't bother
# special-casing it.
if (!defined($dbwidth) || !defined($dbheight)) {
# This is slow, but should fortunately almost never happen, so don't bother
# special-casing it.
if (!defined($dbwidth) || !defined($dbheight)) {
- $img = read_original_image($r, $id, $dbwidth, $dbheight);
+ $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight);
my $info = Image::ExifTool::ImageInfo($fname);
if (make_infobox($img, $info, $r)) {
$img->Quantize(colors=>16, dither=>'False');
my $info = Image::ExifTool::ImageInfo($fname);
if (make_infobox($img, $info, $r)) {
$img->Quantize(colors=>16, dither=>'False');
$r->log->info("New infobox cache: $width x $height for $id.jpg");
return ($cachename, 'image/png');
}
$r->log->info("New infobox cache: $width x $height for $id.jpg");
return ($cachename, 'image/png');
}
- my $img = make_mipmap($r, $fname, $id, $dbwidth, $dbheight, $xres, $yres, @otherres);
+ my $img = make_mipmap($r, $filename, $id, $dbwidth, $dbheight, $xres, $yres, @otherres);
while (defined($xres) && defined($yres)) {
my ($nxres, $nyres) = (shift @otherres, shift @otherres);
while (defined($xres) && defined($yres)) {
my ($nxres, $nyres) = (shift @otherres, shift @otherres);