unshipped regression tests for BMP files

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index b720a562f9220a53cb77857fa7d653add5de96a5..65ba01f709b97cefc2c010be9220c07f1ead8f8b 100644 (file)
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -7,6 +7,9 @@
 ^testimg/os2rle8\.bmp$
 ^testimg/base\.tga$
 
+# unshipped test images
+^xtestimg/
+
 # base for some other images
 ^testimg/pbm_base\.pgm$
 

diff --git a/t/x107bmp.t b/t/x107bmp.t
new file mode 100644 (file)
index 0000000..07232d8
--- /dev/null
+++ b/t/x107bmp.t
@@ -0,0 +1,72 @@
+#!perl -w
+# Extra BMP tests not shipped
+use strict;
+use Test::More;
+use Imager::Test qw(is_image);
+use Imager;
+
+# test images from 
+my @tests =
+  (
+   [ "g01bg.bmp", "1-bit blue/green", 0 ],
+   [ "g01bw.bmp", "1-bit black and white", 0 ],
+   [ "g01p1.bmp", "1-bit single colour", 0 ],
+   [ "g01wb.bmp", "1-bit white and black", 0 ],
+   [ "g04.bmp", "4-bit", 0 ],
+   [ "g04p4.bmp", "4-bit gray", 0 ],
+   [ "g04rle.bmp", "4-bit rle", "currently broken" ],
+   [ "g08.bmp", "8-bit", 0 ],
+   [ "g08offs.bmp", "8-bit with image data offset", 0 ],
+   [ "g08os2.bmp", "8-bit OS/2", "OS/2 BMP not implemented" ],
+   [ "g08p256.bmp", "8-bit, no important", 0 ],
+   [ "g08p64.bmp", "8-bit, 64 greyscale entries", 0 ],
+   [ "g08pi256.bmp", "8-bit 256 important", 0 ],
+   [ "g08pi64.bmp", "8-bit 64 important", 0 ],
+   [ "g08res11.bmp", "8-bit, 100x100 dpi", 0 ],
+   [ "g08res21.bmp", "8-bit, 200x100 dpi", 0 ],
+   [ "g08res22.bmp", "8-bit, 200x200 dpi", 0 ],
+   [ "g08rle.bmp", "8-bit rle", 0 ],
+   [ "g08s0.bmp", "8-bit, bits size not given", 0 ],
+   [ "g08w124.bmp", "8-bit 124x61", 0 ],
+   [ "g08w125.bmp", "8-bit 125x62", 0 ],
+   [ "g08w126.bmp", "8-bit 126x63", 0 ],
+   [ "g16bf555.bmp", "16-bit bitfield 555", 0 ],
+   [ "g16bf565.bmp", "16-bit bitfield 565", 0 ],
+   [ "g16def555.bmp", "16-bit default 555", 0 ],
+   [ "g24.bmp", "24-bit", 0 ],
+   [ "g32bf.bmp", "32-bit bitfields", 0 ],
+   [ "g32def.bmp", "32-bit defaults", 0 ],
+   [ "test32bfv4.bmp", "32-bit bitfields, v4", "v4 BMP not implemented" ],
+   [ "test32v5.bmp", "32-bit, v5", "v5 BMP not implemented" ],
+   [ "test4os2v2.bmp", "4-bit OS/2", "OS/2 BMP not implemented" ],
+   [ "trans.bmp", "transparency", "alpha BMPs not implemented" ],
+   [ "width.bmp", "odd-width rle", "currently broken" ],
+  );
+
+Imager->open_log(log => "testout/x107bmp.log");
+
+plan tests => 3 * @tests;
+
+for my $test (@tests) {
+  my ($in, $note, $todo) = @$test;
+
+  my $im = Imager->new(file => "xtestimg/bmp/$in");
+  local $TODO = $todo;
+  ok($im, "load $in ($note)")
+    or diag "$in: ".Imager->errstr;
+  (my $alt = $in) =~ s/\.bmp$/.sgi/;
+
+  my $ref = Imager->new(file => "xtestimg/bmp/$alt");
+  {
+    local $TODO; # should always pass
+    ok($ref, "load reference image for $in")
+      or diag "$alt: ".Imager->errstr;
+    if ($ref->getchannels == 1) {
+      $ref = $ref->convert(preset => "rgb");
+    }
+  }
+  is_image($im, $ref, "compare $note");
+}
+
+Imager->close_log();
+

