img: Explicitly detect format if needed

[git.ikiwiki.info.git] / t / img.t

diff --git a/t/img.t b/t/img.t
index 6049042c2311b8055e10c87c104ac7d797bad40f..e42d85353c8f33aabc7da4a96f5f2104ed19c598 100755 (executable)
--- a/t/img.t
+++ b/t/img.t
@@ -105,8 +105,21 @@ ok(! system(@command, '--set-yaml', 'img_allowed_formats=[JPEG, PNG, svg, pdf]')
 
 sub size($) {
        my $filename = shift;
+       my $decoder;
+       if ($filename =~ m/\.png$/i) {
+               $decoder = 'png';
+       }
+       elsif ($filename =~ m/\.jpe?g$/i) {
+               $decoder = 'jpeg';
+       }
+       elsif ($filename =~ m/\.bmp$/i) {
+               $decoder = 'bmp';
+       }
+       else {
+               die "Unexpected extension in '$filename'";
+       }
        my $im = Image::Magick->new();
-       my $r = $im->Read(":$filename");
+       my $r = $im->Read("$decoder:$filename");
        return "no image: $r" if $r;
        my $w = $im->Get("width");
        my $h = $im->Get("height");