X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/73e05bea1b521129d76e5a7e641bf25c5f2d3341..HEAD:/tools/mkimgthumb

diff --git a/tools/mkimgthumb b/tools/mkimgthumb
index c672d3f..e9d6eb2 100755
--- a/tools/mkimgthumb
+++ b/tools/mkimgthumb
@@ -27,9 +27,13 @@ for (keys %opt) {
 	push @ffs, my $ff = [$_];
 	my $r = $opt{$_};
 	push @{$ff}, -quality => $1 if $r =~ s/@(\d+)//;
-	push @{$ff}, -resize => "$r^", -extent => $r;
+	push @{$ff}, -resize => !/\dx\d+$/ ? $_ : ("$_^", -extent => $_)
+		for split / /, $r;
 }
 
+my $target = '..';
+$target = pop @ARGV if @ARGV >= 2 and -d $ARGV[-1];
+
 my $failcount = 0;
 
 for my $src (@ARGV) {
@@ -56,7 +60,7 @@ for my $src (@ARGV) {
 		for (@ffs) {
 			my ($ff, @ffcmds) = @{$_};
 			print " $ff";
-			$image->convert("../$name.$ff", [@cmds, @ffcmds]);
+			$image->convert("$target/$name.$ff", [@cmds, @ffcmds]);
 		}
 		1;
 	} or do {