diff --git a/xtestimg/bmp/README.imager b/xtestimg/bmp/README.imager
new file mode 100644 (file)
index 0000000..4035617
--- /dev/null
+++ b/xtestimg/bmp/README.imager
@@ -0,0 +1,5 @@
+Images come from two sources:
+
+http://entropymine.com/jason/bmpsuite/
+
+http://wvnvms.wvnet.edu/vmswww/bmp.html

diff --git a/xtestimg/bmp/bmpsuite-ref.zip b/xtestimg/bmp/bmpsuite-ref.zip
new file mode 100644 (file)
index 0000000..bedc2e1
Binary files /dev/null and b/xtestimg/bmp/bmpsuite-ref.zip differ

diff --git a/xtestimg/bmp/g01bg.bmp b/xtestimg/bmp/g01bg.bmp
new file mode 100644 (file)
index 0000000..a720347
Binary files /dev/null and b/xtestimg/bmp/g01bg.bmp differ

diff --git a/xtestimg/bmp/g01bg.sgi b/xtestimg/bmp/g01bg.sgi
new file mode 100644 (file)
index 0000000..17c477f
Binary files /dev/null and b/xtestimg/bmp/g01bg.sgi differ

diff --git a/xtestimg/bmp/g01bw.bmp b/xtestimg/bmp/g01bw.bmp
new file mode 100644 (file)
index 0000000..06189a6
Binary files /dev/null and b/xtestimg/bmp/g01bw.bmp differ

diff --git a/xtestimg/bmp/g01bw.sgi b/xtestimg/bmp/g01bw.sgi
new file mode 100644 (file)
index 0000000..66dbcfc
Binary files /dev/null and b/xtestimg/bmp/g01bw.sgi differ

diff --git a/xtestimg/bmp/g01p1.bmp b/xtestimg/bmp/g01p1.bmp
new file mode 100644 (file)
index 0000000..706b4a1
Binary files /dev/null and b/xtestimg/bmp/g01p1.bmp differ

diff --git a/xtestimg/bmp/g01p1.sgi b/xtestimg/bmp/g01p1.sgi
new file mode 100644 (file)
index 0000000..9210dba
Binary files /dev/null and b/xtestimg/bmp/g01p1.sgi differ

diff --git a/xtestimg/bmp/g01wb.bmp b/xtestimg/bmp/g01wb.bmp
new file mode 100644 (file)
index 0000000..2f05b43
Binary files /dev/null and b/xtestimg/bmp/g01wb.bmp differ

diff --git a/xtestimg/bmp/g01wb.sgi b/xtestimg/bmp/g01wb.sgi
new file mode 100644 (file)
index 0000000..66dbcfc
Binary files /dev/null and b/xtestimg/bmp/g01wb.sgi differ

diff --git a/xtestimg/bmp/g04.bmp b/xtestimg/bmp/g04.bmp
new file mode 100644 (file)
index 0000000..a064f66
Binary files /dev/null and b/xtestimg/bmp/g04.bmp differ

diff --git a/xtestimg/bmp/g04.sgi b/xtestimg/bmp/g04.sgi
new file mode 100644 (file)
index 0000000..59f53eb
Binary files /dev/null and b/xtestimg/bmp/g04.sgi differ

diff --git a/xtestimg/bmp/g04p4.bmp b/xtestimg/bmp/g04p4.bmp
new file mode 100644 (file)
index 0000000..4c1096b
Binary files /dev/null and b/xtestimg/bmp/g04p4.bmp differ

