Merge remote-tracking branch 'tails/img-determinism'

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 494fe2335fc6de1d3723c97efc2d73ecc17b0a20..79cfba20fb48564849b41717907c7f860904fe02 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -39,7 +39,7 @@ sub allowed {
        $allowed = ['jpeg', 'png', 'gif', 'svg'] unless defined $allowed && @$allowed;
 
        foreach my $a (@$allowed) {
-               return 1 if $a eq $format || $a eq 'everything';
+               return 1 if lc($a) eq $format || lc($a) eq 'everything';
        }
 
        return 0;
@@ -89,7 +89,7 @@ sub preprocess (@) {
        my $extension;
        my $format;
 
-       if ($base =~ m/\.([a-z0-9]+)$/) {
+       if ($base =~ m/\.([a-z0-9]+)$/is) {
                $extension = $1;
        }
        else {
@@ -174,6 +174,12 @@ sub preprocess (@) {
                my $r = $im->Read("$format:$srcfile\[$pagenumber]");
                error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
 
+               if ($config{deterministic}) {
+                       $im->Set('date:create' => 0);
+                       $im->Set('date:modify' => 0);
+                       $im->Set('option'      => 'png:exclude-chunk=time');
+               }
+
                if (! defined $im->Get("width") || ! defined $im->Get("height")) {
                        error sprintf(gettext("failed to get dimensions of %s"), $file);
                }