Merge remote-tracking branch 'remotes/pelle/patch/img_size'

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index bd527c8c82c79eb5a8ef1a2ae6aa694f0279121d..a28d6a6d519125f0d459ce6b6107dbee06683939 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -64,10 +64,11 @@ sub preprocess (@) {
 
        my $dir = $params{page};
        my $base = IkiWiki::basename($file);
 
        my $dir = $params{page};
        my $base = IkiWiki::basename($file);

+       my $issvg = $base=~s/\.svg$/.png/i;

 
        eval q{use Image::Magick};
        error gettext("Image::Magick is not installed") if $@;
 
        eval q{use Image::Magick};
        error gettext("Image::Magick is not installed") if $@;

-       my $im = Image::Magick->new;
+       my $im = Image::Magick->new($issvg ? (magick => "png") : ());

        my $imglink;
        my $r = $im->Read($srcfile);
        error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
        my $imglink;
        my $r = $im->Read($srcfile);
        error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;


@@ -131,9 +132,9 @@ sub preprocess (@) {
                                        $imglink = $file;
                                }
                        }
                                        $imglink = $file;
                                }
                        }

-                       
-                       $dwidth = $im->Get("width") unless defined $dwidth;
-                       $dheight = $im->Get("height") unless defined $dheight;
+                       # always get the true size of the resized image
+                       $dwidth  = $im->Get("width"); 
+                       $dheight = $im->Get("height");

                }
        }
        else {
                }
        }
        else {


@@ -152,8 +153,8 @@ sub preprocess (@) {
                $imgurl=urlto($imglink, $params{destpage});
        }
        else {
                $imgurl=urlto($imglink, $params{destpage});
        }
        else {

-               $fileurl="$config{url}/$file";
-               $imgurl="$config{url}/$imglink";
+               $fileurl=urlto($file);
+               $imgurl=urlto($imglink);

        }
 
        if (! exists $params{class}) {
        }
 
        if (! exists $params{class}) {