diff --git a/xtestimg/bmp/g04p4.sgi b/xtestimg/bmp/g04p4.sgi
new file mode 100644 (file)
index 0000000..e94b5a3
Binary files /dev/null and b/xtestimg/bmp/g04p4.sgi differ

diff --git a/xtestimg/bmp/g04rle.bmp b/xtestimg/bmp/g04rle.bmp
new file mode 100644 (file)
index 0000000..7239fa6
Binary files /dev/null and b/xtestimg/bmp/g04rle.bmp differ

diff --git a/xtestimg/bmp/g04rle.sgi b/xtestimg/bmp/g04rle.sgi
new file mode 100644 (file)
index 0000000..59f53eb
Binary files /dev/null and b/xtestimg/bmp/g04rle.sgi differ

diff --git a/xtestimg/bmp/g08.bmp b/xtestimg/bmp/g08.bmp
new file mode 100644 (file)
index 0000000..3be9a20
Binary files /dev/null and b/xtestimg/bmp/g08.bmp differ

diff --git a/xtestimg/bmp/g08.sgi b/xtestimg/bmp/g08.sgi
new file mode 100644 (file)
index 0000000..11ffe2f
Binary files /dev/null and b/xtestimg/bmp/g08.sgi differ

diff --git a/xtestimg/bmp/g08offs.bmp b/xtestimg/bmp/g08offs.bmp
new file mode 100644 (file)
index 0000000..71def41
Binary files /dev/null and b/xtestimg/bmp/g08offs.bmp differ

diff --git a/xtestimg/bmp/g08offs.sgi b/xtestimg/bmp/g08offs.sgi
new file mode 100644 (file)
index 0000000..11ffe2f
Binary files /dev/null and b/xtestimg/bmp/g08offs.sgi differ

diff --git a/xtestimg/bmp/g08os2.bmp b/xtestimg/bmp/g08os2.bmp
new file mode 100644 (file)
index 0000000..f7f9f57
Binary files /dev/null and b/xtestimg/bmp/g08os2.bmp differ

diff --git a/xtestimg/bmp/g08os2.sgi b/xtestimg/bmp/g08os2.sgi
new file mode 100644 (file)
index 0000000..11ffe2f
Binary files /dev/null and b/xtestimg/bmp/g08os2.sgi differ

diff --git a/xtestimg/bmp/g08p256.bmp b/xtestimg/bmp/g08p256.bmp
new file mode 100644 (file)
index 0000000..a129bbc
Binary files /dev/null and b/xtestimg/bmp/g08p256.bmp differ

diff --git a/xtestimg/bmp/g08p256.sgi b/xtestimg/bmp/g08p256.sgi
new file mode 100644 (file)
index 0000000..11ffe2f
Binary files /dev/null and b/xtestimg/bmp/g08p256.sgi differ

diff --git a/xtestimg/bmp/g08p64.bmp b/xtestimg/bmp/g08p64.bmp
new file mode 100644 (file)
index 0000000..9d3affd
Binary files /dev/null and b/xtestimg/bmp/g08p64.bmp differ

diff --git a/xtestimg/bmp/g08p64.sgi b/xtestimg/bmp/g08p64.sgi
new file mode 100644 (file)
index 0000000..634f045
Binary files /dev/null and b/xtestimg/bmp/g08p64.sgi differ

diff --git a/xtestimg/bmp/g08pi256.bmp b/xtestimg/bmp/g08pi256.bmp
new file mode 100644 (file)
index 0000000..45df3f8
Binary files /dev/null and b/xtestimg/bmp/g08pi256.bmp differ

diff --git a/xtestimg/bmp/g08pi256.sgi b/xtestimg/bmp/g08pi256.sgi
new file mode 100644 (file)
index 0000000..11ffe2f
Binary files /dev/null and b/xtestimg/bmp/g08pi256.sgi differ

