require Sesse::pr0n::Config_local;
};
- $VERSION = "v2.60";
+ $VERSION = "v2.65";
@ISA = qw(Exporter);
@EXPORT = qw(&error &dberror);
%EXPORT_TAGS = qw();
my ($r, $id, $width, $height, $infobox) = @_;
my $dir = POSIX::floor($id / 256);
- if ($infobox) {
+ if ($infobox eq 'both') {
return get_base($r) . "cache/$dir/$id-$width-$height.jpg";
- } else {
+ } elsif ($infobox eq 'nobox') {
return get_base($r) . "cache/$dir/$id-$width-$height-nobox.jpg";
+ } else {
+ return get_base($r) . "cache/$dir/$id-$width-$height-box.png";
}
}
# 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;
}
push @mmlist, [ $mmwidth, $mmheight ];
}
-
+
# Ensure that all of them are OK
my $last_good_mmlocation;
for my $i (0..$#mmlist) {
$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, $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");
}
}
my ($r, $filename, $id, $dbwidth, $dbheight, $infobox, $xres, $yres, @otherres) = @_;
my $fname = get_disk_location($r, $id);
- unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbheight || $yres < $dbwidth || $xres == -1)) {
- return ($fname, 0);
+ if ($infobox ne 'box') {
+ unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbheight || $yres < $dbwidth || $xres == -1)) {
+ return ($fname, undef);
+ }
}
my $cachename = get_cache_location($r, $id, $xres, $yres, $infobox);
$r->log->warn("In overload mode, not scaling $id to $xres x $yres");
error($r, 'System is in overload mode, not doing any scaling');
}
+
+ # If we're being asked for just the box, make a new image with just the box.
+ # We don't care about @otherres since each of these images are
+ # already pretty cheap to generate, but we need the exact width so we can make
+ # one in the right size.
+ if ($infobox eq 'box') {
+ my ($img, $width, $height);
+
+ # 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, $filename, $id, $dbwidth, $dbheight);
+ $width = $img->Get('columns');
+ $height = $img->Get('rows');
+ @$img = ();
+ } else {
+ $img = Image::Magick->new;
+ $width = $dbwidth;
+ $height = $dbheight;
+ }
+
+ if (defined($xres) && defined($yres)) {
+ ($width, $height) = scale_aspect($width, $height, $xres, $yres);
+ }
+ $height = 24;
+ $img->Set(size=>($width . "x" . $height));
+ $img->Read('xc:white');
+
+ 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 = ();
+ $img->Set(size=>"1x1");
+ $img->Read('null:');
+
+ $width = 1;
+ $height = 1;
+ }
+
+ $err = $img->write(filename => $cachename, quality => 90, depth => 8);
+ $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);
$cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter);
}
- if (($nwidth >= 800 || $nheight >= 600 || $xres == -1) && $infobox == 1) {
+ if (($nwidth >= 800 || $nheight >= 600 || $xres == -1) && $infobox ne 'nobox') {
my $info = Image::ExifTool::ImageInfo($fname);
make_infobox($cimg, $info, $r);
}
}
}
}
- return ($cachename, 1);
+ return ($cachename, 'image/jpeg');
}
sub get_mimetype_from_filename {
$info->{'ExposureProgram'} =~ /aperture\b.*\bpriority/i);
my @classic_fields = ();
- if (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)(?:\.\d+)?(?:mm)?$/) {
+ if (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)(?:\.\d+)?\s*(?:mm)?$/) {
push @classic_fields, [ $1 . "mm", 0 ];
} elsif (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)\/(\d+)$/) {
push @classic_fields, [ (sprintf "%.1fmm", ($1/$2)), 0 ];
}
}
- return if (scalar @parts == 0);
+ return 0 if (scalar @parts == 0);
# Find the required width
my $th = 0;
$th = $h if ($h > $th);
}
- return if ($tw > $img->Get('columns'));
+ return 0 if ($tw > $img->Get('columns'));
my $x = 0;
my $y = $img->Get('rows') - 24;
$img->Annotate(text=>$part->[0], font=>$font, pointsize=>12, x=>int($x), y=>int($y));
$x += ($img->QueryFontMetrics(text=>$part->[0], font=>$font, pointsize=>12))[4];
}
+
+ return 1;
}
sub gcd {
projects / pr0n / blobdiff