require Sesse::pr0n::Config_local;
};
- $VERSION = "v2.60";
+ $VERSION = "v2.65";
@ISA = qw(Exporter);
@EXPORT = qw(&error &dberror);
%EXPORT_TAGS = qw();
# 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);
$width = $img->Get('columns');
$height = $img->Get('rows');
} else {
my $large_enough = 1;
for my $i (0..($#res/2)) {
my ($xres, $yres) = ($res[$i*2], $res[$i*2+1]);
- if ($xres > $new_mmwidth || $yres > $new_mmheight) {
+ if ($xres == -1 || $xres > $new_mmwidth || $yres > $new_mmheight) {
$large_enough = 0;
last;
}
$img = Image::Magick->new;
$img->Read($last_good_mmlocation);
} else {
- $img = read_original_image($r, $id, $dbwidth, $dbheight);
+ $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight);
}
}
my $cimg;
}
if (!defined($img)) {
- $img = read_original_image($r, $id, $dbwidth, $dbheight);
+ $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight);
}
return $img;
}
sub read_original_image {
- my ($r, $id, $dbwidth, $dbheight) = @_;
+ my ($r, $filename, $id, $dbwidth, $dbheight) = @_;
- my $fname = get_disk_location($r, $id);
+ my $physical_fname = get_disk_location($r, $id);
# Read in the original image
my $magick = new Image::Magick;
# 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.
- if ($fname =~ /\.nef$/i) {
+ if ($filename =~ /\.nef$/i) {
# this would suffice if ImageMagick gets to fix their handling
- # $fname = "NEF:$fname";
+ # $physical_fname = "NEF:$physical_fname";
- open DCRAW, "-|", "dcraw", "-w", "-c", $fname
+ open DCRAW, "-|", "dcraw", "-w", "-c", $physical_fname
or error("dcraw: $!");
$err = $magick->Read(file => \*DCRAW);
close(DCRAW);
#if (!$infobox) {
# $magick->Set(colorspace=>'YCbCr');
#}
- $err = $magick->Read($fname);
+ $err = $magick->Read($physical_fname);
}
if ($err) {
- $r->log->warn("$fname: $err");
+ $r->log->warn("$physical_fname: $err");
$err =~ /(\d+)/;
if ($1 >= 400) {
undef $magick;
- error($r, "$fname: $err");
+ error($r, "$physical_fname: $err");
}
}
# 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);
$width = $img->Get('columns');
$height = $img->Get('rows');
@$img = ();
my $info = Image::ExifTool::ImageInfo($fname);
if (make_infobox($img, $info, $r)) {
$img->Quantize(colors=>16, dither=>'False');
+
+ # Since the image is grayscale, ImageMagick overrides us and writes this
+ # as grayscale anyway, but at least we get rid of the alpha channel this
+ # way.
+ $img->Set(type=>'Palette');
} else {
# Not enough room for the text, make a tiny dummy transparent infobox
@$img = ();
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);