diff --git a/xtestimg/bmp/g08pi64.bmp b/xtestimg/bmp/g08pi64.bmp
new file mode 100644 (file)
index 0000000..52baf91
Binary files /dev/null and b/xtestimg/bmp/g08pi64.bmp differ

diff --git a/xtestimg/bmp/g08pi64.sgi b/xtestimg/bmp/g08pi64.sgi
new file mode 100644 (file)
index 0000000..11ffe2f
Binary files /dev/null and b/xtestimg/bmp/g08pi64.sgi differ

diff --git a/xtestimg/bmp/g08res11.bmp b/xtestimg/bmp/g08res11.bmp
new file mode 100644 (file)
index 0000000..f03d0f3
Binary files /dev/null and b/xtestimg/bmp/g08res11.bmp differ

diff --git a/xtestimg/bmp/g08res11.sgi b/xtestimg/bmp/g08res11.sgi
new file mode 100644 (file)
index 0000000..11ffe2f
Binary files /dev/null and b/xtestimg/bmp/g08res11.sgi differ

diff --git a/xtestimg/bmp/g08res21.bmp b/xtestimg/bmp/g08res21.bmp
new file mode 100644 (file)
index 0000000..61198e5
Binary files /dev/null and b/xtestimg/bmp/g08res21.bmp differ

diff --git a/xtestimg/bmp/g08res21.sgi b/xtestimg/bmp/g08res21.sgi
new file mode 100644 (file)
index 0000000..11ffe2f
Binary files /dev/null and b/xtestimg/bmp/g08res21.sgi differ

diff --git a/xtestimg/bmp/g08res22.bmp b/xtestimg/bmp/g08res22.bmp
new file mode 100644 (file)
index 0000000..1af0ecc
Binary files /dev/null and b/xtestimg/bmp/g08res22.bmp differ

diff --git a/xtestimg/bmp/g08res22.sgi b/xtestimg/bmp/g08res22.sgi
new file mode 100644 (file)
index 0000000..11ffe2f
Binary files /dev/null and b/xtestimg/bmp/g08res22.sgi differ

diff --git a/xtestimg/bmp/g08rle.bmp b/xtestimg/bmp/g08rle.bmp
new file mode 100644 (file)
index 0000000..082f7f4
Binary files /dev/null and b/xtestimg/bmp/g08rle.bmp differ

diff --git a/xtestimg/bmp/g08rle.sgi b/xtestimg/bmp/g08rle.sgi
new file mode 100644 (file)
index 0000000..11ffe2f
Binary files /dev/null and b/xtestimg/bmp/g08rle.sgi differ

diff --git a/xtestimg/bmp/g08s0.bmp b/xtestimg/bmp/g08s0.bmp
new file mode 100644 (file)
index 0000000..4b2c521
Binary files /dev/null and b/xtestimg/bmp/g08s0.bmp differ

diff --git a/xtestimg/bmp/g08s0.sgi b/xtestimg/bmp/g08s0.sgi
new file mode 100644 (file)
index 0000000..11ffe2f
Binary files /dev/null and b/xtestimg/bmp/g08s0.sgi differ

diff --git a/xtestimg/bmp/g08w124.bmp b/xtestimg/bmp/g08w124.bmp
new file mode 100644 (file)
index 0000000..1896035
Binary files /dev/null and b/xtestimg/bmp/g08w124.bmp differ

diff --git a/xtestimg/bmp/g08w124.sgi b/xtestimg/bmp/g08w124.sgi
new file mode 100644 (file)
index 0000000..27960ac
Binary files /dev/null and b/xtestimg/bmp/g08w124.sgi differ

diff --git a/xtestimg/bmp/g08w125.bmp b/xtestimg/bmp/g08w125.bmp
new file mode 100644 (file)
index 0000000..b348a7c
Binary files /dev/null and b/xtestimg/bmp/g08w125.bmp differ

