use Errno;
use Exporter qw{import};
use File::stat;
+use Graphics::Magick;
use Image::ExifTool qw{};
-use Image::Imlib2;
use Image::Size qw{};
use User::pwent;
use POSIX;
export qw{%SIZE};
our %SIZE = (smallthumb => 96,
medthumb => 144,
- bigthumb => 228,
+ bigthumb => 216,
+ tiny => 320,
small => 480,
embed => 720,
- view => 1200);
+ medium => 1080,
+ big => 1600,
+ large => 2400,
+ huge => 3600,
+ vast => 5400,
+ immense => 8100);
export qw{init};
my $initp = 0;
path => $path, imgpath => $imgpath,
mtime => $st->mtime,
img => undef,
+ rot => undef, flip => undef,
+ wd => undef, ht => undef,
_wd => undef, _ht => undef,
sz => undef
}, $cls;
@$me{"_wd", "_ht", "sz"} = ($wd, $ht, $sz);
}
+ sub _getexif ($) {
+ my ($me) = @_;
+ return if defined $me->{wd};
+
+ $me->_getsz;
+ my $exif = new Image::ExifTool; $exif->ExtractInfo($me->{imgpath});
+ my $orient = $exif->GetValue("Orientation", "ValueConv");
+ my ($wd, $ht) = @$me{"_wd", "_ht"};
+ my ($rot, $flip);
+ if (defined $orient) { ($rot, $flip) = $ORIENT{$orient}->@*; }
+ else { ($rot, $flip) = (0, 0); }
+ if ($rot%2) { ($wd, $ht) = ($ht, $wd); }
+ @$me{"rot", "flip", "wd", "ht"} = ($rot, $flip, $wd, $ht);
+ }
+
sub sz ($) { my ($me) = @_; $me->_getsz; return $me->{sz}; }
+ sub wd ($) { my ($me) = @_; $me->_getexif; return $me->{wd}; }
+ sub ht ($) { my ($me) = @_; $me->_getexif; return $me->{ht}; }
+
+ sub _check_gm ($) {
+ my ($rc) = @_;
+ "$rc" and die "failed to hack `$me->{img}': $rc";
+ }
sub scale ($$;$) {
my ($me, $scale, $forcep) = @_;
$m->interp->apply_escapes("$SCRIPTURL/$path", "u") .
"?scale=$scale";
} else {
- my ($dir, undef, $ext) = TrivGal::split_path $thumb;
- my $ty = $TYPE{lc $ext} or die "unknown type `$ext'";
-
my $img = $me->{img};
unless (defined $img) {
- my $exif = new Image::ExifTool;
- $exif->ExtractInfo($me->{imgpath});
- my $orient = $exif->GetValue("Orientation", "ValueConv");
- $img = $me->{img} = Image::Imlib2->load($me->{imgpath});
- if (defined $orient) {
- my ($rot, $flip) = @{$ORIENT{$orient}};
- if ($rot) { $img->image_orientate($rot); }
- if ($flip) { $img->flip_horizontal(); }
- }
+ $img = $me->{img} = Graphics::Magick->new;
+ _check_gm $img->Read($me->{imgpath});
}
- my $sc = $sz/$me->sz;
- my $scaled = $img->create_scaled_image($sc*$wd, $sc*$ht);
-
- $scaled->image_set_format($ty->imlibfmt);
- $scaled->set_quality(90);
- my $new = "$TMP/t$$-$ext";
+ my ($dir, undef, $ext) = TrivGal::split_path $thumb;
+ $img = $img->Clone;
+ my $new = "$TMP/t$$-thumb$ext";
+ _check_gm $img->Resize(geometry => $sz);
make_path $TMP, { mode => 0771 };
- $scaled->save($new);
+ _check_gm $img->Write($new);
make_path $dir, { mode => 0771 };
rename $new, $thumb;
$url = $thumburl;