web commit by JoshTriplett: asprintf and glibc

[git.ikiwiki.info.git] / IkiWiki / Plugin / img.pm

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 9135c688fae77cd4d028941b095083213bb90035..a453a49ba43321c1261ae12db846c1c3adb88c5e 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -5,12 +5,12 @@ package IkiWiki::Plugin::img;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 my %imgdefaults;
 
 sub import { #{{{
-       hook(type => "preprocess", id => "img", call => \&preprocess);
+       hook(type => "preprocess", id => "img", call => \&preprocess, scan => 1);
 } #}}}
 
 sub preprocess (@) { #{{{
@@ -31,10 +31,10 @@ sub preprocess (@) { #{{{
                return '';
        }
 
-       add_depends($params{page}, $image);
-       my $file = bestlink($params{page}, $image) || return "[[img $image not found]]";
+       push @{$links{$params{page}}}, $image;
+       my $file = bestlink($params{page}, $image);
 
-       my $dir = IkiWiki::dirname($file);
+       my $dir = $params{page};
        my $base = IkiWiki::basename($file);
 
        eval q{use Image::Magick};
@@ -45,25 +45,27 @@ sub preprocess (@) { #{{{
 
        if ($size ne 'full') {
                my ($w, $h) = ($size =~ /^(\d+)x(\d+)$/);
-               return "[[img bad size \"$size\"]]" unless (defined $w && defined $h);
+               return "[[img ".sprintf(gettext('bad size "%s"'), $size)."]]"
+                       unless (defined $w && defined $h);
 
                my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
                $imglink = "$dir/${w}x${h}-$base";
+               
+               will_render($params{page}, $imglink);
 
                if (-e $outfile && (-M srcfile($file) >= -M $outfile)) {
                        $r = $im->Read($outfile);
-                       return "[[img failed to read $outfile: $r]]" if $r;
+                       return "[[img ".sprintf(gettext("failed to read %s: %s"), $outfile, $r)."]]" if $r;
                }
                else {
                        $r = $im->Read(srcfile($file));
-                       return "[[img failed to read $file: $r]]" if $r;
+                       return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
 
                        $r = $im->Resize(geometry => "${w}x${h}");
-                       return "[[img failed to resize: $r]]" if $r;
+                       return "[[img ".sprintf(gettext("failed to resize: %s"), $r)."]]" if $r;
 
                        # don't actually write file in preview mode
                        if (! $params{preview}) {
-                               will_render($params{page}, $imglink);
                                my @blob = $im->ImageToBlob();
                                writefile($imglink, $config{destdir}, $blob[0], 1);
                        }
@@ -74,7 +76,7 @@ sub preprocess (@) { #{{{
        }
        else {
                $r = $im->Read(srcfile($file));
-               return "[[img failed to read $file: $r]]" if $r;
+               return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
                $imglink = $file;
        }
 
@@ -82,17 +84,24 @@ sub preprocess (@) { #{{{
 
        my ($fileurl, $imgurl);
        if (! $params{preview}) {
-               $fileurl=IkiWiki::abs2rel($file, IkiWiki::dirname($params{destpage}));
-               $imgurl=IkiWiki::abs2rel($imglink, IkiWiki::dirname($params{destpage}));
+               $fileurl=urlto($file, $params{destpage});
+               $imgurl=urlto($imglink, $params{destpage});
        }
        else {
                $fileurl="$config{url}/$file";
                $imgurl="$config{url}/$imglink";
        }
 
+       if (! defined($im->Get("width")) || ! defined($im->Get("height"))) {
+               return "[[img ".sprintf(gettext("failed to determine size of image %s"), $file)."]]";
+       }
+
        return '<a href="'.$fileurl.'"><img src="'.$imgurl.
                '" alt="'.$alt.'" width="'.$im->Get("width").
-               '" height="'.$im->Get("height").'" /></a>';
+               '" height="'.$im->Get("height").'"'.
+               (exists $params{class} ? ' class="'.$params{class}.'"' : '').
+               (exists $params{id} ? ' id="'.$params{id}.'"' : '').
+               ' /></a>';
 } #}}}
 
 1