diff --git a/xtestimg/bmp/g08w125.sgi b/xtestimg/bmp/g08w125.sgi
new file mode 100644 (file)
index 0000000..2c19e93
Binary files /dev/null and b/xtestimg/bmp/g08w125.sgi differ

diff --git a/xtestimg/bmp/g08w126.bmp b/xtestimg/bmp/g08w126.bmp
new file mode 100644 (file)
index 0000000..3628d66
Binary files /dev/null and b/xtestimg/bmp/g08w126.bmp differ

diff --git a/xtestimg/bmp/g08w126.sgi b/xtestimg/bmp/g08w126.sgi
new file mode 100644 (file)
index 0000000..cdab0a2
Binary files /dev/null and b/xtestimg/bmp/g08w126.sgi differ

diff --git a/xtestimg/bmp/g16bf555.bmp b/xtestimg/bmp/g16bf555.bmp
new file mode 100644 (file)
index 0000000..639a57f
Binary files /dev/null and b/xtestimg/bmp/g16bf555.bmp differ

diff --git a/xtestimg/bmp/g16bf555.sgi b/xtestimg/bmp/g16bf555.sgi
new file mode 100644 (file)
index 0000000..f4de619
Binary files /dev/null and b/xtestimg/bmp/g16bf555.sgi differ

diff --git a/xtestimg/bmp/g16bf565.bmp b/xtestimg/bmp/g16bf565.bmp
new file mode 100644 (file)
index 0000000..cb0ea24
Binary files /dev/null and b/xtestimg/bmp/g16bf565.bmp differ

diff --git a/xtestimg/bmp/g16bf565.sgi b/xtestimg/bmp/g16bf565.sgi
new file mode 100644 (file)
index 0000000..6291101
Binary files /dev/null and b/xtestimg/bmp/g16bf565.sgi differ

diff --git a/xtestimg/bmp/g16def555.bmp b/xtestimg/bmp/g16def555.bmp
new file mode 100644 (file)
index 0000000..a5a3195
Binary files /dev/null and b/xtestimg/bmp/g16def555.bmp differ

diff --git a/xtestimg/bmp/g16def555.sgi b/xtestimg/bmp/g16def555.sgi
new file mode 100644 (file)
index 0000000..f4de619
Binary files /dev/null and b/xtestimg/bmp/g16def555.sgi differ

diff --git a/xtestimg/bmp/g24.bmp b/xtestimg/bmp/g24.bmp
new file mode 100644 (file)
index 0000000..d6d9e6a
Binary files /dev/null and b/xtestimg/bmp/g24.bmp differ

diff --git a/xtestimg/bmp/g24.sgi b/xtestimg/bmp/g24.sgi
new file mode 100644 (file)
index 0000000..23190f1
Binary files /dev/null and b/xtestimg/bmp/g24.sgi differ

diff --git a/xtestimg/bmp/g32bf.bmp b/xtestimg/bmp/g32bf.bmp
new file mode 100644 (file)
index 0000000..0f41534
Binary files /dev/null and b/xtestimg/bmp/g32bf.bmp differ

diff --git a/xtestimg/bmp/g32bf.sgi b/xtestimg/bmp/g32bf.sgi
new file mode 100644 (file)
index 0000000..23190f1
Binary files /dev/null and b/xtestimg/bmp/g32bf.sgi differ

diff --git a/xtestimg/bmp/g32def.bmp b/xtestimg/bmp/g32def.bmp
new file mode 100644 (file)
index 0000000..9524f76
Binary files /dev/null and b/xtestimg/bmp/g32def.bmp differ

diff --git a/xtestimg/bmp/g32def.sgi b/xtestimg/bmp/g32def.sgi
new file mode 100644 (file)
index 0000000..23190f1
Binary files /dev/null and b/xtestimg/bmp/g32def.sgi differ

