use strict;
use warnings;
-use Sesse::pr0n::Templates;
use Sesse::pr0n::Overload;
+use Sesse::pr0n::QscaleProxy;
+use Sesse::pr0n::Templates;
use Apache2::RequestRec (); # for $r->content_type
use Apache2::RequestIO (); # for $r->print
require Sesse::pr0n::Config_local;
};
- $VERSION = "v2.49";
+ $VERSION = "v2.70";
@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";
}
}
+sub get_mipmap_location {
+ my ($r, $id, $width, $height) = @_;
+ my $dir = POSIX::floor($id / 256);
+
+ return get_base($r) . "cache/$dir/$id-mipmap-$width-$height.jpg";
+}
+
sub update_image_info {
my ($r, $id, $width, $height) = @_;
{
local $dbh->{AutoCommit} = 0;
- $dbh->do('UPDATE images SET width=?, height=?, date=? WHERE id=?',
- undef, $width, $height, $datetime, $id)
- or die "Couldn't update width/height in SQL: $!";
-
# EXIF information
$dbh->do('DELETE FROM exif_info WHERE image=?',
undef, $id)
or die "Couldn't insert EXIF information in database: $!";
}
+ # Model/Lens
+ my $model = $exiftool->GetValue('Model', 'PrintConv');
+ my $lens = $exiftool->GetValue('Lens', 'PrintConv');
+ $lens = $exiftool->GetValue('LensSpec', 'PrintConv') if (!defined($lens));
+
+ $model =~ s/^\s*//;
+ $model =~ s/\s*$//;
+ $model = undef if (length($model) == 0);
+
+ $lens =~ s/^\s*//;
+ $lens =~ s/\s*$//;
+ $lens = undef if (length($lens) == 0);
+
+ # Now update the main table with the information we've got
+ $dbh->do('UPDATE images SET width=?, height=?, date=?, model=?, lens=? WHERE id=?',
+ undef, $width, $height, $datetime, $model, $lens, $id)
+ or die "Couldn't update width/height in SQL: $!";
+
# Tags
my @tags = $exiftool->GetValue('Keywords', 'ValueConv');
$dbh->do('DELETE FROM tags WHERE image=?',
$q = $dbh->prepare('INSERT INTO tags (image,tag) VALUES (?,?)')
or die "Couldn't prepare inserting tag information: $!";
+
for my $tag (@tags) {
$q->execute($id, guess_charset($tag))
or die "Couldn't insert tag information in database: $!";
return ($fname, $size, $mtime);
}
+# Takes in an image ID and a set of resolutions, and returns (generates if needed)
+# the smallest mipmap larger than the largest of them.
+sub make_mipmap {
+ my ($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale, @res) = @_;
+ my ($img, $mmimg, $width, $height);
+
+ my $physical_fname = get_disk_location($r, $id);
+
+ # 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, $filename, $id, $dbwidth, $dbheight, $can_use_qscale);
+ $width = $img->Get('columns');
+ $height = $img->Get('rows');
+ } else {
+ $width = $dbwidth;
+ $height = $dbheight;
+ }
+
+ # Generate the list of mipmaps
+ my @mmlist = ();
+
+ my $mmwidth = $width;
+ my $mmheight = $height;
+
+ while ($mmwidth > 1 || $mmheight > 1) {
+ my $new_mmwidth = POSIX::floor($mmwidth / 2);
+ my $new_mmheight = POSIX::floor($mmheight / 2);
+
+ $new_mmwidth = 1 if ($new_mmwidth < 1);
+ $new_mmheight = 1 if ($new_mmheight < 1);
+
+ my $large_enough = 1;
+ for my $i (0..($#res/2)) {
+ my ($xres, $yres) = ($res[$i*2], $res[$i*2+1]);
+ if ($xres == -1 || $xres > $new_mmwidth || $yres > $new_mmheight) {
+ $large_enough = 0;
+ last;
+ }
+ }
+
+ last if (!$large_enough);
+
+ $mmwidth = $new_mmwidth;
+ $mmheight = $new_mmheight;
+
+ push @mmlist, [ $mmwidth, $mmheight ];
+ }
+
+ # Ensure that all of them are OK
+ my $last_good_mmlocation;
+ for my $i (0..$#mmlist) {
+ my $last = ($i == $#mmlist);
+ my $mmres = $mmlist[$i];
+
+ my $mmlocation = get_mipmap_location($r, $id, $mmres->[0], $mmres->[1]);
+ if (! -r $mmlocation or (-M $mmlocation > -M $physical_fname)) {
+ if (!defined($img)) {
+ if (defined($last_good_mmlocation)) {
+ if ($can_use_qscale) {
+ $img = Sesse::pr0n::QscaleProxy->new;
+ } else {
+ $img = Image::Magick->new;
+ }
+ $img->Read($last_good_mmlocation);
+ } else {
+ $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale);
+ }
+ }
+ my $cimg;
+ if ($last) {
+ $cimg = $img;
+ } else {
+ $cimg = $img->Clone();
+ }
+ $r->log->info("Making mipmap for $id: " . $mmres->[0] . " x " . $mmres->[1]);
+ $cimg->Resize(width=>$mmres->[0], height=>$mmres->[1], filter=>'Lanczos', 'sampling-factor'=>'1x1');
+ $cimg->Strip();
+ my $err = $cimg->write(
+ filename => $mmlocation,
+ quality => 95,
+ 'sampling-factor' => '1x1'
+ );
+ $img = $cimg;
+ } else {
+ $last_good_mmlocation = $mmlocation;
+ }
+ if ($last && !defined($img)) {
+ # OK, read in the smallest one
+ if ($can_use_qscale) {
+ $img = Sesse::pr0n::QscaleProxy->new;
+ } else {
+ $img = Image::Magick->new;
+ }
+ my $err = $img->Read($mmlocation);
+ }
+ }
+
+ if (!defined($img)) {
+ $img = read_original_image($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale);
+ }
+ return $img;
+}
+
+sub read_original_image {
+ my ($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale) = @_;
+
+ my $physical_fname = get_disk_location($r, $id);
+
+ # Read in the original image
+ my $magick;
+ if ($can_use_qscale && ($filename =~ /\.jpeg$/i || $filename =~ /\.jpg$/i)) {
+ $magick = Sesse::pr0n::QscaleProxy->new;
+ } else {
+ $magick = Image::Magick->new;
+ }
+ my $err;
+
+ # 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 ($filename =~ /\.(nef|cr2)$/i) {
+ # this would suffice if ImageMagick gets to fix their handling
+ # $physical_fname = "NEF:$physical_fname";
+
+ open DCRAW, "-|", "dcraw", "-w", "-c", $physical_fname
+ or error("dcraw: $!");
+ $err = $magick->Read(file => \*DCRAW);
+ close(DCRAW);
+ } else {
+ # We always want YCbCr JPEGs. Setting this explicitly here instead of using
+ # RGB is slightly faster (no colorspace conversion needed) and works equally
+ # well for our uses, as long as we don't need to draw an information box,
+ # which trickles several ImageMagick bugs related to colorspace handling.
+ # (Ideally we'd be able to keep the image subsampled and
+ # planar, but that would probably be difficult for ImageMagick to expose.)
+ #if (!$infobox) {
+ # $magick->Set(colorspace=>'YCbCr');
+ #}
+ $err = $magick->Read($physical_fname);
+ }
+
+ if ($err) {
+ $r->log->warn("$physical_fname: $err");
+ $err =~ /(\d+)/;
+ if ($1 >= 400) {
+ undef $magick;
+ error($r, "$physical_fname: $err");
+ }
+ }
+
+ # If we use ->[0] unconditionally, text rendering (!) seems to crash
+ my $img;
+ if (ref($magick)) {
+ $img = $magick;
+ } else {
+ $img = (scalar @$magick > 1) ? $magick->[0] : $magick;
+ }
+
+ my $width = $img->Get('columns');
+ my $height = $img->Get('rows');
+
+ # Update the SQL database if it doesn't contain the required info
+ if (!defined($dbwidth) || !defined($dbheight)) {
+ $r->log->info("Updating width/height for $id: $width x $height");
+ update_image_info($r, $id, $width, $height);
+ }
+
+ return $img;
+}
+
sub ensure_cached {
my ($r, $filename, $id, $dbwidth, $dbheight, $infobox, $xres, $yres, @otherres) = @_;
my $fname = get_disk_location($r, $id);
- unless (defined($xres) && ($xres < $dbheight || $yres < $dbwidth || !defined($dbwidth) || !defined($dbheight) || $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);
+ my $err;
if (! -r $cachename or (-M $cachename > -M $fname)) {
# If we are in overload mode (aka Slashdot mode), refuse to generate
# new thumbnails.
$r->log->warn("In overload mode, not scaling $id to $xres x $yres");
error($r, 'System is in overload mode, not doing any scaling');
}
-
- # Need to generate the cache; read in the image
- my $magick = new Image::Magick;
- my $info = Image::ExifTool::ImageInfo($fname);
- my $err;
-
- # 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 ($filename =~ /\.nef$/) {
- # this would suffice if ImageMagick gets to fix their handling
- # $fname = "NEF:$fname";
+
+ # 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, 0);
+ $width = $img->Get('columns');
+ $height = $img->Get('rows');
+ @$img = ();
+ } else {
+ $img = Image::Magick->new;
+ $width = $dbwidth;
+ $height = $dbheight;
+ }
- open DCRAW, "-|", "dcraw", "-w", "-c", $fname
- or error("dcraw: $!");
- $err = $magick->Read(file => \*DCRAW);
- close(DCRAW);
- } else {
- $err = $magick->Read($fname);
- }
-
- if ($err) {
- $r->log->warn("$fname: $err");
- $err =~ /(\d+)/;
- if ($1 >= 400) {
- undef $magick;
- error($r, "$fname: $err");
+ if (defined($xres) && defined($yres)) {
+ ($width, $height) = scale_aspect($width, $height, $xres, $yres);
}
- }
-
- # If we use ->[0] unconditionally, text rendering (!) seems to crash
- my $img = (scalar @$magick > 1) ? $magick->[0] : $magick;
-
- my $width = $img->Get('columns');
- my $height = $img->Get('rows');
+ $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:');
- # Update the SQL database if it doesn't contain the required info
- if (!defined($dbwidth) || !defined($dbheight)) {
- $r->log->info("Updating width/height for $id: $width x $height");
- update_image_info($r, $id, $width, $height);
- }
+ $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");
- # We always want RGB JPEGs
- if ($img->Get('Colorspace') eq "CMYK") {
- $img->Set(colorspace=>'RGB');
+ return ($cachename, 'image/png');
}
+ my $can_use_qscale = 0;
+ if ($infobox eq 'nobox') {
+ $can_use_qscale = 1;
+ }
+
+ my $img = make_mipmap($r, $filename, $id, $dbwidth, $dbheight, $can_use_qscale, $xres, $yres, @otherres);
+
while (defined($xres) && defined($yres)) {
my ($nxres, $nyres) = (shift @otherres, shift @otherres);
my $cachename = get_cache_location($r, $id, $xres, $yres, $infobox);
$cimg = $img;
}
+ my $width = $img->Get('columns');
+ my $height = $img->Get('rows');
my ($nwidth, $nheight) = scale_aspect($width, $height, $xres, $yres);
# Use lanczos (sharper) for heavy scaling, mitchell (faster) otherwise
}
if ($xres != -1) {
- $cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter);
+ $cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter, 'sampling-factor'=>$sf);
}
- 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);
}
$r->log->info("New cache: $nwidth x $nheight for $id.jpg");
}
- undef $magick;
undef $img;
if ($err) {
$r->log->warn("$fname: $err");
$err =~ /(\d+)/;
if ($1 >= 400) {
- @$magick = ();
+ #@$magick = ();
error($r, "$fname: $err");
}
}
}
- return ($cachename, 1);
+ return ($cachename, 'image/jpeg');
}
sub get_mimetype_from_filename {
sub make_infobox {
my ($img, $info, $r) = @_;
-
- my @lines = ();
- my @classic_fields = ();
-
- if (defined($info->{'DateTimeOriginal'}) &&
- $info->{'DateTimeOriginal'} =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/
- && $1 >= 1990) {
- push @lines, "$1-$2-$3 $4:$5";
- }
- if (defined($info->{'Model'})) {
- my $model = $info->{'Model'};
- $model =~ s/^\s+//;
- $model =~ s/\s+$//;
- push @lines, $model;
- }
+ # The infobox is of the form
+ # "Time - date - focal length, shutter time, aperture, sensitivity, exposure bias - flash",
+ # possibly with some parts omitted -- the middle part is known as the "classic
+ # fields"; note the comma separation. Every field has an associated "bold flag"
+ # in the second part.
- # classic fields
- if (defined($info->{'FocalLength'}) && $info->{'FocalLength'} =~ /^(\d+)(?:\.\d+)?(?:mm)?$/) {
- push @classic_fields, ($1 . "mm");
+ my $shutter_priority = (defined($info->{'ExposureProgram'}) &&
+ $info->{'ExposureProgram'} =~ /shutter\b.*\bpriority/i);
+ my $aperture_priority = (defined($info->{'ExposureProgram'}) &&
+ $info->{'ExposureProgram'} =~ /aperture\b.*\bpriority/i);
+
+ my @classic_fields = ();
+ 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));
+ push @classic_fields, [ (sprintf "%.1fmm", ($1/$2)), 0 ];
}
+
if (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+)\/(\d+)$/) {
my ($a, $b) = ($1, $2);
my $gcd = gcd($a, $b);
- push @classic_fields, ($a/$gcd . "/" . $b/$gcd . "s");
- } elsif (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+)$/) {
- push @classic_fields, ($1 . "s");
+ push @classic_fields, [ $a/$gcd . "/" . $b/$gcd . "s", $shutter_priority ];
+ } elsif (defined($info->{'ExposureTime'}) && $info->{'ExposureTime'} =~ /^(\d+(?:\.\d+))$/) {
+ push @classic_fields, [ $1 . "s", $shutter_priority ];
}
+
if (defined($info->{'FNumber'}) && $info->{'FNumber'} =~ /^(\d+)\/(\d+)$/) {
my $f = $1/$2;
if ($f >= 10) {
- push @classic_fields, (sprintf "f/%.0f", $f);
+ push @classic_fields, [ (sprintf "f/%.0f", $f), $aperture_priority ];
} else {
- push @classic_fields, (sprintf "f/%.1f", $f);
+ push @classic_fields, [ (sprintf "f/%.1f", $f), $aperture_priority ];
}
} elsif (defined($info->{'FNumber'}) && $info->{'FNumber'} =~ /^(\d+)\.(\d+)$/) {
my $f = $info->{'FNumber'};
if ($f >= 10) {
- push @classic_fields, (sprintf "f/%.0f", $f);
+ push @classic_fields, [ (sprintf "f/%.0f", $f), $aperture_priority ];
} else {
- push @classic_fields, (sprintf "f/%.1f", $f);
+ push @classic_fields, [ (sprintf "f/%.1f", $f), $aperture_priority ];
}
}
# Apache2::ServerUtil->server->log_error(join(':', keys %$info));
+ my $iso = undef;
if (defined($info->{'NikonD1-ISOSetting'})) {
- push @classic_fields, $info->{'NikonD1-ISOSetting'}->[1] . " ISO";
+ $iso = $info->{'NikonD1-ISOSetting'};
+ } elsif (defined($info->{'ISO'})) {
+ $iso = $info->{'ISO'};
} elsif (defined($info->{'ISOSetting'})) {
- push @classic_fields, $info->{'ISOSetting'} . " ISO";
+ $iso = $info->{'ISOSetting'};
+ }
+ if (defined($iso) && $iso =~ /(\d+)/) {
+ push @classic_fields, [ $1 . " ISO", 0 ];
}
if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} ne "0") {
- push @classic_fields, $info->{'ExposureBiasValue'} . " EV";
+ push @classic_fields, [ $info->{'ExposureBiasValue'} . " EV", 0 ];
} elsif (defined($info->{'ExposureCompensation'}) && $info->{'ExposureCompensation'} != 0) {
- push @classic_fields, $info->{'ExposureCompensation'} . " EV";
+ push @classic_fields, [ $info->{'ExposureCompensation'} . " EV", 0 ];
}
+
+ # Now piece together the rest
+ my @parts = ();
+ if (defined($info->{'DateTimeOriginal'}) &&
+ $info->{'DateTimeOriginal'} =~ /^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/
+ && $1 >= 1990) {
+ push @parts, [ "$1-$2-$3 $4:$5", 0 ];
+ }
+
+ if (defined($info->{'Model'})) {
+ my $model = $info->{'Model'};
+ $model =~ s/^\s+//;
+ $model =~ s/\s+$//;
+
+ push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+ push @parts, [ $model, 0 ];
+ }
+
+ # classic fields
if (scalar @classic_fields > 0) {
- push @lines, join(', ', @classic_fields);
+ push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+
+ my $first_elem = 1;
+ for my $field (@classic_fields) {
+ push @parts, [ ', ', 0 ] if (!$first_elem);
+ $first_elem = 0;
+ push @parts, $field;
+ }
}
if (defined($info->{'Flash'})) {
$info->{'Flash'} =~ /no flash/i ||
$info->{'Flash'} =~ /not fired/i ||
$info->{'Flash'} =~ /Off/) {
- push @lines, "No flash";
+ push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+ push @parts, [ "No flash", 0 ];
} elsif ($info->{'Flash'} =~ /fired/i ||
$info->{'Flash'} =~ /On/) {
- push @lines, "Flash";
+ push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+ push @parts, [ "Flash", 0 ];
} else {
- push @lines, $info->{'Flash'};
+ push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+ push @parts, [ $info->{'Flash'}, 0 ];
}
}
- return if (scalar @lines == 0);
-
- # OK, this sucks. Let's make something better :-)
- @lines = ( join(" - ", @lines) );
+ return 0 if (scalar @parts == 0);
# Find the required width
- my $th = 14 * (scalar @lines) + 6;
- my $tw = 1;
+ my $th = 0;
+ my $tw = 0;
- for my $line (@lines) {
- my $this_w = ($img->QueryFontMetrics(text=>$line, font=>'/usr/share/fonts/truetype/msttcorefonts/Arial.ttf', pointsize=>12))[4];
- $tw = $this_w if ($this_w >= $tw);
- }
+ for my $part (@parts) {
+ my $font;
+ if ($part->[1]) {
+ $font = '/usr/share/fonts/truetype/msttcorefonts/Arial_Bold.ttf';
+ } else {
+ $font = '/usr/share/fonts/truetype/msttcorefonts/Arial.ttf';
+ }
- $tw += 6;
+ my (undef, undef, $h, undef, $w) = ($img->QueryFontMetrics(text=>$part->[0], font=>$font, pointsize=>12));
- # Round up so we hit exact DCT blocks
- $tw += 8 - ($tw % 8) unless ($tw % 8 == 0);
- $th += 8 - ($th % 8) unless ($th % 8 == 0);
-
- return if ($tw > $img->Get('columns'));
+ $tw += $w;
+ $th = $h if ($h > $th);
+ }
+
+ return 0 if ($tw > $img->Get('columns'));
-# my $x = $img->Get('columns') - 8 - $tw;
-# my $y = $img->Get('rows') - 8 - $th;
my $x = 0;
- my $y = $img->Get('rows') - $th;
- $tw = $img->Get('columns');
+ my $y = $img->Get('rows') - 24;
- $x -= $x % 8;
- $y -= $y % 8;
+ # Hit exact DCT blocks
+ $y -= ($y % 8);
- my $points = sprintf "%u,%u %u,%u", $x, $y, ($x+$tw-1), ($img->Get('rows') - 1);
- my $lpoints = sprintf "%u,%u %u,%u", $x, $y, ($x+$tw-1), $y;
-# $img->Draw(primitive=>'rectangle', stroke=>'black', fill=>'white', points=>$points);
+ my $points = sprintf "%u,%u %u,%u", $x, $y, ($img->Get('columns') - 1), ($img->Get('rows') - 1);
+ my $lpoints = sprintf "%u,%u %u,%u", $x, $y, ($img->Get('columns') - 1), $y;
$img->Draw(primitive=>'rectangle', stroke=>'white', fill=>'white', points=>$points);
$img->Draw(primitive=>'line', stroke=>'black', points=>$lpoints);
- my $i = -(scalar @lines - 1)/2.0;
- my $xc = $x + $tw / 2 - $img->Get('columns')/2;
- my $yc = ($y + $img->Get('rows'))/2 - $img->Get('rows')/2;
- #my $yc = ($y + $img->Get('rows'))/4;
- my $yi = $th / (scalar @lines);
-
- $lpoints = sprintf "%u,%u %u,%u", $x, $yc + $img->Get('rows')/2, ($x+$tw-1), $yc+$img->Get('rows')/2;
+ # Start writing out the text
+ $x = ($img->Get('columns') - $tw) / 2;
- for my $line (@lines) {
- $img->Annotate(text=>$line, font=>'/usr/share/fonts/truetype/msttcorefonts/Arial.ttf', pointsize=>12, gravity=>'Center',
- # $img->Annotate(text=>$line, font=>'Helvetica', pointsize=>12, gravity=>'Center',
- x=>int($xc), y=>int($yc + $i * $yi));
+ my $room = ($img->Get('rows') - 1 - $y - $th);
+ $y = ($img->Get('rows') - 1) - $room/2;
- $i = $i + 1;
+ for my $part (@parts) {
+ my $font;
+ if ($part->[1]) {
+ $font = '/usr/share/fonts/truetype/msttcorefonts/Arial_Bold.ttf';
+ } else {
+ $font = '/usr/share/fonts/truetype/msttcorefonts/Arial.ttf';
+ }
+ $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