my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
my %params=@_;
- if (! exists $imgdefaults{$params{page}}) {
- $imgdefaults{$params{page}} = {};
+ if (exists $imgdefaults{$params{page}}) {
+ foreach my $key (keys %{$imgdefaults{$params{page}}}) {
+ if (! exists $params{$key}) {
+ $params{$key}=$imgdefaults{$params{page}}->{$key};
+ }
+ }
+ }
+
+ if (! exists $params{size}) {
+ $params{size}='full';
}
- my $size = $params{size} || $imgdefaults{$params{page}}->{size} || 'full';
- my $alt = $params{alt} || $imgdefaults{$params{page}}->{alt} || '';
- my $title = $params{title} || $imgdefaults{$params{page}}->{title} || '';
- my $caption = $params{caption} || $imgdefaults{$params{page}}->{caption} || '';
if ($image eq 'defaults') {
- $imgdefaults{$params{page}} = {
- size => $size,
- alt => $alt,
- title => $title,
- caption => $caption,
- };
+ $imgdefaults{$params{page}} = \%params;
return '';
}
}
my $file = bestlink($params{page}, $image);
+ my $srcfile = srcfile($file, 1);
+ if (! length $file || ! defined $srcfile) {
+ return htmllink($params{page}, $params{destpage}, $image);
+ }
my $dir = $params{page};
my $base = IkiWiki::basename($file);
eval q{use Image::Magick};
- error($@) if $@;
+ error gettext("Image::Magick is not installed") if $@;
my $im = Image::Magick->new;
my $imglink;
my $r;
- if ($size ne 'full') {
- my ($w, $h) = ($size =~ /^(\d+)x(\d+)$/);
- return "[[img ".sprintf(gettext('bad size "%s"'), $size)."]]"
+ if ($params{size} ne 'full') {
+ my ($w, $h) = ($params{size} =~ /^(\d+)x(\d+)$/);
+ error sprintf(gettext('bad size "%s"'), $params{size})
unless (defined $w && defined $h);
my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
will_render($params{page}, $imglink);
- if (-e $outfile && (-M srcfile($file) >= -M $outfile)) {
+ if (-e $outfile && (-M $srcfile >= -M $outfile)) {
$r = $im->Read($outfile);
- return "[[img ".sprintf(gettext("failed to read %s: %s"), $outfile, $r)."]]" if $r;
+ error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
}
else {
- $r = $im->Read(srcfile($file));
- return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
+ $r = $im->Read($srcfile);
+ error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
$r = $im->Resize(geometry => "${w}x${h}");
- return "[[img ".sprintf(gettext("failed to resize: %s"), $r)."]]" if $r;
+ error sprintf(gettext("failed to resize: %s"), $r) if $r;
# don't actually write file in preview mode
if (! $params{preview}) {
}
}
else {
- $r = $im->Read(srcfile($file));
- return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
+ $r = $im->Read($srcfile);
+ error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
$imglink = $file;
}
}
if (! defined($im->Get("width")) || ! defined($im->Get("height"))) {
- return "[[img ".sprintf(gettext("failed to determine size of image %s"), $file)."]]";
+ error sprintf(gettext("failed to determine size of image %s"), $file)
}
my $imgtag='<img src="'.$imgurl.
- '" alt="'.$alt.'" width="'.$im->Get("width").
+ '" alt="'.(exists $params{alt} ? $params{alt} : '').
+ '" width="'.$im->Get("width").
'" height="'.$im->Get("height").'"'.
- (defined $title ? ' title="'.$title.'"' : '').
+ (exists $params{title} ? ' title="'.$params{title}.'"' : '').
(exists $params{class} ? ' class="'.$params{class}.'"' : '').
(exists $params{id} ? ' id="'.$params{id}.'"' : '').
' />';
noimageinline => 1);
}
- if (defined $caption) {
+ if (exists $params{caption}) {
return '<table class="img">'.
- '<caption>'.$caption.'</caption>'.
+ '<caption>'.$params{caption}.'</caption>'.
'<tr><td>'.$imgtag.'</td></tr>'.
'</table>';
}