]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/img.pm
Remove space from perl shebang path.
[git.ikiwiki.info.git] / IkiWiki / Plugin / img.pm
index b92e24cc06fb93d8d88adcf1517903e46e49dc25..17a58ca7a476b9b01e953d5ce10ce6c3200f8e7b 100644 (file)
@@ -65,82 +65,89 @@ sub preprocess (@) {
        my $dir = $params{page};
        my $base = IkiWiki::basename($file);
        my $issvg = $base=~s/\.svg$/.png/i;
+       my $ispdf = $base=~s/\.pdf$/.png/i;
+       my $pagenumber = exists($params{pagenumber}) ? int($params{pagenumber}) : 0;
+       if ($pagenumber != 0) {
+               $base = "p$pagenumber-$base";
+       }
 
        eval q{use Image::Magick};
        error gettext("Image::Magick is not installed") if $@;
-       my $im = Image::Magick->new($issvg ? (magick => "png") : ());
+       my $im = Image::Magick->new();
        my $imglink;
-       my $r = $im->Read($srcfile);
+       my $imgdatalink;
+       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} ne 'full') {
+       if ($params{size} eq 'full') {
+               $dwidth = $im->Get("width");
+               $dheight = $im->Get("height");
+       } else {
                my ($w, $h) = ($params{size} =~ /^(\d*)x(\d*)$/);
                error sprintf(gettext('wrong size format "%s" (should be WxH)'), $params{size})
                        unless (defined $w && defined $h &&
                                (length $w || length $h));
-               
-               if ((length $w && $w > $im->Get("width")) ||
-                   (length $h && $h > $im->Get("height"))) {
-                       # resizing larger
-                       $imglink = $file;
-
-                       # don't generate larger image, just set display size
-                       if (length $w && length $h) {
-                               ($dwidth, $dheight)=($w, $h);
-                       }
-                       # avoid division by zero on 0x0 image
-                       elsif ($im->Get("width") == 0 || $im->Get("height") == 0) {
-                               ($dwidth, $dheight)=(0, 0);
-                       }
-                       # calculate unspecified size from the other one, preserving
-                       # aspect ratio
-                       elsif (length $w) {
-                               $dwidth=$w;
-                               $dheight=$w / $im->Get("width") * $im->Get("height");
-                       }
-                       elsif (length $h) {
-                               $dheight=$h;
-                               $dwidth=$h / $im->Get("height") * $im->Get("width");
-                       }
+
+               if ($im->Get("width") == 0 || $im->Get("height") == 0) {
+                       ($dwidth, $dheight)=(0, 0);
+               } elsif (! length $w || (length $h && $im->Get("height")*$w > $h * $im->Get("width"))) {
+                       # using height because only height is given or ...
+                       # because original image is more portrait than $w/$h
+                       # ... slimness of $im > $h/w
+                       # ... $im->Get("height")/$im->Get("width") > $h/$w
+                       # ... $im->Get("height")*$w > $h * $im->Get("width")
+
+                       $dheight=$h;
+                       $dwidth=$h / $im->Get("height") * $im->Get("width");
+               } else { # (! length $h) or $w is what determines the resized size
+                       $dwidth=$w;
+                       $dheight=$w / $im->Get("width") * $im->Get("height");
+               }
+       }
+
+       if ($dwidth < $im->Get("width") || $ispdf) {
+               # resize down, or resize to pixels at all
+
+               my $outfile = "$config{destdir}/$dir/$params{size}-$base";
+               $imglink = "$dir/$params{size}-$base";
+
+               will_render($params{page}, $imglink);
+
+               if (-e $outfile && (-M $srcfile >= -M $outfile)) {
+                       $im = Image::Magick->new;
+                       $r = $im->Read($outfile);
+                       error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
                }
                else {
-                       # resizing smaller
-                       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 >= -M $outfile)) {
-                               $im = Image::Magick->new;
-                               $r = $im->Read($outfile);
-                               error sprintf(gettext("failed to read %s: %s"), $outfile, $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}) {
+                               writefile($imglink, $config{destdir}, $blob[0], 1);
                        }
                        else {
-                               $r = $im->Resize(geometry => "${w}x${h}");
-                               error sprintf(gettext("failed to resize: %s"), $r) if $r;
-
-                               # don't actually write resized file in preview mode;
-                               # rely on width and height settings
-                               if (! $params{preview}) {
-                                       my @blob = $im->ImageToBlob();
-                                       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]);
                        }
-
-                       # always get the true size of the resized image
-                       $dwidth  = $im->Get("width"); 
-                       $dheight = $im->Get("height");
                }
-       }
-       else {
-               $imglink = $file;
-               $dwidth = $im->Get("width");
+
+               # always get the true size of the resized image (it could be
+               # that imagemagick did its calculations differently)
+               $dwidth  = $im->Get("width");
                $dheight = $im->Get("height");
+       } else {
+               $imglink = $file;
        }
        
        if (! defined($dwidth) || ! defined($dheight)) {
@@ -148,14 +155,9 @@ sub preprocess (@) {
        }
 
        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";