release candidate

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 1ab753352e2e28b65430dfd0cf574efc94dcf809..17a58ca7a476b9b01e953d5ce10ce6c3200f8e7b 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -75,9 +75,14 @@ sub preprocess (@) {
        error gettext("Image::Magick is not installed") if $@;
        my $im = Image::Magick->new();
        my $imglink;
        error gettext("Image::Magick is not installed") if $@;
        my $im = Image::Magick->new();
        my $imglink;

+       my $imgdatalink;

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

-       
+
+       if (! defined $im->Get("width") || ! defined $im->Get("height")) {
+               error sprintf(gettext("failed to get dimensions of %s"), $file);
+       }
+

        my ($dwidth, $dheight);
 
        if ($params{size} eq 'full') {
        my ($dwidth, $dheight);
 
        if ($params{size} eq 'full') {


@@ -123,15 +128,17 @@ sub preprocess (@) {
                        $r = $im->Resize(geometry => "${dwidth}x${dheight}");
                        error sprintf(gettext("failed to resize: %s"), $r) if $r;
 
                        $r = $im->Resize(geometry => "${dwidth}x${dheight}");
                        error sprintf(gettext("failed to resize: %s"), $r) if $r;
 

+                       $im->set(($issvg || $ispdf) ? (magick => 'png') : ());
+                       my @blob = $im->ImageToBlob();

                        # don't actually write resized file in preview mode;
                        # rely on width and height settings
                        if (! $params{preview}) {
                        # don't actually write resized file in preview mode;
                        # rely on width and height settings
                        if (! $params{preview}) {

-                               $im->set(($issvg || $ispdf) ? (magick => 'png') : ());
-                               my @blob = $im->ImageToBlob();

                                writefile($imglink, $config{destdir}, $blob[0], 1);
                        }
                        else {
                                writefile($imglink, $config{destdir}, $blob[0], 1);
                        }
                        else {

-                               $imglink = $file;
+                               eval q{use MIME::Base64};
+                               error($@) if $@;
+                               $imgdatalink = "data:image/".$im->Get("magick").";base64,".encode_base64($blob[0]);

                        }
                }
 
                        }
                }
 


@@ -148,14 +155,9 @@ sub preprocess (@) {
        }
 
        my ($fileurl, $imgurl);
        }
 
        my ($fileurl, $imgurl);

-       if (! $params{preview}) {
-               $fileurl=urlto($file, $params{destpage});
-               $imgurl=urlto($imglink, $params{destpage});
-       }
-       else {
-               $fileurl=urlto($file);
-               $imgurl=urlto($imglink);
-       }
+       my $urltobase = $params{preview} ? undef : $params{destpage};
+       $fileurl=urlto($file, $urltobase);
+       $imgurl=$imgdatalink ? $imgdatalink : urlto($imglink, $urltobase);

 
        if (! exists $params{class}) {
                $params{class}="img";
 
        if (! exists $params{class}) {
                $params{class}="img";