diff --git a/xtestimg/bmp/readme.txt b/xtestimg/bmp/readme.txt
new file mode 100644 (file)
index 0000000..347aded
--- /dev/null
+++ b/xtestimg/bmp/readme.txt
@@ -0,0 +1,38 @@
+BMP Suite - sample BMP image files\r
+By Jason Summers <jason1@pobox.com>\r
+\r
+Version: 2001.04.27\r
+\r
+For more information: http://pobox.com/~jason1/bmpsuite/\r
+\r
+Contents\r
+--------\r
+\r
+g01bw.bmp\r
+g01wb.bmp\r
+g01bg.bmp\r
+g01p1.bmp\r
+g04.bmp\r
+g04p4.bmp\r
+g08.bmp\r
+g08offs.bmp\r
+g08os2.bmp\r
+g08w126.bmp\r
+g08w125.bmp\r
+g08w124.bmp\r
+g08p256.bmp\r
+g08pi256.bmp\r
+g08pi64.bmp\r
+g08res22.bmp\r
+g08res21.bmp\r
+g08res11.bmp\r
+g08p64.bmp\r
+g08s0.bmp\r
+g16def555.bmp\r
+g16bf555.bmp\r
+g16bf565.bmp\r
+g024.bmp\r
+g32def.bmp\r
+g32bf.bmp\r
+\r
+-- end --\r

diff --git a/xtestimg/bmp/test32bfv4.bmp b/xtestimg/bmp/test32bfv4.bmp
new file mode 100644 (file)
index 0000000..3706037
Binary files /dev/null and b/xtestimg/bmp/test32bfv4.bmp differ

diff --git a/xtestimg/bmp/test32bfv4.sgi b/xtestimg/bmp/test32bfv4.sgi
new file mode 100644 (file)
index 0000000..7993316
Binary files /dev/null and b/xtestimg/bmp/test32bfv4.sgi differ

diff --git a/xtestimg/bmp/test32v5.bmp b/xtestimg/bmp/test32v5.bmp
new file mode 100644 (file)
index 0000000..8ad3cfa
Binary files /dev/null and b/xtestimg/bmp/test32v5.bmp differ

diff --git a/xtestimg/bmp/test32v5.sgi b/xtestimg/bmp/test32v5.sgi
new file mode 100644 (file)
index 0000000..ec08b6a
Binary files /dev/null and b/xtestimg/bmp/test32v5.sgi differ

diff --git a/xtestimg/bmp/test4os2v2.bmp b/xtestimg/bmp/test4os2v2.bmp
new file mode 100644 (file)
index 0000000..874a277
Binary files /dev/null and b/xtestimg/bmp/test4os2v2.bmp differ

diff --git a/xtestimg/bmp/test4os2v2.sgi b/xtestimg/bmp/test4os2v2.sgi
new file mode 100644 (file)
index 0000000..499c6ad
Binary files /dev/null and b/xtestimg/bmp/test4os2v2.sgi differ

diff --git a/xtestimg/bmp/trans.bmp b/xtestimg/bmp/trans.bmp
new file mode 100644 (file)
index 0000000..edd5ed8
Binary files /dev/null and b/xtestimg/bmp/trans.bmp differ

diff --git a/xtestimg/bmp/trans.sgi b/xtestimg/bmp/trans.sgi
new file mode 100644 (file)
index 0000000..2f3f54d
Binary files /dev/null and b/xtestimg/bmp/trans.sgi differ

diff --git a/xtestimg/bmp/width.bmp b/xtestimg/bmp/width.bmp
new file mode 100644 (file)
index 0000000..874136f
Binary files /dev/null and b/xtestimg/bmp/width.bmp differ

diff --git a/xtestimg/bmp/width.sgi b/xtestimg/bmp/width.sgi
new file mode 100644 (file)
index 0000000..d6da8fb
Binary files /dev/null and b/xtestimg/bmp/width.sgi differ