Skip to content

Extend BMP support #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Mar 15, 2017
Merged

Extend BMP support #250

merged 1 commit into from
Mar 15, 2017

Conversation

Nadahar
Copy link
Contributor

@Nadahar Nadahar commented Mar 4, 2017 •
edited
Loading

While testing I found some BMP's that couldn't be parsed. This lead me to thing that it was such an easy file format that I could quickly extend it to cover "everything". I was wrong. This wasn't quick at all, but I think I've covered most of the BMP variants now.

I have some things I'm unsure about. First of all, I've put some formatHex() and formatFixed1616() in BmpHeaderDescriptor. They are too general to be there, but I couldn't find where such methods are kept. Please advise.

As usual I'm also unsure about the formatting, line wrapping etc. I've done my best to try to keep the existing style, but please let me know if anything should be changed.

I had to add WINDOWS-1252 to Charsets because BMP files use this character set by definition. I don't know if that Charset is available on all platforms, or how Java handles "fallback" if it's missing. I'm assuming it will simply fall back to Latin-1 or similar, which shouldn't pose much of a problem. It's only actually used for one thing, and that is decoding the file name for a "linked" ICC profile. It wouldn't be the end of the world if this failed, I haven't implemented parsing of ICC profiles from external files anyway - as I see it as very unlikely that they will actually be there, so I'm simply storing the file name in a tag.

I've rearranged (and expanded) the documentation in BmpReader. I had to rearrange the whole logic a bit since some BMP files contain multiple images. I've split the reading into methods that makes reading those recursively easy, and I've moved the documentation with the methods.

I've also created quite a few enums in BmpHeaderDirectory and the documentation for those tags are in the enums (if any, some are quite self-explanatory).

I've added a corresponding PR to the images repository drewnoakes/metadata-extractor-images#10.

There's an error with some of the ICC profiles that I haven't looked at:

[ERROR: ICC Profile] ICC data describes an invalid date/time: year=10 month=1998 day=19 hour=30 minute=52 second=42

Could this be a Locale issue as well?

There's a bug in the existing code where Bit Fields <-> Huffman 1D and JPEG <-> RLE-24 is mixed up. This PR fixes that which explains the diffs on these values.

There's probably something I've forgot to mention, but I'll add it as I remember it.

@Nadahar
Copy link
Contributor Author

Nadahar commented Mar 4, 2017 •
edited
Loading

The Locale issue regarding number formatting still remains the same. But, compensating for that and using drewnoakes/metadata-extractor-images#10 the diff is:

Full differential 
 158 files changed, 2874 insertions(+), 178 deletions(-)

diff --git a/bmp/bmpsuite/b/metadata/badbitcount.bmp.txt b/bmp/bmpsuite/b/metadata/badbitcount.bmp.txt
index 5452771..d993ed4 100644
--- a/bmp/bmpsuite/b/metadata/badbitcount.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/badbitcount.bmp.txt
@@ -1,6 +1,7 @@
 FILE: badbitcount.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/b/metadata/badbitssize.bmp.txt b/bmp/bmpsuite/b/metadata/badbitssize.bmp.txt
index 39fd71f..2010cb5 100644
--- a/bmp/bmpsuite/b/metadata/badbitssize.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/badbitssize.bmp.txt
@@ -1,6 +1,7 @@
 FILE: badbitssize.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/b/metadata/baddens1.bmp.txt b/bmp/bmpsuite/b/metadata/baddens1.bmp.txt
index 7493994..b16f5ae 100644
--- a/bmp/bmpsuite/b/metadata/baddens1.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/baddens1.bmp.txt
@@ -1,6 +1,7 @@
 FILE: baddens1.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/b/metadata/baddens2.bmp.txt b/bmp/bmpsuite/b/metadata/baddens2.bmp.txt
index 6717101..fe4d1fd 100644
--- a/bmp/bmpsuite/b/metadata/baddens2.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/baddens2.bmp.txt
@@ -1,6 +1,7 @@
 FILE: baddens2.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/b/metadata/badfilesize.bmp.txt b/bmp/bmpsuite/b/metadata/badfilesize.bmp.txt
index 91f06e6..137884e 100644
--- a/bmp/bmpsuite/b/metadata/badfilesize.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/badfilesize.bmp.txt
@@ -1,6 +1,7 @@
 FILE: badfilesize.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/b/metadata/badheadersize.bmp.txt b/bmp/bmpsuite/b/metadata/badheadersize.bmp.txt
index 9e43c76..b609eac 100644
--- a/bmp/bmpsuite/b/metadata/badheadersize.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/badheadersize.bmp.txt
@@ -3,6 +3,7 @@ TYPE: BMP
 
 [ERROR: BMP Header] Unexpected DIB header size: 66
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 66
 
 [File - 0x0001] File Name = badheadersize.bmp
diff --git a/bmp/bmpsuite/b/metadata/badpalettesize.bmp.txt b/bmp/bmpsuite/b/metadata/badpalettesize.bmp.txt
index 0722554..6965e9f 100644
--- a/bmp/bmpsuite/b/metadata/badpalettesize.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/badpalettesize.bmp.txt
@@ -1,6 +1,7 @@
 FILE: badpalettesize.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/b/metadata/badplanes.bmp.txt b/bmp/bmpsuite/b/metadata/badplanes.bmp.txt
index 2ca7bd9..8d1bc53 100644
--- a/bmp/bmpsuite/b/metadata/badplanes.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/badplanes.bmp.txt
@@ -1,6 +1,7 @@
 FILE: badplanes.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/b/metadata/badrle.bmp.txt b/bmp/bmpsuite/b/metadata/badrle.bmp.txt
index 2e48ac6..1279fac 100644
--- a/bmp/bmpsuite/b/metadata/badrle.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/badrle.bmp.txt
@@ -1,6 +1,7 @@
 FILE: badrle.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/b/metadata/badrle4.bmp.txt b/bmp/bmpsuite/b/metadata/badrle4.bmp.txt
index 7248f68..3551c44 100644
--- a/bmp/bmpsuite/b/metadata/badrle4.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/badrle4.bmp.txt
@@ -1,6 +1,7 @@
 FILE: badrle4.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/b/metadata/badrle4bis.bmp.txt b/bmp/bmpsuite/b/metadata/badrle4bis.bmp.txt
index 5ab71ca..346bfb8 100644
--- a/bmp/bmpsuite/b/metadata/badrle4bis.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/badrle4bis.bmp.txt
@@ -1,6 +1,7 @@
 FILE: badrle4bis.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/b/metadata/badrle4ter.bmp.txt b/bmp/bmpsuite/b/metadata/badrle4ter.bmp.txt
index 86d1030..133d778 100644
--- a/bmp/bmpsuite/b/metadata/badrle4ter.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/badrle4ter.bmp.txt
@@ -1,6 +1,7 @@
 FILE: badrle4ter.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/b/metadata/badrlebis.bmp.txt b/bmp/bmpsuite/b/metadata/badrlebis.bmp.txt
index da98d90..d8fd8d7 100644
--- a/bmp/bmpsuite/b/metadata/badrlebis.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/badrlebis.bmp.txt
@@ -1,6 +1,7 @@
 FILE: badrlebis.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/b/metadata/badrleter.bmp.txt b/bmp/bmpsuite/b/metadata/badrleter.bmp.txt
index c02f7b1..3606778 100644
--- a/bmp/bmpsuite/b/metadata/badrleter.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/badrleter.bmp.txt
@@ -1,6 +1,7 @@
 FILE: badrleter.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/b/metadata/badwidth.bmp.txt b/bmp/bmpsuite/b/metadata/badwidth.bmp.txt
index 558a18c..d8fa936 100644
--- a/bmp/bmpsuite/b/metadata/badwidth.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/badwidth.bmp.txt
@@ -1,6 +1,7 @@
 FILE: badwidth.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = -127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/b/metadata/pal8badindex.bmp.txt b/bmp/bmpsuite/b/metadata/pal8badindex.bmp.txt
index 3e915cf..c387dcf 100644
--- a/bmp/bmpsuite/b/metadata/pal8badindex.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/pal8badindex.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal8badindex.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/b/metadata/reallybig.bmp.txt b/bmp/bmpsuite/b/metadata/reallybig.bmp.txt
index d817c94..706775f 100644
--- a/bmp/bmpsuite/b/metadata/reallybig.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/reallybig.bmp.txt
@@ -1,6 +1,7 @@
 FILE: reallybig.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 3000000
 [BMP Header - 0x0001] Image Height = 2000000
diff --git a/bmp/bmpsuite/b/metadata/rgb16-880.bmp.txt b/bmp/bmpsuite/b/metadata/rgb16-880.bmp.txt
index 8f05162..968c885 100644
--- a/bmp/bmpsuite/b/metadata/rgb16-880.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/rgb16-880.bmp.txt
@@ -1,12 +1,13 @@
 FILE: rgb16-880.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
 [BMP Header - 0x0003] Planes = 1
 [BMP Header - 0x0004] Bits Per Pixel = 16
-[BMP Header - 0x0005] Compression = Huffman 1D
+[BMP Header - 0x0005] Compression = Bit Fields
 [BMP Header - 0x0006] X Pixels per Meter = 2835
 [BMP Header - 0x0007] Y Pixels per Meter = 2835
 [BMP Header - 0x0008] Palette Colour Count = 0
diff --git a/bmp/bmpsuite/b/metadata/rletopdown.bmp.txt b/bmp/bmpsuite/b/metadata/rletopdown.bmp.txt
index 4d66110..ba6ce2f 100644
--- a/bmp/bmpsuite/b/metadata/rletopdown.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/rletopdown.bmp.txt
@@ -1,6 +1,7 @@
 FILE: rletopdown.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = -64
diff --git a/bmp/bmpsuite/b/metadata/shortfile.bmp.txt b/bmp/bmpsuite/b/metadata/shortfile.bmp.txt
index 50ed376..18276e2 100644
--- a/bmp/bmpsuite/b/metadata/shortfile.bmp.txt
+++ b/bmp/bmpsuite/b/metadata/shortfile.bmp.txt
@@ -1,6 +1,7 @@
 FILE: shortfile.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/g/metadata/pal1.bmp.txt b/bmp/bmpsuite/g/metadata/pal1.bmp.txt
index 9c4b9c7..d91ab53 100644
--- a/bmp/bmpsuite/g/metadata/pal1.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/pal1.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal1.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/g/metadata/pal1bg.bmp.txt b/bmp/bmpsuite/g/metadata/pal1bg.bmp.txt
index e4d2ff3..7c6720b 100644
--- a/bmp/bmpsuite/g/metadata/pal1bg.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/pal1bg.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal1bg.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/g/metadata/pal1wb.bmp.txt b/bmp/bmpsuite/g/metadata/pal1wb.bmp.txt
index 472b485..588233f 100644
--- a/bmp/bmpsuite/g/metadata/pal1wb.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/pal1wb.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal1wb.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/g/metadata/pal4.bmp.txt b/bmp/bmpsuite/g/metadata/pal4.bmp.txt
index 656a222..574277c 100644
--- a/bmp/bmpsuite/g/metadata/pal4.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/pal4.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal4.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/g/metadata/pal4gs.bmp.txt b/bmp/bmpsuite/g/metadata/pal4gs.bmp.txt
index 850dd82..febf5c7 100644
--- a/bmp/bmpsuite/g/metadata/pal4gs.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/pal4gs.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal4gs.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/g/metadata/pal4rle.bmp.txt b/bmp/bmpsuite/g/metadata/pal4rle.bmp.txt
index 2bf6d99..91e72d8 100644
--- a/bmp/bmpsuite/g/metadata/pal4rle.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/pal4rle.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal4rle.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/g/metadata/pal8-0.bmp.txt b/bmp/bmpsuite/g/metadata/pal8-0.bmp.txt
index 6b5fff5..730d084 100644
--- a/bmp/bmpsuite/g/metadata/pal8-0.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/pal8-0.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal8-0.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/g/metadata/pal8.bmp.txt b/bmp/bmpsuite/g/metadata/pal8.bmp.txt
index 545b8af..e9d574b 100644
--- a/bmp/bmpsuite/g/metadata/pal8.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/pal8.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal8.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/g/metadata/pal8gs.bmp.txt b/bmp/bmpsuite/g/metadata/pal8gs.bmp.txt
index 8b58427..42b5eaa 100644
--- a/bmp/bmpsuite/g/metadata/pal8gs.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/pal8gs.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal8gs.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/g/metadata/pal8nonsquare.bmp.txt b/bmp/bmpsuite/g/metadata/pal8nonsquare.bmp.txt
index bc49b2c..e0a6e71 100644
--- a/bmp/bmpsuite/g/metadata/pal8nonsquare.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/pal8nonsquare.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal8nonsquare.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 32
diff --git a/bmp/bmpsuite/g/metadata/pal8os2.bmp.txt b/bmp/bmpsuite/g/metadata/pal8os2.bmp.txt
index 1ebbda6..d054efc 100644
--- a/bmp/bmpsuite/g/metadata/pal8os2.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/pal8os2.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal8os2.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 12
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/g/metadata/pal8rle.bmp.txt b/bmp/bmpsuite/g/metadata/pal8rle.bmp.txt
index 4f03cfc..b400f6f 100644
--- a/bmp/bmpsuite/g/metadata/pal8rle.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/pal8rle.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal8rle.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/g/metadata/pal8topdown.bmp.txt b/bmp/bmpsuite/g/metadata/pal8topdown.bmp.txt
index db89e6e..04b0af2 100644
--- a/bmp/bmpsuite/g/metadata/pal8topdown.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/pal8topdown.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal8topdown.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = -64
diff --git a/bmp/bmpsuite/g/metadata/pal8v4.bmp.txt b/bmp/bmpsuite/g/metadata/pal8v4.bmp.txt
index 1401720..14f5b23 100644
--- a/bmp/bmpsuite/g/metadata/pal8v4.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/pal8v4.bmp.txt
@@ -1,9 +1,25 @@
 FILE: pal8v4.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 108
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 108
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 8
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 252
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000c] Red Mask = 0x00000000
+[BMP Header - 0x000d] Green Mask = 0x00000000
+[BMP Header - 0x000e] Blue Mask = 0x00000000
+[BMP Header - 0x000f] Alpha Mask = 0x00000000
+[BMP Header - 0x0010] Color Space Type = Calibrated RGB
+[BMP Header - 0x0011] Red Gamma Curve = 2,2
+[BMP Header - 0x0012] Green Gamma Curve = 2,2
+[BMP Header - 0x0013] Blue Gamma Curve = 2,2
 
 [File - 0x0001] File Name = pal8v4.bmp
 [File - 0x0002] File Size = 9322 bytes
diff --git a/bmp/bmpsuite/g/metadata/pal8v5.bmp.txt b/bmp/bmpsuite/g/metadata/pal8v5.bmp.txt
index 03cb0cf..607dfac 100644
--- a/bmp/bmpsuite/g/metadata/pal8v5.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/pal8v5.bmp.txt
@@ -1,9 +1,26 @@
 FILE: pal8v5.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 124
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 124
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 8
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 252
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000c] Red Mask = 0x00000000
+[BMP Header - 0x000d] Green Mask = 0x00000000
+[BMP Header - 0x000e] Blue Mask = 0x00000000
+[BMP Header - 0x000f] Alpha Mask = 0x00000000
+[BMP Header - 0x0010] Color Space Type = sRGB Color Space
+[BMP Header - 0x0011] Red Gamma Curve = 0
+[BMP Header - 0x0012] Green Gamma Curve = 0
+[BMP Header - 0x0013] Blue Gamma Curve = 0
+[BMP Header - 0x0014] Rendering Intent = Picture, Perceptual
 
 [File - 0x0001] File Name = pal8v5.bmp
 [File - 0x0002] File Size = 9338 bytes
diff --git a/bmp/bmpsuite/g/metadata/pal8w124.bmp.txt b/bmp/bmpsuite/g/metadata/pal8w124.bmp.txt
index 2a6a704..18a819b 100644
--- a/bmp/bmpsuite/g/metadata/pal8w124.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/pal8w124.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal8w124.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 124
 [BMP Header - 0x0001] Image Height = 61
diff --git a/bmp/bmpsuite/g/metadata/pal8w125.bmp.txt b/bmp/bmpsuite/g/metadata/pal8w125.bmp.txt
index 2449648..494599b 100644
--- a/bmp/bmpsuite/g/metadata/pal8w125.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/pal8w125.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal8w125.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 125
 [BMP Header - 0x0001] Image Height = 62
diff --git a/bmp/bmpsuite/g/metadata/pal8w126.bmp.txt b/bmp/bmpsuite/g/metadata/pal8w126.bmp.txt
index d7e6db7..ba684e3 100644
--- a/bmp/bmpsuite/g/metadata/pal8w126.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/pal8w126.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal8w126.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 126
 [BMP Header - 0x0001] Image Height = 63
diff --git a/bmp/bmpsuite/g/metadata/rgb16-565.bmp.txt b/bmp/bmpsuite/g/metadata/rgb16-565.bmp.txt
index 7430e0a..35bc4ca 100644
--- a/bmp/bmpsuite/g/metadata/rgb16-565.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/rgb16-565.bmp.txt
@@ -1,12 +1,13 @@
 FILE: rgb16-565.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
 [BMP Header - 0x0003] Planes = 1
 [BMP Header - 0x0004] Bits Per Pixel = 16
-[BMP Header - 0x0005] Compression = Huffman 1D
+[BMP Header - 0x0005] Compression = Bit Fields
 [BMP Header - 0x0006] X Pixels per Meter = 2835
 [BMP Header - 0x0007] Y Pixels per Meter = 2835
 [BMP Header - 0x0008] Palette Colour Count = 0
diff --git a/bmp/bmpsuite/g/metadata/rgb16-565pal.bmp.txt b/bmp/bmpsuite/g/metadata/rgb16-565pal.bmp.txt
index a9ca1ba..683f2e4 100644
--- a/bmp/bmpsuite/g/metadata/rgb16-565pal.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/rgb16-565pal.bmp.txt
@@ -1,12 +1,13 @@
 FILE: rgb16-565pal.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
 [BMP Header - 0x0003] Planes = 1
 [BMP Header - 0x0004] Bits Per Pixel = 16
-[BMP Header - 0x0005] Compression = Huffman 1D
+[BMP Header - 0x0005] Compression = Bit Fields
 [BMP Header - 0x0006] X Pixels per Meter = 2835
 [BMP Header - 0x0007] Y Pixels per Meter = 2835
 [BMP Header - 0x0008] Palette Colour Count = 256
diff --git a/bmp/bmpsuite/g/metadata/rgb16.bmp.txt b/bmp/bmpsuite/g/metadata/rgb16.bmp.txt
index 2d7eb6a..9a1d9f0 100644
--- a/bmp/bmpsuite/g/metadata/rgb16.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/rgb16.bmp.txt
@@ -1,6 +1,7 @@
 FILE: rgb16.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/g/metadata/rgb16bfdef.bmp.txt b/bmp/bmpsuite/g/metadata/rgb16bfdef.bmp.txt
index 4e44614..4bef850 100644
--- a/bmp/bmpsuite/g/metadata/rgb16bfdef.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/rgb16bfdef.bmp.txt
@@ -1,12 +1,13 @@
 FILE: rgb16bfdef.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
 [BMP Header - 0x0003] Planes = 1
 [BMP Header - 0x0004] Bits Per Pixel = 16
-[BMP Header - 0x0005] Compression = Huffman 1D
+[BMP Header - 0x0005] Compression = Bit Fields
 [BMP Header - 0x0006] X Pixels per Meter = 2835
 [BMP Header - 0x0007] Y Pixels per Meter = 2835
 [BMP Header - 0x0008] Palette Colour Count = 0
diff --git a/bmp/bmpsuite/g/metadata/rgb24.bmp.txt b/bmp/bmpsuite/g/metadata/rgb24.bmp.txt
index 81bc187..6ea4304 100644
--- a/bmp/bmpsuite/g/metadata/rgb24.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/rgb24.bmp.txt
@@ -1,6 +1,7 @@
 FILE: rgb24.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/g/metadata/rgb24pal.bmp.txt b/bmp/bmpsuite/g/metadata/rgb24pal.bmp.txt
index 3158546..153bcd1 100644
--- a/bmp/bmpsuite/g/metadata/rgb24pal.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/rgb24pal.bmp.txt
@@ -1,6 +1,7 @@
 FILE: rgb24pal.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/g/metadata/rgb32.bmp.txt b/bmp/bmpsuite/g/metadata/rgb32.bmp.txt
index c571792..0829cf8 100644
--- a/bmp/bmpsuite/g/metadata/rgb32.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/rgb32.bmp.txt
@@ -1,6 +1,7 @@
 FILE: rgb32.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/g/metadata/rgb32bf.bmp.txt b/bmp/bmpsuite/g/metadata/rgb32bf.bmp.txt
index aacfadf..43732d6 100644
--- a/bmp/bmpsuite/g/metadata/rgb32bf.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/rgb32bf.bmp.txt
@@ -1,12 +1,13 @@
 FILE: rgb32bf.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
 [BMP Header - 0x0003] Planes = 1
 [BMP Header - 0x0004] Bits Per Pixel = 32
-[BMP Header - 0x0005] Compression = Huffman 1D
+[BMP Header - 0x0005] Compression = Bit Fields
 [BMP Header - 0x0006] X Pixels per Meter = 2835
 [BMP Header - 0x0007] Y Pixels per Meter = 2835
 [BMP Header - 0x0008] Palette Colour Count = 0
diff --git a/bmp/bmpsuite/g/metadata/rgb32bfdef.bmp.txt b/bmp/bmpsuite/g/metadata/rgb32bfdef.bmp.txt
index 40672b0..7063543 100644
--- a/bmp/bmpsuite/g/metadata/rgb32bfdef.bmp.txt
+++ b/bmp/bmpsuite/g/metadata/rgb32bfdef.bmp.txt
@@ -1,12 +1,13 @@
 FILE: rgb32bfdef.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
 [BMP Header - 0x0003] Planes = 1
 [BMP Header - 0x0004] Bits Per Pixel = 32
-[BMP Header - 0x0005] Compression = Huffman 1D
+[BMP Header - 0x0005] Compression = Bit Fields
 [BMP Header - 0x0006] X Pixels per Meter = 2835
 [BMP Header - 0x0007] Y Pixels per Meter = 2835
 [BMP Header - 0x0008] Palette Colour Count = 0
diff --git a/bmp/bmpsuite/q/metadata/pal1huff.bmp.txt b/bmp/bmpsuite/q/metadata/pal1huff.bmp.txt
index 653fb84..e8734aa 100644
--- a/bmp/bmpsuite/q/metadata/pal1huff.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/pal1huff.bmp.txt
@@ -1,9 +1,19 @@
 FILE: pal1huff.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 64
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = Huffman 1D
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 2
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
 
 [File - 0x0001] File Name = pal1huff.bmp
 [File - 0x0002] File Size = 2151 bytes
diff --git a/bmp/bmpsuite/q/metadata/pal1p1.bmp.txt b/bmp/bmpsuite/q/metadata/pal1p1.bmp.txt
index 61adc0b..001b24b 100644
--- a/bmp/bmpsuite/q/metadata/pal1p1.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/pal1p1.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal1p1.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/q/metadata/pal2.bmp.txt b/bmp/bmpsuite/q/metadata/pal2.bmp.txt
index 3ec5842..cae0aa1 100644
--- a/bmp/bmpsuite/q/metadata/pal2.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/pal2.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal2.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/q/metadata/pal2color.bmp.txt b/bmp/bmpsuite/q/metadata/pal2color.bmp.txt
index 9635868..1d71b8a 100644
--- a/bmp/bmpsuite/q/metadata/pal2color.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/pal2color.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal2color.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/q/metadata/pal4rlecut.bmp.txt b/bmp/bmpsuite/q/metadata/pal4rlecut.bmp.txt
index e370d95..88fe730 100644
--- a/bmp/bmpsuite/q/metadata/pal4rlecut.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/pal4rlecut.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal4rlecut.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/q/metadata/pal4rletrns.bmp.txt b/bmp/bmpsuite/q/metadata/pal4rletrns.bmp.txt
index 3f6fc33..a686187 100644
--- a/bmp/bmpsuite/q/metadata/pal4rletrns.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/pal4rletrns.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal4rletrns.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/q/metadata/pal8offs.bmp.txt b/bmp/bmpsuite/q/metadata/pal8offs.bmp.txt
index 4fa6277..1133ae3 100644
--- a/bmp/bmpsuite/q/metadata/pal8offs.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/pal8offs.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal8offs.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/q/metadata/pal8os2-hs.bmp.txt b/bmp/bmpsuite/q/metadata/pal8os2-hs.bmp.txt
index 7aa4017..a0acf7b 100644
--- a/bmp/bmpsuite/q/metadata/pal8os2-hs.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/pal8os2-hs.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal8os2-hs.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 12
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/q/metadata/pal8os2-sz.bmp.txt b/bmp/bmpsuite/q/metadata/pal8os2-sz.bmp.txt
index 2b59404..2b42ccc 100644
--- a/bmp/bmpsuite/q/metadata/pal8os2-sz.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/pal8os2-sz.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal8os2-sz.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 12
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/q/metadata/pal8os2sp.bmp.txt b/bmp/bmpsuite/q/metadata/pal8os2sp.bmp.txt
index dafbcfc..84a4868 100644
--- a/bmp/bmpsuite/q/metadata/pal8os2sp.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/pal8os2sp.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal8os2sp.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 12
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/q/metadata/pal8os2v2-16.bmp.txt b/bmp/bmpsuite/q/metadata/pal8os2v2-16.bmp.txt
index f85f743..1fcec45 100644
--- a/bmp/bmpsuite/q/metadata/pal8os2v2-16.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/pal8os2v2-16.bmp.txt
@@ -1,9 +1,12 @@
 FILE: pal8os2v2-16.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 16
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 16
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 8
 
 [File - 0x0001] File Name = pal8os2v2-16.bmp
 [File - 0x0002] File Size = 9246 bytes
diff --git a/bmp/bmpsuite/q/metadata/pal8os2v2-40sz.bmp.txt b/bmp/bmpsuite/q/metadata/pal8os2v2-40sz.bmp.txt
index ec32db1..c8b34ce 100644
--- a/bmp/bmpsuite/q/metadata/pal8os2v2-40sz.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/pal8os2v2-40sz.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal8os2v2-40sz.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/q/metadata/pal8os2v2-sz.bmp.txt b/bmp/bmpsuite/q/metadata/pal8os2v2-sz.bmp.txt
index fb0ae1e..6ae9927 100644
--- a/bmp/bmpsuite/q/metadata/pal8os2v2-sz.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/pal8os2v2-sz.bmp.txt
@@ -1,9 +1,19 @@
 FILE: pal8os2v2-sz.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 64
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 8
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 252
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
 
 [File - 0x0001] File Name = pal8os2v2-sz.bmp
 [File - 0x0002] File Size = 9278 bytes
diff --git a/bmp/bmpsuite/q/metadata/pal8os2v2.bmp.txt b/bmp/bmpsuite/q/metadata/pal8os2v2.bmp.txt
index ecb76b7..afa33a5 100644
--- a/bmp/bmpsuite/q/metadata/pal8os2v2.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/pal8os2v2.bmp.txt
@@ -1,9 +1,19 @@
 FILE: pal8os2v2.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 64
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 8
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 252
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
 
 [File - 0x0001] File Name = pal8os2v2.bmp
 [File - 0x0002] File Size = 9278 bytes
diff --git a/bmp/bmpsuite/q/metadata/pal8oversizepal.bmp.txt b/bmp/bmpsuite/q/metadata/pal8oversizepal.bmp.txt
index f1cce5d..d63fde2 100644
--- a/bmp/bmpsuite/q/metadata/pal8oversizepal.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/pal8oversizepal.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal8oversizepal.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/q/metadata/pal8rlecut.bmp.txt b/bmp/bmpsuite/q/metadata/pal8rlecut.bmp.txt
index 2764730..0483c5b 100644
--- a/bmp/bmpsuite/q/metadata/pal8rlecut.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/pal8rlecut.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal8rlecut.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/q/metadata/pal8rletrns.bmp.txt b/bmp/bmpsuite/q/metadata/pal8rletrns.bmp.txt
index e214196..60e0896 100644
--- a/bmp/bmpsuite/q/metadata/pal8rletrns.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/pal8rletrns.bmp.txt
@@ -1,6 +1,7 @@
 FILE: pal8rletrns.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/q/metadata/rgb16-231.bmp.txt b/bmp/bmpsuite/q/metadata/rgb16-231.bmp.txt
index 052cc40..46ab194 100644
--- a/bmp/bmpsuite/q/metadata/rgb16-231.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgb16-231.bmp.txt
@@ -1,12 +1,13 @@
 FILE: rgb16-231.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
 [BMP Header - 0x0003] Planes = 1
 [BMP Header - 0x0004] Bits Per Pixel = 16
-[BMP Header - 0x0005] Compression = Huffman 1D
+[BMP Header - 0x0005] Compression = Bit Fields
 [BMP Header - 0x0006] X Pixels per Meter = 2835
 [BMP Header - 0x0007] Y Pixels per Meter = 2835
 [BMP Header - 0x0008] Palette Colour Count = 0
diff --git a/bmp/bmpsuite/q/metadata/rgb16-3103.bmp.txt b/bmp/bmpsuite/q/metadata/rgb16-3103.bmp.txt
index faced10..85920ce 100644
--- a/bmp/bmpsuite/q/metadata/rgb16-3103.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgb16-3103.bmp.txt
@@ -1,12 +1,13 @@
 FILE: rgb16-3103.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
 [BMP Header - 0x0003] Planes = 1
 [BMP Header - 0x0004] Bits Per Pixel = 16
-[BMP Header - 0x0005] Compression = Huffman 1D
+[BMP Header - 0x0005] Compression = Bit Fields
 [BMP Header - 0x0006] X Pixels per Meter = 2835
 [BMP Header - 0x0007] Y Pixels per Meter = 2835
 [BMP Header - 0x0008] Palette Colour Count = 0
diff --git a/bmp/bmpsuite/q/metadata/rgb16faketrns.bmp.txt b/bmp/bmpsuite/q/metadata/rgb16faketrns.bmp.txt
index 4b6aaec..3112a1a 100644
--- a/bmp/bmpsuite/q/metadata/rgb16faketrns.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgb16faketrns.bmp.txt
@@ -1,6 +1,7 @@
 FILE: rgb16faketrns.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/q/metadata/rgb24jpeg.bmp.txt b/bmp/bmpsuite/q/metadata/rgb24jpeg.bmp.txt
index 52ee935..236f9d8 100644
--- a/bmp/bmpsuite/q/metadata/rgb24jpeg.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgb24jpeg.bmp.txt
@@ -1,9 +1,26 @@
 FILE: rgb24jpeg.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 124
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 124
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 0
+[BMP Header - 0x0005] Compression = JPEG
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000c] Red Mask = 0x00000000
+[BMP Header - 0x000d] Green Mask = 0x00000000
+[BMP Header - 0x000e] Blue Mask = 0x00000000
+[BMP Header - 0x000f] Alpha Mask = 0x00000000
+[BMP Header - 0x0010] Color Space Type = sRGB Color Space
+[BMP Header - 0x0011] Red Gamma Curve = 0
+[BMP Header - 0x0012] Green Gamma Curve = 0
+[BMP Header - 0x0013] Blue Gamma Curve = 0
+[BMP Header - 0x0014] Rendering Intent = Picture, Perceptual
 
 [File - 0x0001] File Name = rgb24jpeg.bmp
 [File - 0x0002] File Size = 2457 bytes
diff --git a/bmp/bmpsuite/q/metadata/rgb24largepal.bmp.txt b/bmp/bmpsuite/q/metadata/rgb24largepal.bmp.txt
index 5ef1f49..fa110e7 100644
--- a/bmp/bmpsuite/q/metadata/rgb24largepal.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgb24largepal.bmp.txt
@@ -1,6 +1,7 @@
 FILE: rgb24largepal.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/q/metadata/rgb24lprof.bmp.txt b/bmp/bmpsuite/q/metadata/rgb24lprof.bmp.txt
index c4059c3..c09b73e 100644
--- a/bmp/bmpsuite/q/metadata/rgb24lprof.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgb24lprof.bmp.txt
@@ -1,9 +1,27 @@
 FILE: rgb24lprof.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 124
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 124
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 24
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000c] Red Mask = 0x00000000
+[BMP Header - 0x000d] Green Mask = 0x00000000
+[BMP Header - 0x000e] Blue Mask = 0x00000000
+[BMP Header - 0x000f] Alpha Mask = 0x00000000
+[BMP Header - 0x0010] Color Space Type = Linked Profile
+[BMP Header - 0x0011] Red Gamma Curve = 0
+[BMP Header - 0x0012] Green Gamma Curve = 0
+[BMP Header - 0x0013] Blue Gamma Curve = 0
+[BMP Header - 0x0014] Rendering Intent = Picture, Perceptual
+[BMP Header - 0x0015] Linked Profile File Name = C:\temp\test•ë.icc
 
 [File - 0x0001] File Name = rgb24lprof.bmp
 [File - 0x0002] File Size = 24743 bytes
diff --git a/bmp/bmpsuite/q/metadata/rgb24png.bmp.txt b/bmp/bmpsuite/q/metadata/rgb24png.bmp.txt
index d4c8286..49d2be5 100644
--- a/bmp/bmpsuite/q/metadata/rgb24png.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgb24png.bmp.txt
@@ -1,9 +1,26 @@
 FILE: rgb24png.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 124
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 124
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 0
+[BMP Header - 0x0005] Compression = PNG
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000c] Red Mask = 0x00000000
+[BMP Header - 0x000d] Green Mask = 0x00000000
+[BMP Header - 0x000e] Blue Mask = 0x00000000
+[BMP Header - 0x000f] Alpha Mask = 0x00000000
+[BMP Header - 0x0010] Color Space Type = sRGB Color Space
+[BMP Header - 0x0011] Red Gamma Curve = 0
+[BMP Header - 0x0012] Green Gamma Curve = 0
+[BMP Header - 0x0013] Blue Gamma Curve = 0
+[BMP Header - 0x0014] Rendering Intent = Picture, Perceptual
 
 [File - 0x0001] File Name = rgb24png.bmp
 [File - 0x0002] File Size = 1210 bytes
diff --git a/bmp/bmpsuite/q/metadata/rgb24prof.bmp.txt b/bmp/bmpsuite/q/metadata/rgb24prof.bmp.txt
index bb98caf..647806b 100644
--- a/bmp/bmpsuite/q/metadata/rgb24prof.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgb24prof.bmp.txt
@@ -1,15 +1,60 @@
 FILE: rgb24prof.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 124
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 124
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 24
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000c] Red Mask = 0x00000000
+[BMP Header - 0x000d] Green Mask = 0x00000000
+[BMP Header - 0x000e] Blue Mask = 0x00000000
+[BMP Header - 0x000f] Alpha Mask = 0x00000000
+[BMP Header - 0x0010] Color Space Type = Embedded Profile
+[BMP Header - 0x0011] Red Gamma Curve = 0
+[BMP Header - 0x0012] Green Gamma Curve = 0
+[BMP Header - 0x0013] Blue Gamma Curve = 0
+[BMP Header - 0x0014] Rendering Intent = Picture, Perceptual
+
+[ICC Profile - 0x0000] Profile Size = 3048
+[ICC Profile - 0x0008] Version = 2.0.0
+[ICC Profile - 0x000c] Class = Display Device
+[ICC Profile - 0x0010] Color space = RGB 
+[ICC Profile - 0x0014] Profile Connection Space = XYZ 
+[ICC Profile - 0x0018] Profile Date/Time = 2009:03:27 21:36:31
+[ICC Profile - 0x0024] Signature = acsp
+[ICC Profile - 0x0038] Device attributes = 4294967296
+[ICC Profile - 0x0044] XYZ values = 0,964 1 0,825
+[ICC Profile - 0x0080] Tag Count = 16
+[ICC Profile - 0x64657363] Profile Description = sRGB IEC61966-2-1 black scaled
+[ICC Profile - 0x6258595a] Blue Colorant = (0,1431, 0,0606, 0,7141)
+[ICC Profile - 0x62545243] Blue TRC = 0.0, 0.0000763, 0.0001526, 0.0002289, 0.0003052, 0.0003815, 0.0004578, 0.0005341, 0.0006104, 0.0006867, 0.000763, 0.0008392, 0.0009003, 0.0009766, 0.0010529, 0.0011292, 0.0012055, 0.0012818, 0.0013581, 0.0014343, 0.0015106, 0.0015869, 0.0016632, 0.0017395, 0.0018158, 0.0018921, 0.0019684, 0.0020447, 0.002121, 0.0021973, 0.0022736, 0.0023499, 0.0024262, 0.0025025, 0.0025788, 0.0026551, 0.0027161, 0.0027924, 0.0028687, 0.002945, 0.0030213, 0.0030976, 0.0031739, 0.0032502, 0.0033417, 0.003418, 0.0034943, 0.0035859, 0.0036622, 0.0037537, 0.00383, 0.0039216, 0.0040131, 0.0041047, 0.0041962, 0.0042878, 0.0043793, 0.0044709, 0.0045624, 0.0046693, 0.0047608, 0.0048524, 0.0049592, 0.005066, 0.0051575, 0.0052644, 0.0053712, 0.005478, 0.0055848, 0.0056916, 0.0057984, 0.0059052, 0.0060273, 0.0061341, 0.0062562, 0.006363, 0.0064851, 0.0066072, 0.0067292, 0.0068513, 0.0069734, 0.0070954, 0.0072175, 0.0073396, 0.0074617, 0.007599, 0.0077211, 0.0078584, 0.0079957, 0.0081178, 0.0082551, 0.0083925, 0.0085298, 0.0086671, 0.0088045, 0.008957, 0.0090944, 0.0092317, 0.0093843, 0.0095369, 0.0096742, 0.0098268, 0.0099794, 0.010132, 0.0102846, 0.0104372, 0.0105898, 0.0107576, 0.0109102, 0.0110628, 0.0112306, 0.0113985, 0.0115511, 0.0117189, 0.0118868, 0.0120546, 0.0122225, 0.0124056, 0.0125734, 0.0127413, 0.0129244, 0.0130922, 0.0132753, 0.0134585, 0.0136416, 0.0138247, 0.0140078, 0.0141909, 0.014374, 0.0145571, 0.0147555, 0.0149386, 0.0151369, 0.0153201, 0.0155184, 0.0157168, 0.0159152, 0.0161135, 0.0163119, 0.0165255, 0.0167239, 0.0169223, 0.0171359, 0.0173495, 0.0175479, 0.0177615, 0.0179751, 0.0181888, 0.0184024, 0.018616, 0.0188449, 0.0190585, 0.0192874, 0.019501, 0.0197299, 0.0199588, 0.0201877, 0.0204166, 0.0206455, 0.0208743, 0.0211032, 0.0213474, 0.0215763, 0.0218204, 0.0220645, 0.0222934, 0.0225376, 0.0227817, 0.0230259, 0.0232853, 0.0235294, 0.0237736, 0.024033, 0.0242771, 0.0245365, 0.0247959, 0.0250553, 0.0253147, 0.0255741, 0.0258335, 0.0261082, 0.0263676, 0.026627, 0.0269017, 0.0271763, 0.027451, 0.0277256, 0.0280003, 0.028275, 0.0285496, 0.0288243, 0.0291142, 0.0293889, 0.0296788, 0.0299687, 0.0302586, 0.0305486, 0.0308385, 0.0311284, 0.0314183, 0.0317235, 0.0320134, 0.0323186, 0.0326238, 0.032929, 0.0332341, 0.0335393, 0.0338445, 0.0341497, 0.0344549, 0.0347753, 0.0350805, 0.0354009, 0.0357214, 0.0360418, 0.0363622, 0.0366827, 0.0370031, 0.0373388, 0.0376593, 0.037995, 0.0383154, 0.0386511, 0.0389868, 0.0393225, 0.0396582, 0.0399939, 0.0403449, 0.0406806, 0.0410315, 0.0413825, 0.0417182, 0.0420691, 0.0424201, 0.042771, 0.0431373, 0.0434882, 0.0438392, 0.0442054, 0.0445716, 0.0449226, 0.0452888, 0.045655, 0.0460212, 0.0464027, 0.0467689, 0.0471504, 0.0475166, 0.0478981, 0.0482795, 0.048661, 0.0490425, 0.049424, 0.0498054, 0.0501869, 0.0505837, 0.0509804, 0.0513619, 0.0517586, 0.0521553, 0.0525521, 0.0529488, 0.0533608, 0.0537575, 0.0541695, 0.0545663, 0.0549783, 0.0553902, 0.0558022, 0.0562142, 0.0566262, 0.0570535, 0.0574655, 0.0578927, 0.05832, 0.058732, 0.0591592, 0.0595865, 0.060029, 0.0604562, 0.0608835, 0.061326, 0.0617533, 0.0621958, 0.0626383, 0.0630808, 0.0635233, 0.0639811, 0.0644236, 0.0648661, 0.0653239, 0.0657816, 0.0662394, 0.0666972, 0.067155, 0.0676127, 0.0680705, 0.0685435, 0.0690013, 0.0694743, 0.0699474, 0.0704204, 0.0708934, 0.0713664, 0.0718395, 0.0723278, 0.0728008, 0.0732891, 0.0737774, 0.0742657, 0.0747539, 0.0752422, 0.0757305, 0.0762188, 0.0767224, 0.0772259, 0.0777142, 0.0782177, 0.0787213, 0.0792401, 0.0797436, 0.0802472, 0.080766, 0.0812696, 0.0817884, 0.0823072, 0.082826, 0.0833448, 0.0838636, 0.0843977, 0.0849165, 0.0854505, 0.0859846, 0.0865187, 0.0870527, 0.0875868, 0.0881209, 0.0886549, 0.0892042, 0.0897536, 0.0902876, 0.090837, 0.0913863, 0.0919356, 0.0925002, 0.0930495, 0.0936141, 0.0941634, 0.094728, 0.0952926, 0.0958572, 0.0964218, 0.0970016, 0.0975662, 0.098146, 0.0987106, 0.0992905, 0.0998703, 0.1004501, 0.10103, 0.1016251, 0.1022049, 0.1028, 0.1033799, 0.103975, 0.1045701, 0.1051652, 0.1057755, 0.1063706, 0.106981, 0.1075761, 0.1081865, 0.1087968, 0.1094072, 0.1100175, 0.1106279, 0.1112535, 0.1118639, 0.1124895, 0.1131151, 0.1137407, 0.1143664, 0.114992, 0.1156176, 0.1162585, 0.1168841, 0.117525, 0.1181659, 0.1188067, 0.1194476, 0.1200885, 0.1207446, 0.1213855, 0.1220417, 0.1226978, 0.1233539, 0.1240101, 0.1246662, 0.1253223, 0.1259937, 0.1266499, 0.1273213, 0.1279927, 0.1286641, 0.1293355, 0.1300069, 0.1306935, 0.1313649, 0.1320516, 0.1327382, 0.1334096, 0.1341115, 0.1347982, 0.1354849, 0.1361868, 0.1368734, 0.1375753, 0.1382773, 0.1389792, 0.1396811, 0.140383, 0.1411002, 0.1418021, 0.1425193, 0.1432364, 0.1439536, 0.1446708, 0.145388, 0.1461204, 0.1468376, 0.14757, 0.1483024, 0.1490349, 0.1497673, 0.1504997, 0.1512322, 0.1519799, 0.1527123, 0.15346, 0.1542077, 0.1549554, 0.1557031, 0.1564508, 0.1572137, 0.1579767, 0.1587243, 0.1594873, 0.1602502, 0.1610132, 0.1617914, 0.1625544, 0.1633326, 0.1640955, 0.1648737, 0.1656519, 0.1664302, 0.1672236, 0.1680018, 0.1687953, 0.1695735, 0.170367, 0.1711604, 0.1719539, 0.1727474, 0.1735561, 0.1743496, 0.1751583, 0.175967, 0.1767758, 0.1775845, 0.1783932, 0.1792172, 0.1800259, 0.1808499, 0.1816739, 0.1824826, 0.1833219, 0.1841459, 0.1849699, 0.1858091, 0.1866331, 0.1874723, 0.1883116, 0.1891508, 0.1900053, 0.1908446, 0.1916838, 0.1925383, 0.1933928, 0.1942473, 0.1951019, 0.1959564, 0.1968261, 0.1976806, 0.1985504, 0.1994202, 0.2002899, 0.2011597, 0.2020294, 0.2028992, 0.2037842, 0.2046693, 0.205539, 0.206424, 0.2073243, 0.2082094, 0.2090944, 0.2099947, 0.2108949, 0.21178, 0.2126802, 0.2135958, 0.2144961, 0.2153964, 0.2163119, 0.2172274, 0.2181277, 0.2190585, 0.2199741, 0.2208896, 0.2218051, 0.2227359, 0.2236667, 0.2245975, 0.2255283, 0.2264591, 0.2273899, 0.228336, 0.2292821, 0.2302129, 0.2311589, 0.232105, 0.2330663, 0.2340124, 0.2349737, 0.2359197, 0.2368811, 0.2378424, 0.2388037, 0.239765, 0.2407416, 0.2417029, 0.2426795, 0.2436561, 0.2446326, 0.2456092, 0.2466011, 0.2475776, 0.2485695, 0.249546, 0.2505379, 0.2515297, 0.2525368, 0.2535286, 0.2545357, 0.2555276, 0.2565347, 0.2575418, 0.2585489, 0.259556, 0.2605783, 0.2615854, 0.2626078, 0.2636301, 0.2646525, 0.2656748, 0.2667124, 0.2677348, 0.2687724, 0.26981, 0.2708324, 0.2718853, 0.2729229, 0.2739605, 0.2750134, 0.276051, 0.2771038, 0.2781567, 0.2792248, 0.2802777, 0.2813306, 0.2823987, 0.2834668, 0.284535, 0.2856031, 0.2866712, 0.2877394, 0.2888228, 0.2899062, 0.2909743, 0.2920577, 0.2931563, 0.2942397, 0.2953231, 0.2964218, 0.2975204, 0.2986191, 0.2997177, 0.3008164, 0.301915, 0.3030289, 0.3041428, 0.3052567, 0.3063706, 0.3074846, 0.3085985, 0.3097124, 0.3108415, 0.3119707, 0.3130999, 0.314229, 0.3153582, 0.3165026, 0.3176318, 0.3187762, 0.3199207, 0.3210651, 0.3222095, 0.3233539, 0.3245136, 0.3256733, 0.3268177, 0.3279774, 0.3291371, 0.330312, 0.3314717, 0.3326467, 0.3338216, 0.3349966, 0.3361715, 0.3373465, 0.3385214, 0.3397116, 0.3408865, 0.3420768, 0.343267, 0.3444724, 0.3456626, 0.3468528, 0.3480583, 0.3492638, 0.3504692, 0.3516747, 0.3528801, 0.3541009, 0.3553063, 0.356527, 0.3577478, 0.3589685, 0.3601892, 0.3614252, 0.3626459, 0.3638819, 0.3651179, 0.3663539, 0.3675898, 0.3688411, 0.3700771, 0.3713283, 0.3725795, 0.3738308, 0.375082, 0.3763333, 0.3775998, 0.378851, 0.3801175, 0.381384, 0.3826505, 0.3839322, 0.3851987, 0.3864805, 0.387747, 0.3890288, 0.3903105, 0.3916075, 0.3928893, 0.3941863, 0.3954681, 0.3967651, 0.3980621, 0.3993744, 0.4006714, 0.4019837, 0.4032807, 0.404593, 0.4059052, 0.4072175, 0.4085451, 0.4098573, 0.4111849, 0.4125124, 0.4138399, 0.4151675, 0.416495, 0.4178378, 0.4191806, 0.4205234, 0.4218662, 0.423209, 0.4245518, 0.4259098, 0.4272526, 0.4286107, 0.4299687, 0.4313268, 0.4326848, 0.4340581, 0.4354314, 0.4367895, 0.4381628, 0.4395514, 0.4409247, 0.442298, 0.4436866, 0.4450752, 0.4464637, 0.4478523, 0.4492409, 0.4506447, 0.4520333, 0.4534371, 0.4548409, 0.4562448, 0.4576486, 0.4590677, 0.4604715, 0.4618906, 0.4633097, 0.4647288, 0.4661631, 0.4675822, 0.4690166, 0.4704356, 0.47187, 0.4733043, 0.4747539, 0.4761883, 0.4776379, 0.4790875, 0.4805371, 0.4819867, 0.4834363, 0.4848859, 0.4863508, 0.4878157, 0.4892805, 0.4907454, 0.4922103, 0.4936904, 0.4951553, 0.4966354, 0.4981155, 0.4995956, 0.501091, 0.5025711, 0.5040665, 0.5055467, 0.507042, 0.5085527, 0.5100481, 0.5115435, 0.5130541, 0.5145647, 0.5160754, 0.517586, 0.5190967, 0.5206226, 0.5221485, 0.5236591, 0.525185, 0.5267262, 0.5282521, 0.529778, 0.5313191, 0.5328603, 0.5344015, 0.5359426, 0.537499, 0.5390402, 0.5405966, 0.542153, 0.5437095, 0.5452659, 0.5468223, 0.548394, 0.5499657, 0.5515373, 0.553109, 0.5546807, 0.5562524, 0.5578393, 0.5594263, 0.5610132, 0.5626001, 0.5641871, 0.565774, 0.5673762, 0.5689784, 0.5705806, 0.5721828, 0.573785, 0.5754025, 0.5770047, 0.5786221, 0.5802396, 0.581857, 0.5834897, 0.5851072, 0.5867399, 0.5883726, 0.5900053, 0.5916381, 0.5932708, 0.5949187, 0.5965667, 0.5982147, 0.5998627, 0.6015106, 0.6031586, 0.6048219, 0.6064851, 0.6081483, 0.6098116, 0.6114748, 0.6131533, 0.6148165, 0.616495, 0.6181735, 0.619852, 0.6215457, 0.6232242, 0.624918, 0.6266117, 0.6283055, 0.6299992, 0.631693, 0.633402, 0.635111, 0.63682, 0.638529, 0.640238, 0.6419471, 0.6436713, 0.6453956, 0.6471199, 0.6488441, 0.6505684, 0.6523079, 0.6540322, 0.6557717, 0.6575113, 0.6592508, 0.6610056, 0.6627451, 0.6644999, 0.6662547, 0.6680095, 0.6697642, 0.6715343, 0.6732891, 0.6750591, 0.6768292, 0.6785992, 0.6803845, 0.6821546, 0.6839399, 0.6857252, 0.6875105, 0.6892958, 0.6910811, 0.6928817, 0.6946822, 0.6964675, 0.6982834, 0.7000839, 0.7018845, 0.7037003, 0.7055161, 0.707332, 0.7091478, 0.7109636, 0.7127947, 0.7146105, 0.7164416, 0.7182727, 0.720119, 0.7219501, 0.7237964, 0.7256275, 0.7274739, 0.7293355, 0.7311818, 0.7330282, 0.7348898, 0.7367514, 0.738613, 0.7404746, 0.7423514, 0.744213, 0.7460899, 0.7479667, 0.7498436, 0.7517205, 0.7536126, 0.7554894, 0.7573816, 0.7592737, 0.7611658, 0.7630732, 0.7649653, 0.7668727, 0.76878, 0.7706874, 0.7725948, 0.7745174, 0.7764248, 0.7783474, 0.7802701, 0.7821927, 0.7841306, 0.7860533, 0.7879911, 0.789929, 0.7918669, 0.7938048, 0.795758, 0.7976959, 0.799649, 0.8016022, 0.8035554, 0.8055238, 0.8074769, 0.8094453, 0.8114137, 0.8133822, 0.8153506, 0.8173342, 0.8193179, 0.8212863, 0.82327, 0.8252689, 0.8272526, 0.8292515, 0.8312352, 0.8332341, 0.8352331, 0.8372473, 0.8392462, 0.8412604, 0.8432746, 0.8452888, 0.847303, 0.8493172, 0.8513466, 0.8533761, 0.8554055, 0.857435, 0.8594644, 0.8614939, 0.8635386, 0.8655833, 0.867628, 0.8696727, 0.8717327, 0.8737774, 0.8758373, 0.8778973, 0.8799573, 0.8820325, 0.8840925, 0.8861677, 0.8882429, 0.8903182, 0.8923934, 0.8944839, 0.8965591, 0.8986496, 0.9007401, 0.9028305, 0.9049363, 0.9070268, 0.9091325, 0.9112383, 0.913344, 0.915465, 0.9175708, 0.9196918, 0.9218128, 0.9239338, 0.9260548, 0.9281758, 0.930312, 0.9324483, 0.9345846, 0.9367208, 0.9388571, 0.9410086, 0.9431601, 0.9453117, 0.9474632, 0.9496147, 0.9517815, 0.953933, 0.9560998, 0.9582666, 0.9604334, 0.9626154, 0.9647822, 0.9669642, 0.9691463, 0.9713283, 0.9735256, 0.9757076, 0.9779049, 0.9801022, 0.9822995, 0.9844968, 0.9867094, 0.988922, 0.9911345, 0.9933471, 0.9955596, 0.9977722, 1.0
+[ICC Profile - 0x646d6464] Device Model Description = IEC 61966-2-1 Default RGB Colour Space - sRGB
+[ICC Profile - 0x6758595a] Green Colorant = (0,3851, 0,7169, 0,0971)
+[ICC Profile - 0x67545243] Green TRC = 0.0, 0.0000763, 0.0001526, 0.0002289, 0.0003052, 0.0003815, 0.0004578, 0.0005341, 0.0006104, 0.0006867, 0.000763, 0.0008392, 0.0009003, 0.0009766, 0.0010529, 0.0011292, 0.0012055, 0.0012818, 0.0013581, 0.0014343, 0.0015106, 0.0015869, 0.0016632, 0.0017395, 0.0018158, 0.0018921, 0.0019684, 0.0020447, 0.002121, 0.0021973, 0.0022736, 0.0023499, 0.0024262, 0.0025025, 0.0025788, 0.0026551, 0.0027161, 0.0027924, 0.0028687, 0.002945, 0.0030213, 0.0030976, 0.0031739, 0.0032502, 0.0033417, 0.003418, 0.0034943, 0.0035859, 0.0036622, 0.0037537, 0.00383, 0.0039216, 0.0040131, 0.0041047, 0.0041962, 0.0042878, 0.0043793, 0.0044709, 0.0045624, 0.0046693, 0.0047608, 0.0048524, 0.0049592, 0.005066, 0.0051575, 0.0052644, 0.0053712, 0.005478, 0.0055848, 0.0056916, 0.0057984, 0.0059052, 0.0060273, 0.0061341, 0.0062562, 0.006363, 0.0064851, 0.0066072, 0.0067292, 0.0068513, 0.0069734, 0.0070954, 0.0072175, 0.0073396, 0.0074617, 0.007599, 0.0077211, 0.0078584, 0.0079957, 0.0081178, 0.0082551, 0.0083925, 0.0085298, 0.0086671, 0.0088045, 0.008957, 0.0090944, 0.0092317, 0.0093843, 0.0095369, 0.0096742, 0.0098268, 0.0099794, 0.010132, 0.0102846, 0.0104372, 0.0105898, 0.0107576, 0.0109102, 0.0110628, 0.0112306, 0.0113985, 0.0115511, 0.0117189, 0.0118868, 0.0120546, 0.0122225, 0.0124056, 0.0125734, 0.0127413, 0.0129244, 0.0130922, 0.0132753, 0.0134585, 0.0136416, 0.0138247, 0.0140078, 0.0141909, 0.014374, 0.0145571, 0.0147555, 0.0149386, 0.0151369, 0.0153201, 0.0155184, 0.0157168, 0.0159152, 0.0161135, 0.0163119, 0.0165255, 0.0167239, 0.0169223, 0.0171359, 0.0173495, 0.0175479, 0.0177615, 0.0179751, 0.0181888, 0.0184024, 0.018616, 0.0188449, 0.0190585, 0.0192874, 0.019501, 0.0197299, 0.0199588, 0.0201877, 0.0204166, 0.0206455, 0.0208743, 0.0211032, 0.0213474, 0.0215763, 0.0218204, 0.0220645, 0.0222934, 0.0225376, 0.0227817, 0.0230259, 0.0232853, 0.0235294, 0.0237736, 0.024033, 0.0242771, 0.0245365, 0.0247959, 0.0250553, 0.0253147, 0.0255741, 0.0258335, 0.0261082, 0.0263676, 0.026627, 0.0269017, 0.0271763, 0.027451, 0.0277256, 0.0280003, 0.028275, 0.0285496, 0.0288243, 0.0291142, 0.0293889, 0.0296788, 0.0299687, 0.0302586, 0.0305486, 0.0308385, 0.0311284, 0.0314183, 0.0317235, 0.0320134, 0.0323186, 0.0326238, 0.032929, 0.0332341, 0.0335393, 0.0338445, 0.0341497, 0.0344549, 0.0347753, 0.0350805, 0.0354009, 0.0357214, 0.0360418, 0.0363622, 0.0366827, 0.0370031, 0.0373388, 0.0376593, 0.037995, 0.0383154, 0.0386511, 0.0389868, 0.0393225, 0.0396582, 0.0399939, 0.0403449, 0.0406806, 0.0410315, 0.0413825, 0.0417182, 0.0420691, 0.0424201, 0.042771, 0.0431373, 0.0434882, 0.0438392, 0.0442054, 0.0445716, 0.0449226, 0.0452888, 0.045655, 0.0460212, 0.0464027, 0.0467689, 0.0471504, 0.0475166, 0.0478981, 0.0482795, 0.048661, 0.0490425, 0.049424, 0.0498054, 0.0501869, 0.0505837, 0.0509804, 0.0513619, 0.0517586, 0.0521553, 0.0525521, 0.0529488, 0.0533608, 0.0537575, 0.0541695, 0.0545663, 0.0549783, 0.0553902, 0.0558022, 0.0562142, 0.0566262, 0.0570535, 0.0574655, 0.0578927, 0.05832, 0.058732, 0.0591592, 0.0595865, 0.060029, 0.0604562, 0.0608835, 0.061326, 0.0617533, 0.0621958, 0.0626383, 0.0630808, 0.0635233, 0.0639811, 0.0644236, 0.0648661, 0.0653239, 0.0657816, 0.0662394, 0.0666972, 0.067155, 0.0676127, 0.0680705, 0.0685435, 0.0690013, 0.0694743, 0.0699474, 0.0704204, 0.0708934, 0.0713664, 0.0718395, 0.0723278, 0.0728008, 0.0732891, 0.0737774, 0.0742657, 0.0747539, 0.0752422, 0.0757305, 0.0762188, 0.0767224, 0.0772259, 0.0777142, 0.0782177, 0.0787213, 0.0792401, 0.0797436, 0.0802472, 0.080766, 0.0812696, 0.0817884, 0.0823072, 0.082826, 0.0833448, 0.0838636, 0.0843977, 0.0849165, 0.0854505, 0.0859846, 0.0865187, 0.0870527, 0.0875868, 0.0881209, 0.0886549, 0.0892042, 0.0897536, 0.0902876, 0.090837, 0.0913863, 0.0919356, 0.0925002, 0.0930495, 0.0936141, 0.0941634, 0.094728, 0.0952926, 0.0958572, 0.0964218, 0.0970016, 0.0975662, 0.098146, 0.0987106, 0.0992905, 0.0998703, 0.1004501, 0.10103, 0.1016251, 0.1022049, 0.1028, 0.1033799, 0.103975, 0.1045701, 0.1051652, 0.1057755, 0.1063706, 0.106981, 0.1075761, 0.1081865, 0.1087968, 0.1094072, 0.1100175, 0.1106279, 0.1112535, 0.1118639, 0.1124895, 0.1131151, 0.1137407, 0.1143664, 0.114992, 0.1156176, 0.1162585, 0.1168841, 0.117525, 0.1181659, 0.1188067, 0.1194476, 0.1200885, 0.1207446, 0.1213855, 0.1220417, 0.1226978, 0.1233539, 0.1240101, 0.1246662, 0.1253223, 0.1259937, 0.1266499, 0.1273213, 0.1279927, 0.1286641, 0.1293355, 0.1300069, 0.1306935, 0.1313649, 0.1320516, 0.1327382, 0.1334096, 0.1341115, 0.1347982, 0.1354849, 0.1361868, 0.1368734, 0.1375753, 0.1382773, 0.1389792, 0.1396811, 0.140383, 0.1411002, 0.1418021, 0.1425193, 0.1432364, 0.1439536, 0.1446708, 0.145388, 0.1461204, 0.1468376, 0.14757, 0.1483024, 0.1490349, 0.1497673, 0.1504997, 0.1512322, 0.1519799, 0.1527123, 0.15346, 0.1542077, 0.1549554, 0.1557031, 0.1564508, 0.1572137, 0.1579767, 0.1587243, 0.1594873, 0.1602502, 0.1610132, 0.1617914, 0.1625544, 0.1633326, 0.1640955, 0.1648737, 0.1656519, 0.1664302, 0.1672236, 0.1680018, 0.1687953, 0.1695735, 0.170367, 0.1711604, 0.1719539, 0.1727474, 0.1735561, 0.1743496, 0.1751583, 0.175967, 0.1767758, 0.1775845, 0.1783932, 0.1792172, 0.1800259, 0.1808499, 0.1816739, 0.1824826, 0.1833219, 0.1841459, 0.1849699, 0.1858091, 0.1866331, 0.1874723, 0.1883116, 0.1891508, 0.1900053, 0.1908446, 0.1916838, 0.1925383, 0.1933928, 0.1942473, 0.1951019, 0.1959564, 0.1968261, 0.1976806, 0.1985504, 0.1994202, 0.2002899, 0.2011597, 0.2020294, 0.2028992, 0.2037842, 0.2046693, 0.205539, 0.206424, 0.2073243, 0.2082094, 0.2090944, 0.2099947, 0.2108949, 0.21178, 0.2126802, 0.2135958, 0.2144961, 0.2153964, 0.2163119, 0.2172274, 0.2181277, 0.2190585, 0.2199741, 0.2208896, 0.2218051, 0.2227359, 0.2236667, 0.2245975, 0.2255283, 0.2264591, 0.2273899, 0.228336, 0.2292821, 0.2302129, 0.2311589, 0.232105, 0.2330663, 0.2340124, 0.2349737, 0.2359197, 0.2368811, 0.2378424, 0.2388037, 0.239765, 0.2407416, 0.2417029, 0.2426795, 0.2436561, 0.2446326, 0.2456092, 0.2466011, 0.2475776, 0.2485695, 0.249546, 0.2505379, 0.2515297, 0.2525368, 0.2535286, 0.2545357, 0.2555276, 0.2565347, 0.2575418, 0.2585489, 0.259556, 0.2605783, 0.2615854, 0.2626078, 0.2636301, 0.2646525, 0.2656748, 0.2667124, 0.2677348, 0.2687724, 0.26981, 0.2708324, 0.2718853, 0.2729229, 0.2739605, 0.2750134, 0.276051, 0.2771038, 0.2781567, 0.2792248, 0.2802777, 0.2813306, 0.2823987, 0.2834668, 0.284535, 0.2856031, 0.2866712, 0.2877394, 0.2888228, 0.2899062, 0.2909743, 0.2920577, 0.2931563, 0.2942397, 0.2953231, 0.2964218, 0.2975204, 0.2986191, 0.2997177, 0.3008164, 0.301915, 0.3030289, 0.3041428, 0.3052567, 0.3063706, 0.3074846, 0.3085985, 0.3097124, 0.3108415, 0.3119707, 0.3130999, 0.314229, 0.3153582, 0.3165026, 0.3176318, 0.3187762, 0.3199207, 0.3210651, 0.3222095, 0.3233539, 0.3245136, 0.3256733, 0.3268177, 0.3279774, 0.3291371, 0.330312, 0.3314717, 0.3326467, 0.3338216, 0.3349966, 0.3361715, 0.3373465, 0.3385214, 0.3397116, 0.3408865, 0.3420768, 0.343267, 0.3444724, 0.3456626, 0.3468528, 0.3480583, 0.3492638, 0.3504692, 0.3516747, 0.3528801, 0.3541009, 0.3553063, 0.356527, 0.3577478, 0.3589685, 0.3601892, 0.3614252, 0.3626459, 0.3638819, 0.3651179, 0.3663539, 0.3675898, 0.3688411, 0.3700771, 0.3713283, 0.3725795, 0.3738308, 0.375082, 0.3763333, 0.3775998, 0.378851, 0.3801175, 0.381384, 0.3826505, 0.3839322, 0.3851987, 0.3864805, 0.387747, 0.3890288, 0.3903105, 0.3916075, 0.3928893, 0.3941863, 0.3954681, 0.3967651, 0.3980621, 0.3993744, 0.4006714, 0.4019837, 0.4032807, 0.404593, 0.4059052, 0.4072175, 0.4085451, 0.4098573, 0.4111849, 0.4125124, 0.4138399, 0.4151675, 0.416495, 0.4178378, 0.4191806, 0.4205234, 0.4218662, 0.423209, 0.4245518, 0.4259098, 0.4272526, 0.4286107, 0.4299687, 0.4313268, 0.4326848, 0.4340581, 0.4354314, 0.4367895, 0.4381628, 0.4395514, 0.4409247, 0.442298, 0.4436866, 0.4450752, 0.4464637, 0.4478523, 0.4492409, 0.4506447, 0.4520333, 0.4534371, 0.4548409, 0.4562448, 0.4576486, 0.4590677, 0.4604715, 0.4618906, 0.4633097, 0.4647288, 0.4661631, 0.4675822, 0.4690166, 0.4704356, 0.47187, 0.4733043, 0.4747539, 0.4761883, 0.4776379, 0.4790875, 0.4805371, 0.4819867, 0.4834363, 0.4848859, 0.4863508, 0.4878157, 0.4892805, 0.4907454, 0.4922103, 0.4936904, 0.4951553, 0.4966354, 0.4981155, 0.4995956, 0.501091, 0.5025711, 0.5040665, 0.5055467, 0.507042, 0.5085527, 0.5100481, 0.5115435, 0.5130541, 0.5145647, 0.5160754, 0.517586, 0.5190967, 0.5206226, 0.5221485, 0.5236591, 0.525185, 0.5267262, 0.5282521, 0.529778, 0.5313191, 0.5328603, 0.5344015, 0.5359426, 0.537499, 0.5390402, 0.5405966, 0.542153, 0.5437095, 0.5452659, 0.5468223, 0.548394, 0.5499657, 0.5515373, 0.553109, 0.5546807, 0.5562524, 0.5578393, 0.5594263, 0.5610132, 0.5626001, 0.5641871, 0.565774, 0.5673762, 0.5689784, 0.5705806, 0.5721828, 0.573785, 0.5754025, 0.5770047, 0.5786221, 0.5802396, 0.581857, 0.5834897, 0.5851072, 0.5867399, 0.5883726, 0.5900053, 0.5916381, 0.5932708, 0.5949187, 0.5965667, 0.5982147, 0.5998627, 0.6015106, 0.6031586, 0.6048219, 0.6064851, 0.6081483, 0.6098116, 0.6114748, 0.6131533, 0.6148165, 0.616495, 0.6181735, 0.619852, 0.6215457, 0.6232242, 0.624918, 0.6266117, 0.6283055, 0.6299992, 0.631693, 0.633402, 0.635111, 0.63682, 0.638529, 0.640238, 0.6419471, 0.6436713, 0.6453956, 0.6471199, 0.6488441, 0.6505684, 0.6523079, 0.6540322, 0.6557717, 0.6575113, 0.6592508, 0.6610056, 0.6627451, 0.6644999, 0.6662547, 0.6680095, 0.6697642, 0.6715343, 0.6732891, 0.6750591, 0.6768292, 0.6785992, 0.6803845, 0.6821546, 0.6839399, 0.6857252, 0.6875105, 0.6892958, 0.6910811, 0.6928817, 0.6946822, 0.6964675, 0.6982834, 0.7000839, 0.7018845, 0.7037003, 0.7055161, 0.707332, 0.7091478, 0.7109636, 0.7127947, 0.7146105, 0.7164416, 0.7182727, 0.720119, 0.7219501, 0.7237964, 0.7256275, 0.7274739, 0.7293355, 0.7311818, 0.7330282, 0.7348898, 0.7367514, 0.738613, 0.7404746, 0.7423514, 0.744213, 0.7460899, 0.7479667, 0.7498436, 0.7517205, 0.7536126, 0.7554894, 0.7573816, 0.7592737, 0.7611658, 0.7630732, 0.7649653, 0.7668727, 0.76878, 0.7706874, 0.7725948, 0.7745174, 0.7764248, 0.7783474, 0.7802701, 0.7821927, 0.7841306, 0.7860533, 0.7879911, 0.789929, 0.7918669, 0.7938048, 0.795758, 0.7976959, 0.799649, 0.8016022, 0.8035554, 0.8055238, 0.8074769, 0.8094453, 0.8114137, 0.8133822, 0.8153506, 0.8173342, 0.8193179, 0.8212863, 0.82327, 0.8252689, 0.8272526, 0.8292515, 0.8312352, 0.8332341, 0.8352331, 0.8372473, 0.8392462, 0.8412604, 0.8432746, 0.8452888, 0.847303, 0.8493172, 0.8513466, 0.8533761, 0.8554055, 0.857435, 0.8594644, 0.8614939, 0.8635386, 0.8655833, 0.867628, 0.8696727, 0.8717327, 0.8737774, 0.8758373, 0.8778973, 0.8799573, 0.8820325, 0.8840925, 0.8861677, 0.8882429, 0.8903182, 0.8923934, 0.8944839, 0.8965591, 0.8986496, 0.9007401, 0.9028305, 0.9049363, 0.9070268, 0.9091325, 0.9112383, 0.913344, 0.915465, 0.9175708, 0.9196918, 0.9218128, 0.9239338, 0.9260548, 0.9281758, 0.930312, 0.9324483, 0.9345846, 0.9367208, 0.9388571, 0.9410086, 0.9431601, 0.9453117, 0.9474632, 0.9496147, 0.9517815, 0.953933, 0.9560998, 0.9582666, 0.9604334, 0.9626154, 0.9647822, 0.9669642, 0.9691463, 0.9713283, 0.9735256, 0.9757076, 0.9779049, 0.9801022, 0.9822995, 0.9844968, 0.9867094, 0.988922, 0.9911345, 0.9933471, 0.9955596, 0.9977722, 1.0
+[ICC Profile - 0x6c756d69] Luminance = (0, 80, 0)
+[ICC Profile - 0x6d656173] Measurement = 1931 2° Observer, Backing (0, 0, 0), Geometry Unknown, Flare 0%, Illuminant D65
+[ICC Profile - 0x626b7074] Media Black Point = (0,0121, 0,0125, 0,0103)
+[ICC Profile - 0x7258595a] Red Colorant = (0,4361, 0,2225, 0,0139)
+[ICC Profile - 0x72545243] Red TRC = 0.0, 0.0000763, 0.0001526, 0.0002289, 0.0003052, 0.0003815, 0.0004578, 0.0005341, 0.0006104, 0.0006867, 0.000763, 0.0008392, 0.0009003, 0.0009766, 0.0010529, 0.0011292, 0.0012055, 0.0012818, 0.0013581, 0.0014343, 0.0015106, 0.0015869, 0.0016632, 0.0017395, 0.0018158, 0.0018921, 0.0019684, 0.0020447, 0.002121, 0.0021973, 0.0022736, 0.0023499, 0.0024262, 0.0025025, 0.0025788, 0.0026551, 0.0027161, 0.0027924, 0.0028687, 0.002945, 0.0030213, 0.0030976, 0.0031739, 0.0032502, 0.0033417, 0.003418, 0.0034943, 0.0035859, 0.0036622, 0.0037537, 0.00383, 0.0039216, 0.0040131, 0.0041047, 0.0041962, 0.0042878, 0.0043793, 0.0044709, 0.0045624, 0.0046693, 0.0047608, 0.0048524, 0.0049592, 0.005066, 0.0051575, 0.0052644, 0.0053712, 0.005478, 0.0055848, 0.0056916, 0.0057984, 0.0059052, 0.0060273, 0.0061341, 0.0062562, 0.006363, 0.0064851, 0.0066072, 0.0067292, 0.0068513, 0.0069734, 0.0070954, 0.0072175, 0.0073396, 0.0074617, 0.007599, 0.0077211, 0.0078584, 0.0079957, 0.0081178, 0.0082551, 0.0083925, 0.0085298, 0.0086671, 0.0088045, 0.008957, 0.0090944, 0.0092317, 0.0093843, 0.0095369, 0.0096742, 0.0098268, 0.0099794, 0.010132, 0.0102846, 0.0104372, 0.0105898, 0.0107576, 0.0109102, 0.0110628, 0.0112306, 0.0113985, 0.0115511, 0.0117189, 0.0118868, 0.0120546, 0.0122225, 0.0124056, 0.0125734, 0.0127413, 0.0129244, 0.0130922, 0.0132753, 0.0134585, 0.0136416, 0.0138247, 0.0140078, 0.0141909, 0.014374, 0.0145571, 0.0147555, 0.0149386, 0.0151369, 0.0153201, 0.0155184, 0.0157168, 0.0159152, 0.0161135, 0.0163119, 0.0165255, 0.0167239, 0.0169223, 0.0171359, 0.0173495, 0.0175479, 0.0177615, 0.0179751, 0.0181888, 0.0184024, 0.018616, 0.0188449, 0.0190585, 0.0192874, 0.019501, 0.0197299, 0.0199588, 0.0201877, 0.0204166, 0.0206455, 0.0208743, 0.0211032, 0.0213474, 0.0215763, 0.0218204, 0.0220645, 0.0222934, 0.0225376, 0.0227817, 0.0230259, 0.0232853, 0.0235294, 0.0237736, 0.024033, 0.0242771, 0.0245365, 0.0247959, 0.0250553, 0.0253147, 0.0255741, 0.0258335, 0.0261082, 0.0263676, 0.026627, 0.0269017, 0.0271763, 0.027451, 0.0277256, 0.0280003, 0.028275, 0.0285496, 0.0288243, 0.0291142, 0.0293889, 0.0296788, 0.0299687, 0.0302586, 0.0305486, 0.0308385, 0.0311284, 0.0314183, 0.0317235, 0.0320134, 0.0323186, 0.0326238, 0.032929, 0.0332341, 0.0335393, 0.0338445, 0.0341497, 0.0344549, 0.0347753, 0.0350805, 0.0354009, 0.0357214, 0.0360418, 0.0363622, 0.0366827, 0.0370031, 0.0373388, 0.0376593, 0.037995, 0.0383154, 0.0386511, 0.0389868, 0.0393225, 0.0396582, 0.0399939, 0.0403449, 0.0406806, 0.0410315, 0.0413825, 0.0417182, 0.0420691, 0.0424201, 0.042771, 0.0431373, 0.0434882, 0.0438392, 0.0442054, 0.0445716, 0.0449226, 0.0452888, 0.045655, 0.0460212, 0.0464027, 0.0467689, 0.0471504, 0.0475166, 0.0478981, 0.0482795, 0.048661, 0.0490425, 0.049424, 0.0498054, 0.0501869, 0.0505837, 0.0509804, 0.0513619, 0.0517586, 0.0521553, 0.0525521, 0.0529488, 0.0533608, 0.0537575, 0.0541695, 0.0545663, 0.0549783, 0.0553902, 0.0558022, 0.0562142, 0.0566262, 0.0570535, 0.0574655, 0.0578927, 0.05832, 0.058732, 0.0591592, 0.0595865, 0.060029, 0.0604562, 0.0608835, 0.061326, 0.0617533, 0.0621958, 0.0626383, 0.0630808, 0.0635233, 0.0639811, 0.0644236, 0.0648661, 0.0653239, 0.0657816, 0.0662394, 0.0666972, 0.067155, 0.0676127, 0.0680705, 0.0685435, 0.0690013, 0.0694743, 0.0699474, 0.0704204, 0.0708934, 0.0713664, 0.0718395, 0.0723278, 0.0728008, 0.0732891, 0.0737774, 0.0742657, 0.0747539, 0.0752422, 0.0757305, 0.0762188, 0.0767224, 0.0772259, 0.0777142, 0.0782177, 0.0787213, 0.0792401, 0.0797436, 0.0802472, 0.080766, 0.0812696, 0.0817884, 0.0823072, 0.082826, 0.0833448, 0.0838636, 0.0843977, 0.0849165, 0.0854505, 0.0859846, 0.0865187, 0.0870527, 0.0875868, 0.0881209, 0.0886549, 0.0892042, 0.0897536, 0.0902876, 0.090837, 0.0913863, 0.0919356, 0.0925002, 0.0930495, 0.0936141, 0.0941634, 0.094728, 0.0952926, 0.0958572, 0.0964218, 0.0970016, 0.0975662, 0.098146, 0.0987106, 0.0992905, 0.0998703, 0.1004501, 0.10103, 0.1016251, 0.1022049, 0.1028, 0.1033799, 0.103975, 0.1045701, 0.1051652, 0.1057755, 0.1063706, 0.106981, 0.1075761, 0.1081865, 0.1087968, 0.1094072, 0.1100175, 0.1106279, 0.1112535, 0.1118639, 0.1124895, 0.1131151, 0.1137407, 0.1143664, 0.114992, 0.1156176, 0.1162585, 0.1168841, 0.117525, 0.1181659, 0.1188067, 0.1194476, 0.1200885, 0.1207446, 0.1213855, 0.1220417, 0.1226978, 0.1233539, 0.1240101, 0.1246662, 0.1253223, 0.1259937, 0.1266499, 0.1273213, 0.1279927, 0.1286641, 0.1293355, 0.1300069, 0.1306935, 0.1313649, 0.1320516, 0.1327382, 0.1334096, 0.1341115, 0.1347982, 0.1354849, 0.1361868, 0.1368734, 0.1375753, 0.1382773, 0.1389792, 0.1396811, 0.140383, 0.1411002, 0.1418021, 0.1425193, 0.1432364, 0.1439536, 0.1446708, 0.145388, 0.1461204, 0.1468376, 0.14757, 0.1483024, 0.1490349, 0.1497673, 0.1504997, 0.1512322, 0.1519799, 0.1527123, 0.15346, 0.1542077, 0.1549554, 0.1557031, 0.1564508, 0.1572137, 0.1579767, 0.1587243, 0.1594873, 0.1602502, 0.1610132, 0.1617914, 0.1625544, 0.1633326, 0.1640955, 0.1648737, 0.1656519, 0.1664302, 0.1672236, 0.1680018, 0.1687953, 0.1695735, 0.170367, 0.1711604, 0.1719539, 0.1727474, 0.1735561, 0.1743496, 0.1751583, 0.175967, 0.1767758, 0.1775845, 0.1783932, 0.1792172, 0.1800259, 0.1808499, 0.1816739, 0.1824826, 0.1833219, 0.1841459, 0.1849699, 0.1858091, 0.1866331, 0.1874723, 0.1883116, 0.1891508, 0.1900053, 0.1908446, 0.1916838, 0.1925383, 0.1933928, 0.1942473, 0.1951019, 0.1959564, 0.1968261, 0.1976806, 0.1985504, 0.1994202, 0.2002899, 0.2011597, 0.2020294, 0.2028992, 0.2037842, 0.2046693, 0.205539, 0.206424, 0.2073243, 0.2082094, 0.2090944, 0.2099947, 0.2108949, 0.21178, 0.2126802, 0.2135958, 0.2144961, 0.2153964, 0.2163119, 0.2172274, 0.2181277, 0.2190585, 0.2199741, 0.2208896, 0.2218051, 0.2227359, 0.2236667, 0.2245975, 0.2255283, 0.2264591, 0.2273899, 0.228336, 0.2292821, 0.2302129, 0.2311589, 0.232105, 0.2330663, 0.2340124, 0.2349737, 0.2359197, 0.2368811, 0.2378424, 0.2388037, 0.239765, 0.2407416, 0.2417029, 0.2426795, 0.2436561, 0.2446326, 0.2456092, 0.2466011, 0.2475776, 0.2485695, 0.249546, 0.2505379, 0.2515297, 0.2525368, 0.2535286, 0.2545357, 0.2555276, 0.2565347, 0.2575418, 0.2585489, 0.259556, 0.2605783, 0.2615854, 0.2626078, 0.2636301, 0.2646525, 0.2656748, 0.2667124, 0.2677348, 0.2687724, 0.26981, 0.2708324, 0.2718853, 0.2729229, 0.2739605, 0.2750134, 0.276051, 0.2771038, 0.2781567, 0.2792248, 0.2802777, 0.2813306, 0.2823987, 0.2834668, 0.284535, 0.2856031, 0.2866712, 0.2877394, 0.2888228, 0.2899062, 0.2909743, 0.2920577, 0.2931563, 0.2942397, 0.2953231, 0.2964218, 0.2975204, 0.2986191, 0.2997177, 0.3008164, 0.301915, 0.3030289, 0.3041428, 0.3052567, 0.3063706, 0.3074846, 0.3085985, 0.3097124, 0.3108415, 0.3119707, 0.3130999, 0.314229, 0.3153582, 0.3165026, 0.3176318, 0.3187762, 0.3199207, 0.3210651, 0.3222095, 0.3233539, 0.3245136, 0.3256733, 0.3268177, 0.3279774, 0.3291371, 0.330312, 0.3314717, 0.3326467, 0.3338216, 0.3349966, 0.3361715, 0.3373465, 0.3385214, 0.3397116, 0.3408865, 0.3420768, 0.343267, 0.3444724, 0.3456626, 0.3468528, 0.3480583, 0.3492638, 0.3504692, 0.3516747, 0.3528801, 0.3541009, 0.3553063, 0.356527, 0.3577478, 0.3589685, 0.3601892, 0.3614252, 0.3626459, 0.3638819, 0.3651179, 0.3663539, 0.3675898, 0.3688411, 0.3700771, 0.3713283, 0.3725795, 0.3738308, 0.375082, 0.3763333, 0.3775998, 0.378851, 0.3801175, 0.381384, 0.3826505, 0.3839322, 0.3851987, 0.3864805, 0.387747, 0.3890288, 0.3903105, 0.3916075, 0.3928893, 0.3941863, 0.3954681, 0.3967651, 0.3980621, 0.3993744, 0.4006714, 0.4019837, 0.4032807, 0.404593, 0.4059052, 0.4072175, 0.4085451, 0.4098573, 0.4111849, 0.4125124, 0.4138399, 0.4151675, 0.416495, 0.4178378, 0.4191806, 0.4205234, 0.4218662, 0.423209, 0.4245518, 0.4259098, 0.4272526, 0.4286107, 0.4299687, 0.4313268, 0.4326848, 0.4340581, 0.4354314, 0.4367895, 0.4381628, 0.4395514, 0.4409247, 0.442298, 0.4436866, 0.4450752, 0.4464637, 0.4478523, 0.4492409, 0.4506447, 0.4520333, 0.4534371, 0.4548409, 0.4562448, 0.4576486, 0.4590677, 0.4604715, 0.4618906, 0.4633097, 0.4647288, 0.4661631, 0.4675822, 0.4690166, 0.4704356, 0.47187, 0.4733043, 0.4747539, 0.4761883, 0.4776379, 0.4790875, 0.4805371, 0.4819867, 0.4834363, 0.4848859, 0.4863508, 0.4878157, 0.4892805, 0.4907454, 0.4922103, 0.4936904, 0.4951553, 0.4966354, 0.4981155, 0.4995956, 0.501091, 0.5025711, 0.5040665, 0.5055467, 0.507042, 0.5085527, 0.5100481, 0.5115435, 0.5130541, 0.5145647, 0.5160754, 0.517586, 0.5190967, 0.5206226, 0.5221485, 0.5236591, 0.525185, 0.5267262, 0.5282521, 0.529778, 0.5313191, 0.5328603, 0.5344015, 0.5359426, 0.537499, 0.5390402, 0.5405966, 0.542153, 0.5437095, 0.5452659, 0.5468223, 0.548394, 0.5499657, 0.5515373, 0.553109, 0.5546807, 0.5562524, 0.5578393, 0.5594263, 0.5610132, 0.5626001, 0.5641871, 0.565774, 0.5673762, 0.5689784, 0.5705806, 0.5721828, 0.573785, 0.5754025, 0.5770047, 0.5786221, 0.5802396, 0.581857, 0.5834897, 0.5851072, 0.5867399, 0.5883726, 0.5900053, 0.5916381, 0.5932708, 0.5949187, 0.5965667, 0.5982147, 0.5998627, 0.6015106, 0.6031586, 0.6048219, 0.6064851, 0.6081483, 0.6098116, 0.6114748, 0.6131533, 0.6148165, 0.616495, 0.6181735, 0.619852, 0.6215457, 0.6232242, 0.624918, 0.6266117, 0.6283055, 0.6299992, 0.631693, 0.633402, 0.635111, 0.63682, 0.638529, 0.640238, 0.6419471, 0.6436713, 0.6453956, 0.6471199, 0.6488441, 0.6505684, 0.6523079, 0.6540322, 0.6557717, 0.6575113, 0.6592508, 0.6610056, 0.6627451, 0.6644999, 0.6662547, 0.6680095, 0.6697642, 0.6715343, 0.6732891, 0.6750591, 0.6768292, 0.6785992, 0.6803845, 0.6821546, 0.6839399, 0.6857252, 0.6875105, 0.6892958, 0.6910811, 0.6928817, 0.6946822, 0.6964675, 0.6982834, 0.7000839, 0.7018845, 0.7037003, 0.7055161, 0.707332, 0.7091478, 0.7109636, 0.7127947, 0.7146105, 0.7164416, 0.7182727, 0.720119, 0.7219501, 0.7237964, 0.7256275, 0.7274739, 0.7293355, 0.7311818, 0.7330282, 0.7348898, 0.7367514, 0.738613, 0.7404746, 0.7423514, 0.744213, 0.7460899, 0.7479667, 0.7498436, 0.7517205, 0.7536126, 0.7554894, 0.7573816, 0.7592737, 0.7611658, 0.7630732, 0.7649653, 0.7668727, 0.76878, 0.7706874, 0.7725948, 0.7745174, 0.7764248, 0.7783474, 0.7802701, 0.7821927, 0.7841306, 0.7860533, 0.7879911, 0.789929, 0.7918669, 0.7938048, 0.795758, 0.7976959, 0.799649, 0.8016022, 0.8035554, 0.8055238, 0.8074769, 0.8094453, 0.8114137, 0.8133822, 0.8153506, 0.8173342, 0.8193179, 0.8212863, 0.82327, 0.8252689, 0.8272526, 0.8292515, 0.8312352, 0.8332341, 0.8352331, 0.8372473, 0.8392462, 0.8412604, 0.8432746, 0.8452888, 0.847303, 0.8493172, 0.8513466, 0.8533761, 0.8554055, 0.857435, 0.8594644, 0.8614939, 0.8635386, 0.8655833, 0.867628, 0.8696727, 0.8717327, 0.8737774, 0.8758373, 0.8778973, 0.8799573, 0.8820325, 0.8840925, 0.8861677, 0.8882429, 0.8903182, 0.8923934, 0.8944839, 0.8965591, 0.8986496, 0.9007401, 0.9028305, 0.9049363, 0.9070268, 0.9091325, 0.9112383, 0.913344, 0.915465, 0.9175708, 0.9196918, 0.9218128, 0.9239338, 0.9260548, 0.9281758, 0.930312, 0.9324483, 0.9345846, 0.9367208, 0.9388571, 0.9410086, 0.9431601, 0.9453117, 0.9474632, 0.9496147, 0.9517815, 0.953933, 0.9560998, 0.9582666, 0.9604334, 0.9626154, 0.9647822, 0.9669642, 0.9691463, 0.9713283, 0.9735256, 0.9757076, 0.9779049, 0.9801022, 0.9822995, 0.9844968, 0.9867094, 0.988922, 0.9911345, 0.9933471, 0.9955596, 0.9977722, 1.0
+[ICC Profile - 0x74656368] Technology = CRT 
+[ICC Profile - 0x76756564] Viewing Conditions Description = Reference Viewing Condition in IEC 61966-2-1
+[ICC Profile - 0x77747074] Media White Point = (0,9642, 1, 0,8249)
+[ICC Profile - 0x63707274] Copyright = Copyright International Color Consortium, 2009
+[ICC Profile - 0x63686164] Chromatic Adaptation = sf32 (0x73663332): 44 bytes
 
 [File - 0x0001] File Name = rgb24prof.bmp
 [File - 0x0002] File Size = 27782 bytes
 [File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
 
 - BMP Header
+    - ICC Profile
 - File
 
 Generated using metadata-extractor
diff --git a/bmp/bmpsuite/q/metadata/rgb24prof2.bmp.txt b/bmp/bmpsuite/q/metadata/rgb24prof2.bmp.txt
index 02faf5e..c03c6c5 100644
--- a/bmp/bmpsuite/q/metadata/rgb24prof2.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgb24prof2.bmp.txt
@@ -1,15 +1,57 @@
 FILE: rgb24prof2.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 124
+[ERROR: ICC Profile] ICC data describes an invalid date/time: year=10 month=1998 day=19 hour=30 minute=52 second=42
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 124
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 24
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000c] Red Mask = 0x00000000
+[BMP Header - 0x000d] Green Mask = 0x00000000
+[BMP Header - 0x000e] Blue Mask = 0x00000000
+[BMP Header - 0x000f] Alpha Mask = 0x00000000
+[BMP Header - 0x0010] Color Space Type = Embedded Profile
+[BMP Header - 0x0011] Red Gamma Curve = 0
+[BMP Header - 0x0012] Green Gamma Curve = 0
+[BMP Header - 0x0013] Blue Gamma Curve = 0
+[BMP Header - 0x0014] Rendering Intent = Picture, Perceptual
+
+[ICC Profile - 0x0000] Profile Size = 540
+[ICC Profile - 0x0004] CMM Type = ADBE
+[ICC Profile - 0x0008] Version = 2.1.0
+[ICC Profile - 0x000c] Class = Display Device
+[ICC Profile - 0x0010] Color space = RGB 
+[ICC Profile - 0x0014] Profile Connection Space = XYZ 
+[ICC Profile - 0x0024] Signature = acsp
+[ICC Profile - 0x0028] Primary Platform = Microsoft Corporation
+[ICC Profile - 0x0030] Device manufacturer = none
+[ICC Profile - 0x0044] XYZ values = 0,964 1 0,825
+[ICC Profile - 0x0080] Tag Count = 10
+[ICC Profile - 0x63707274] Copyright = (c) 1998 Adobe Systems Inc.
+[ICC Profile - 0x64657363] Profile Description = Custom RGB
+[ICC Profile - 0x77747074] Media White Point = (0,9505, 1, 1,0891)
+[ICC Profile - 0x626b7074] Media Black Point = (0, 0, 0)
+[ICC Profile - 0x72545243] Red TRC = 0.0085908
+[ICC Profile - 0x67545243] Green TRC = 0.0085908
+[ICC Profile - 0x62545243] Blue TRC = 0.0085908
+[ICC Profile - 0x7258595a] Red Colorant = (0,3851, 0,7169, 0,0971)
+[ICC Profile - 0x6758595a] Green Colorant = (0,436, 0,2225, 0,0139)
+[ICC Profile - 0x6258595a] Blue Colorant = (0,1431, 0,0606, 0,7139)
 
 [File - 0x0001] File Name = rgb24prof2.bmp
 [File - 0x0002] File Size = 25254 bytes
 [File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
 
 - BMP Header
+    - ICC Profile
 - File
 
 Generated using metadata-extractor
diff --git a/bmp/bmpsuite/q/metadata/rgb32-111110.bmp.txt b/bmp/bmpsuite/q/metadata/rgb32-111110.bmp.txt
index 5fcc4d6..0ad2c6e 100644
--- a/bmp/bmpsuite/q/metadata/rgb32-111110.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgb32-111110.bmp.txt
@@ -1,12 +1,13 @@
 FILE: rgb32-111110.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
 [BMP Header - 0x0003] Planes = 1
 [BMP Header - 0x0004] Bits Per Pixel = 32
-[BMP Header - 0x0005] Compression = Huffman 1D
+[BMP Header - 0x0005] Compression = Bit Fields
 [BMP Header - 0x0006] X Pixels per Meter = 2835
 [BMP Header - 0x0007] Y Pixels per Meter = 2835
 [BMP Header - 0x0008] Palette Colour Count = 0
diff --git a/bmp/bmpsuite/q/metadata/rgb32-7187.bmp.txt b/bmp/bmpsuite/q/metadata/rgb32-7187.bmp.txt
index 7b00a87..dd21445 100644
--- a/bmp/bmpsuite/q/metadata/rgb32-7187.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgb32-7187.bmp.txt
@@ -1,12 +1,13 @@
 FILE: rgb32-7187.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
 [BMP Header - 0x0003] Planes = 1
 [BMP Header - 0x0004] Bits Per Pixel = 32
-[BMP Header - 0x0005] Compression = Huffman 1D
+[BMP Header - 0x0005] Compression = Bit Fields
 [BMP Header - 0x0006] X Pixels per Meter = 2835
 [BMP Header - 0x0007] Y Pixels per Meter = 2835
 [BMP Header - 0x0008] Palette Colour Count = 0
diff --git a/bmp/bmpsuite/q/metadata/rgb32-xbgr.bmp.txt b/bmp/bmpsuite/q/metadata/rgb32-xbgr.bmp.txt
index 5b4598b..9a30a08 100644
--- a/bmp/bmpsuite/q/metadata/rgb32-xbgr.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgb32-xbgr.bmp.txt
@@ -1,9 +1,26 @@
 FILE: rgb32-xbgr.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 124
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 124
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 32
+[BMP Header - 0x0005] Compression = Bit Fields
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000c] Red Mask = 0xFF000000
+[BMP Header - 0x000d] Green Mask = 0x00FF0000
+[BMP Header - 0x000e] Blue Mask = 0x0000FF00
+[BMP Header - 0x000f] Alpha Mask = 0x00000000
+[BMP Header - 0x0010] Color Space Type = sRGB Color Space
+[BMP Header - 0x0011] Red Gamma Curve = 0
+[BMP Header - 0x0012] Green Gamma Curve = 0
+[BMP Header - 0x0013] Blue Gamma Curve = 0
+[BMP Header - 0x0014] Rendering Intent = Picture, Perceptual
 
 [File - 0x0001] File Name = rgb32-xbgr.bmp
 [File - 0x0002] File Size = 32650 bytes
diff --git a/bmp/bmpsuite/q/metadata/rgb32fakealpha.bmp.txt b/bmp/bmpsuite/q/metadata/rgb32fakealpha.bmp.txt
index 63227cd..f7d7d5f 100644
--- a/bmp/bmpsuite/q/metadata/rgb32fakealpha.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgb32fakealpha.bmp.txt
@@ -1,6 +1,7 @@
 FILE: rgb32fakealpha.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
diff --git a/bmp/bmpsuite/q/metadata/rgb32h52.bmp.txt b/bmp/bmpsuite/q/metadata/rgb32h52.bmp.txt
index 81de247..5dde5dd 100644
--- a/bmp/bmpsuite/q/metadata/rgb32h52.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgb32h52.bmp.txt
@@ -1,9 +1,20 @@
 FILE: rgb32h52.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 52
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 52
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 32
+[BMP Header - 0x0005] Compression = Bit Fields
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000c] Red Mask = 0xFF000000
+[BMP Header - 0x000d] Green Mask = 0x0000FF00
+[BMP Header - 0x000e] Blue Mask = 0x000000FF
 
 [File - 0x0001] File Name = rgb32h52.bmp
 [File - 0x0002] File Size = 32578 bytes
diff --git a/bmp/bmpsuite/q/metadata/rgba16-1924.bmp.txt b/bmp/bmpsuite/q/metadata/rgba16-1924.bmp.txt
index 2119c7d..365aba9 100644
--- a/bmp/bmpsuite/q/metadata/rgba16-1924.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgba16-1924.bmp.txt
@@ -1,9 +1,26 @@
 FILE: rgba16-1924.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 124
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 124
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 16
+[BMP Header - 0x0005] Compression = Bit Fields
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000c] Red Mask = 0x00000800
+[BMP Header - 0x000d] Green Mask = 0x000001FF
+[BMP Header - 0x000e] Blue Mask = 0x00000600
+[BMP Header - 0x000f] Alpha Mask = 0x0000F000
+[BMP Header - 0x0010] Color Space Type = sRGB Color Space
+[BMP Header - 0x0011] Red Gamma Curve = 0
+[BMP Header - 0x0012] Green Gamma Curve = 0
+[BMP Header - 0x0013] Blue Gamma Curve = 0
+[BMP Header - 0x0014] Rendering Intent = Picture, Perceptual
 
 [File - 0x0001] File Name = rgba16-1924.bmp
 [File - 0x0002] File Size = 16522 bytes
diff --git a/bmp/bmpsuite/q/metadata/rgba16-4444.bmp.txt b/bmp/bmpsuite/q/metadata/rgba16-4444.bmp.txt
index 1173c88..418b1cf 100644
--- a/bmp/bmpsuite/q/metadata/rgba16-4444.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgba16-4444.bmp.txt
@@ -1,9 +1,26 @@
 FILE: rgba16-4444.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 124
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 124
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 16
+[BMP Header - 0x0005] Compression = Bit Fields
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000c] Red Mask = 0x00000F00
+[BMP Header - 0x000d] Green Mask = 0x000000F0
+[BMP Header - 0x000e] Blue Mask = 0x0000000F
+[BMP Header - 0x000f] Alpha Mask = 0x0000F000
+[BMP Header - 0x0010] Color Space Type = sRGB Color Space
+[BMP Header - 0x0011] Red Gamma Curve = 0
+[BMP Header - 0x0012] Green Gamma Curve = 0
+[BMP Header - 0x0013] Blue Gamma Curve = 0
+[BMP Header - 0x0014] Rendering Intent = Picture, Perceptual
 
 [File - 0x0001] File Name = rgba16-4444.bmp
 [File - 0x0002] File Size = 16522 bytes
diff --git a/bmp/bmpsuite/q/metadata/rgba16-5551.bmp.txt b/bmp/bmpsuite/q/metadata/rgba16-5551.bmp.txt
index 22e8e02..ed454d6 100644
--- a/bmp/bmpsuite/q/metadata/rgba16-5551.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgba16-5551.bmp.txt
@@ -1,9 +1,26 @@
 FILE: rgba16-5551.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 124
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 124
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 16
+[BMP Header - 0x0005] Compression = Bit Fields
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000c] Red Mask = 0x00007C00
+[BMP Header - 0x000d] Green Mask = 0x000003E0
+[BMP Header - 0x000e] Blue Mask = 0x0000001F
+[BMP Header - 0x000f] Alpha Mask = 0x00008000
+[BMP Header - 0x0010] Color Space Type = sRGB Color Space
+[BMP Header - 0x0011] Red Gamma Curve = 0
+[BMP Header - 0x0012] Green Gamma Curve = 0
+[BMP Header - 0x0013] Blue Gamma Curve = 0
+[BMP Header - 0x0014] Rendering Intent = Picture, Perceptual
 
 [File - 0x0001] File Name = rgba16-5551.bmp
 [File - 0x0002] File Size = 16522 bytes
diff --git a/bmp/bmpsuite/q/metadata/rgba32-1010102.bmp.txt b/bmp/bmpsuite/q/metadata/rgba32-1010102.bmp.txt
index 0218e69..e95ba53 100644
--- a/bmp/bmpsuite/q/metadata/rgba32-1010102.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgba32-1010102.bmp.txt
@@ -1,9 +1,26 @@
 FILE: rgba32-1010102.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 124
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 124
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 32
+[BMP Header - 0x0005] Compression = Bit Fields
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000c] Red Mask = 0x3FF00000
+[BMP Header - 0x000d] Green Mask = 0x000FFC00
+[BMP Header - 0x000e] Blue Mask = 0x000003FF
+[BMP Header - 0x000f] Alpha Mask = 0xC0000000
+[BMP Header - 0x0010] Color Space Type = sRGB Color Space
+[BMP Header - 0x0011] Red Gamma Curve = 0
+[BMP Header - 0x0012] Green Gamma Curve = 0
+[BMP Header - 0x0013] Blue Gamma Curve = 0
+[BMP Header - 0x0014] Rendering Intent = Picture, Perceptual
 
 [File - 0x0001] File Name = rgba32-1010102.bmp
 [File - 0x0002] File Size = 32650 bytes
diff --git a/bmp/bmpsuite/q/metadata/rgba32-61754.bmp.txt b/bmp/bmpsuite/q/metadata/rgba32-61754.bmp.txt
index 80a83da..5b654a9 100644
--- a/bmp/bmpsuite/q/metadata/rgba32-61754.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgba32-61754.bmp.txt
@@ -1,9 +1,26 @@
 FILE: rgba32-61754.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 124
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 124
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 32
+[BMP Header - 0x0005] Compression = Bit Fields
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000c] Red Mask = 0x0FC00000
+[BMP Header - 0x000d] Green Mask = 0x003FFFE0
+[BMP Header - 0x000e] Blue Mask = 0x0000001F
+[BMP Header - 0x000f] Alpha Mask = 0xF0000000
+[BMP Header - 0x0010] Color Space Type = sRGB Color Space
+[BMP Header - 0x0011] Red Gamma Curve = 0
+[BMP Header - 0x0012] Green Gamma Curve = 0
+[BMP Header - 0x0013] Blue Gamma Curve = 0
+[BMP Header - 0x0014] Rendering Intent = Picture, Perceptual
 
 [File - 0x0001] File Name = rgba32-61754.bmp
 [File - 0x0002] File Size = 32650 bytes
diff --git a/bmp/bmpsuite/q/metadata/rgba32-81284.bmp.txt b/bmp/bmpsuite/q/metadata/rgba32-81284.bmp.txt
index c4669cc..37a6a36 100644
--- a/bmp/bmpsuite/q/metadata/rgba32-81284.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgba32-81284.bmp.txt
@@ -1,9 +1,26 @@
 FILE: rgba32-81284.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 124
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 124
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 32
+[BMP Header - 0x0005] Compression = Bit Fields
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000c] Red Mask = 0x0000FF00
+[BMP Header - 0x000d] Green Mask = 0x0FFF0000
+[BMP Header - 0x000e] Blue Mask = 0x000000FF
+[BMP Header - 0x000f] Alpha Mask = 0xF0000000
+[BMP Header - 0x0010] Color Space Type = sRGB Color Space
+[BMP Header - 0x0011] Red Gamma Curve = 0
+[BMP Header - 0x0012] Green Gamma Curve = 0
+[BMP Header - 0x0013] Blue Gamma Curve = 0
+[BMP Header - 0x0014] Rendering Intent = Picture, Perceptual
 
 [File - 0x0001] File Name = rgba32-81284.bmp
 [File - 0x0002] File Size = 32650 bytes
diff --git a/bmp/bmpsuite/q/metadata/rgba32.bmp.txt b/bmp/bmpsuite/q/metadata/rgba32.bmp.txt
index f079748..2872d3b 100644
--- a/bmp/bmpsuite/q/metadata/rgba32.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgba32.bmp.txt
@@ -1,9 +1,26 @@
 FILE: rgba32.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 124
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 124
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 32
+[BMP Header - 0x0005] Compression = Bit Fields
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000c] Red Mask = 0xFF000000
+[BMP Header - 0x000d] Green Mask = 0x0000FF00
+[BMP Header - 0x000e] Blue Mask = 0x000000FF
+[BMP Header - 0x000f] Alpha Mask = 0x00FF0000
+[BMP Header - 0x0010] Color Space Type = sRGB Color Space
+[BMP Header - 0x0011] Red Gamma Curve = 0
+[BMP Header - 0x0012] Green Gamma Curve = 0
+[BMP Header - 0x0013] Blue Gamma Curve = 0
+[BMP Header - 0x0014] Rendering Intent = Picture, Perceptual
 
 [File - 0x0001] File Name = rgba32.bmp
 [File - 0x0002] File Size = 32650 bytes
diff --git a/bmp/bmpsuite/q/metadata/rgba32abf.bmp.txt b/bmp/bmpsuite/q/metadata/rgba32abf.bmp.txt
index adddc43..dffa19e 100644
--- a/bmp/bmpsuite/q/metadata/rgba32abf.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgba32abf.bmp.txt
@@ -1,12 +1,13 @@
 FILE: rgba32abf.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 127
 [BMP Header - 0x0001] Image Height = 64
 [BMP Header - 0x0003] Planes = 1
 [BMP Header - 0x0004] Bits Per Pixel = 32
-[BMP Header - 0x0005] Compression = Bit field
+[BMP Header - 0x0005] Compression = RGBA Bit Fields
 [BMP Header - 0x0006] X Pixels per Meter = 2835
 [BMP Header - 0x0007] Y Pixels per Meter = 2835
 [BMP Header - 0x0008] Palette Colour Count = 0
diff --git a/bmp/bmpsuite/q/metadata/rgba32h56.bmp.txt b/bmp/bmpsuite/q/metadata/rgba32h56.bmp.txt
index 8b57b49..f838cdb 100644
--- a/bmp/bmpsuite/q/metadata/rgba32h56.bmp.txt
+++ b/bmp/bmpsuite/q/metadata/rgba32h56.bmp.txt
@@ -1,9 +1,21 @@
 FILE: rgba32h56.bmp
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 56
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 56
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 32
+[BMP Header - 0x0005] Compression = Bit Fields
+[BMP Header - 0x0006] X Pixels per Meter = 2835
+[BMP Header - 0x0007] Y Pixels per Meter = 2835
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000c] Red Mask = 0xFF000000
+[BMP Header - 0x000d] Green Mask = 0x0000FF00
+[BMP Header - 0x000e] Blue Mask = 0x000000FF
+[BMP Header - 0x000f] Alpha Mask = 0x00FF0000
 
 [File - 0x0001] File Name = rgba32h56.bmp
 [File - 0x0002] File Size = 32582 bytes
diff --git a/bmp/bmpsuite/x/metadata/ba-bm.bmp.txt b/bmp/bmpsuite/x/metadata/ba-bm.bmp.txt
index 5141a8e..70ef46f 100644
--- a/bmp/bmpsuite/x/metadata/ba-bm.bmp.txt
+++ b/bmp/bmpsuite/x/metadata/ba-bm.bmp.txt
@@ -1,7 +1,19 @@
 FILE: ba-bm.bmp
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Standard
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 127
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 8
+
+[File - 0x0001] File Name = ba-bm.bmp
+[File - 0x0002] File Size = 9000 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/1-2-3.ICO.txt b/bmp/metadata/1-2-3.ICO.txt
index 655b60f..3f9725a 100644
--- a/bmp/metadata/1-2-3.ICO.txt
+++ b/bmp/metadata/1-2-3.ICO.txt
@@ -1,7 +1,41 @@
 FILE: 1-2-3.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 3622
+[BMP Header - 0x0007] Y Pixels per Meter = 3622
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[File - 0x0001] File Name = 1-2-3.ICO
+[File - 0x0002] File Size = 4452 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/1-2-3_02.ICO.txt b/bmp/metadata/1-2-3_02.ICO.txt
index f0ebffc..1fafc5f 100644
--- a/bmp/metadata/1-2-3_02.ICO.txt
+++ b/bmp/metadata/1-2-3_02.ICO.txt
@@ -1,7 +1,27 @@
 FILE: 1-2-3_02.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = 1-2-3_02.ICO
+[File - 0x0002] File Size = 2448 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/1-2-3_03.ICO.txt b/bmp/metadata/1-2-3_03.ICO.txt
index 96e78c8..e2edd14 100644
--- a/bmp/metadata/1-2-3_03.ICO.txt
+++ b/bmp/metadata/1-2-3_03.ICO.txt
@@ -1,7 +1,35 @@
 FILE: 1-2-3_03.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 64
+[BMP Header - 0x0001] Image Height = 128
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = 1-2-3_03.ICO
+[File - 0x0002] File Size = 5640 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/123-2.ICO.txt b/bmp/metadata/123-2.ICO.txt
index 79622b6..3b713f3 100644
--- a/bmp/metadata/123-2.ICO.txt
+++ b/bmp/metadata/123-2.ICO.txt
@@ -1,7 +1,26 @@
 FILE: 123-2.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 2
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[File - 0x0001] File Name = 123-2.ICO
+[File - 0x0002] File Size = 1010 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/16color-10x10.bmp.txt b/bmp/metadata/16color-10x10.bmp.txt
index f97c62d..f3bc17b 100644
--- a/bmp/metadata/16color-10x10.bmp.txt
+++ b/bmp/metadata/16color-10x10.bmp.txt
@@ -1,6 +1,7 @@
 FILE: 16color-10x10.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 10
 [BMP Header - 0x0001] Image Height = 10
diff --git a/bmp/metadata/1_Dollar.ICO.txt b/bmp/metadata/1_Dollar.ICO.txt
index 625f673..a7dea0d 100644
--- a/bmp/metadata/1_Dollar.ICO.txt
+++ b/bmp/metadata/1_Dollar.ICO.txt
@@ -1,7 +1,41 @@
 FILE: 1_Dollar.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 3622
+[BMP Header - 0x0007] Y Pixels per Meter = 3622
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[File - 0x0001] File Name = 1_Dollar.ICO
+[File - 0x0002] File Size = 4452 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/24bpp-10x10.bmp.txt b/bmp/metadata/24bpp-10x10.bmp.txt
index 7a1aea4..3711bfd 100644
--- a/bmp/metadata/24bpp-10x10.bmp.txt
+++ b/bmp/metadata/24bpp-10x10.bmp.txt
@@ -1,6 +1,7 @@
 FILE: 24bpp-10x10.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 10
 [BMP Header - 0x0001] Image Height = 10
diff --git a/bmp/metadata/256color-10x10.bmp.txt b/bmp/metadata/256color-10x10.bmp.txt
index 1d60688..bf9e297 100644
--- a/bmp/metadata/256color-10x10.bmp.txt
+++ b/bmp/metadata/256color-10x10.bmp.txt
@@ -1,6 +1,7 @@
 FILE: 256color-10x10.bmp
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 10
 [BMP Header - 0x0001] Image Height = 10
diff --git a/bmp/metadata/ARROW1.ICO.txt b/bmp/metadata/ARROW1.ICO.txt
index dc07be3..7855822 100644
--- a/bmp/metadata/ARROW1.ICO.txt
+++ b/bmp/metadata/ARROW1.ICO.txt
@@ -1,7 +1,19 @@
 FILE: ARROW1.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = ARROW1.ICO
+[File - 0x0002] File Size = 888 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/ARROWS.ICO.txt b/bmp/metadata/ARROWS.ICO.txt
index fc4cf29..557f3ea 100644
--- a/bmp/metadata/ARROWS.ICO.txt
+++ b/bmp/metadata/ARROWS.ICO.txt
@@ -1,7 +1,19 @@
 FILE: ARROWS.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = ARROWS.ICO
+[File - 0x0002] File Size = 888 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/AVFU.ICO.txt b/bmp/metadata/AVFU.ICO.txt
index b81da67..fdfe926 100644
--- a/bmp/metadata/AVFU.ICO.txt
+++ b/bmp/metadata/AVFU.ICO.txt
@@ -1,7 +1,51 @@
 FILE: AVFU.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = AVFU.ICO
+[File - 0x0002] File Size = 3498 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/AaronK-1.ICO.txt b/bmp/metadata/AaronK-1.ICO.txt
index 2090bcb..2b49993 100644
--- a/bmp/metadata/AaronK-1.ICO.txt
+++ b/bmp/metadata/AaronK-1.ICO.txt
@@ -1,7 +1,41 @@
 FILE: AaronK-1.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 3622
+[BMP Header - 0x0007] Y Pixels per Meter = 3622
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[File - 0x0001] File Name = AaronK-1.ICO
+[File - 0x0002] File Size = 4452 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Add_Program.ICO.txt b/bmp/metadata/Add_Program.ICO.txt
index 30b98dd..3e6df0b 100644
--- a/bmp/metadata/Add_Program.ICO.txt
+++ b/bmp/metadata/Add_Program.ICO.txt
@@ -1,7 +1,67 @@
 FILE: Add_Program.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = Add_Program.ICO
+[File - 0x0002] File Size = 4026 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/AddrBk-1.ICO.txt b/bmp/metadata/AddrBk-1.ICO.txt
index c61db1b..26e105b 100644
--- a/bmp/metadata/AddrBk-1.ICO.txt
+++ b/bmp/metadata/AddrBk-1.ICO.txt
@@ -1,7 +1,59 @@
 FILE: AddrBk-1.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = AddrBk-1.ICO
+[File - 0x0002] File Size = 3932 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/AddrBk-2.ICO.txt b/bmp/metadata/AddrBk-2.ICO.txt
index 0264254..c802857 100644
--- a/bmp/metadata/AddrBk-2.ICO.txt
+++ b/bmp/metadata/AddrBk-2.ICO.txt
@@ -1,7 +1,51 @@
 FILE: AddrBk-2.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = AddrBk-2.ICO
+[File - 0x0002] File Size = 3130 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Alarm.ICO.txt b/bmp/metadata/Alarm.ICO.txt
index 8870f22..5ac0e2f 100644
--- a/bmp/metadata/Alarm.ICO.txt
+++ b/bmp/metadata/Alarm.ICO.txt
@@ -1,7 +1,35 @@
 FILE: Alarm.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = Alarm.ICO
+[File - 0x0002] File Size = 5528 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/AlexTo-1.ICO.txt b/bmp/metadata/AlexTo-1.ICO.txt
index 4f8ebd4..40cb1cf 100644
--- a/bmp/metadata/AlexTo-1.ICO.txt
+++ b/bmp/metadata/AlexTo-1.ICO.txt
@@ -1,7 +1,41 @@
 FILE: AlexTo-1.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 3622
+[BMP Header - 0x0007] Y Pixels per Meter = 3622
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[File - 0x0001] File Name = AlexTo-1.ICO
+[File - 0x0002] File Size = 4452 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/BOOKC.ICO.txt b/bmp/metadata/BOOKC.ICO.txt
index 25bf10f..39a8ecc 100644
--- a/bmp/metadata/BOOKC.ICO.txt
+++ b/bmp/metadata/BOOKC.ICO.txt
@@ -1,7 +1,67 @@
 FILE: BOOKC.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = BOOKC.ICO
+[File - 0x0002] File Size = 4026 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Backgammon.ICO.txt b/bmp/metadata/Backgammon.ICO.txt
index 07bd196..bc265bc 100644
--- a/bmp/metadata/Backgammon.ICO.txt
+++ b/bmp/metadata/Backgammon.ICO.txt
@@ -1,7 +1,86 @@
 FILE: Backgammon.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 3622
+[BMP Header - 0x0007] Y Pixels per Meter = 3622
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[File - 0x0001] File Name = Backgammon.ICO
+[File - 0x0002] File Size = 4066 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Backup.ICO.txt b/bmp/metadata/Backup.ICO.txt
index c35bee2..6bd0f3d 100644
--- a/bmp/metadata/Backup.ICO.txt
+++ b/bmp/metadata/Backup.ICO.txt
@@ -1,7 +1,27 @@
 FILE: Backup.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = Backup.ICO
+[File - 0x0002] File Size = 2448 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Balloon.ICO.txt b/bmp/metadata/Balloon.ICO.txt
index a45f508..8c89f5a 100644
--- a/bmp/metadata/Balloon.ICO.txt
+++ b/bmp/metadata/Balloon.ICO.txt
@@ -1,7 +1,26 @@
 FILE: Balloon.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[File - 0x0001] File Name = Balloon.ICO
+[File - 0x0002] File Size = 996 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Benchmark.ICO.txt b/bmp/metadata/Benchmark.ICO.txt
index 04bf11a..62b76fb 100644
--- a/bmp/metadata/Benchmark.ICO.txt
+++ b/bmp/metadata/Benchmark.ICO.txt
@@ -1,7 +1,56 @@
 FILE: Benchmark.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[File - 0x0001] File Name = Benchmark.ICO
+[File - 0x0002] File Size = 1814 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Book 01.ICO.txt b/bmp/metadata/Book 01.ICO.txt
index 846568e..8a99c23 100644
--- a/bmp/metadata/Book 01.ICO.txt	
+++ b/bmp/metadata/Book 01.ICO.txt	
@@ -1,7 +1,41 @@
 FILE: Book 01.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 2
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 3622
+[BMP Header - 0x0007] Y Pixels per Meter = 3622
+[BMP Header - 0x0008] Palette Colour Count = 2
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[File - 0x0001] File Name = Book 01.ICO
+[File - 0x0002] File Size = 2692 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Book 03.ICO.txt b/bmp/metadata/Book 03.ICO.txt
index 7a7ce1e..9387fb1 100644
--- a/bmp/metadata/Book 03.ICO.txt	
+++ b/bmp/metadata/Book 03.ICO.txt	
@@ -1,7 +1,27 @@
 FILE: Book 03.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = Book 03.ICO
+[File - 0x0002] File Size = 3008 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Book 04.ICO.txt b/bmp/metadata/Book 04.ICO.txt
index bc0eaa6..e682a21 100644
--- a/bmp/metadata/Book 04.ICO.txt	
+++ b/bmp/metadata/Book 04.ICO.txt	
@@ -1,7 +1,26 @@
 FILE: Book 04.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[File - 0x0001] File Name = Book 04.ICO
+[File - 0x0002] File Size = 996 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Book-123.ICO.txt b/bmp/metadata/Book-123.ICO.txt
index ad5a25a..1f9e77c 100644
--- a/bmp/metadata/Book-123.ICO.txt
+++ b/bmp/metadata/Book-123.ICO.txt
@@ -1,7 +1,43 @@
 FILE: Book-123.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = Book-123.ICO
+[File - 0x0002] File Size = 3036 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Book-About.ICO.txt b/bmp/metadata/Book-About.ICO.txt
index ae7825a..47746ce 100644
--- a/bmp/metadata/Book-About.ICO.txt
+++ b/bmp/metadata/Book-About.ICO.txt
@@ -1,7 +1,51 @@
 FILE: Book-About.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = Book-About.ICO
+[File - 0x0002] File Size = 5018 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/C.ICO.txt b/bmp/metadata/C.ICO.txt
index 3e44794..b344639 100644
--- a/bmp/metadata/C.ICO.txt
+++ b/bmp/metadata/C.ICO.txt
@@ -1,7 +1,26 @@
 FILE: C.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[File - 0x0001] File Name = C.ICO
+[File - 0x0002] File Size = 996 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/CDPlyr-1.ICO.txt b/bmp/metadata/CDPlyr-1.ICO.txt
index 8212e6e..028809e 100644
--- a/bmp/metadata/CDPlyr-1.ICO.txt
+++ b/bmp/metadata/CDPlyr-1.ICO.txt
@@ -1,7 +1,86 @@
 FILE: CDPlyr-1.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 2
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 2
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 2
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 2
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 3622
+[BMP Header - 0x0007] Y Pixels per Meter = 3622
+[BMP Header - 0x0008] Palette Colour Count = 2
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[File - 0x0001] File Name = CDPlyr-1.ICO
+[File - 0x0002] File Size = 4042 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/CDPlyr-2.ICO.txt b/bmp/metadata/CDPlyr-2.ICO.txt
index f8cf3ba..a42fe02 100644
--- a/bmp/metadata/CDPlyr-2.ICO.txt
+++ b/bmp/metadata/CDPlyr-2.ICO.txt
@@ -1,7 +1,67 @@
 FILE: CDPlyr-2.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = CDPlyr-2.ICO
+[File - 0x0002] File Size = 4395 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/COFEE1.ICO.txt b/bmp/metadata/COFEE1.ICO.txt
index 0e070eb..f9ee4ab 100644
--- a/bmp/metadata/COFEE1.ICO.txt
+++ b/bmp/metadata/COFEE1.ICO.txt
@@ -1,7 +1,19 @@
 FILE: COFEE1.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = COFEE1.ICO
+[File - 0x0002] File Size = 2106 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Cacatus.ICO.txt b/bmp/metadata/Cacatus.ICO.txt
index c4cd96e..3fec908 100644
--- a/bmp/metadata/Cacatus.ICO.txt
+++ b/bmp/metadata/Cacatus.ICO.txt
@@ -1,7 +1,19 @@
 FILE: Cacatus.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = Cacatus.ICO
+[File - 0x0002] File Size = 2106 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Call_Manager.ICO.txt b/bmp/metadata/Call_Manager.ICO.txt
index 2472c93..7549538 100644
--- a/bmp/metadata/Call_Manager.ICO.txt
+++ b/bmp/metadata/Call_Manager.ICO.txt
@@ -1,7 +1,51 @@
 FILE: Call_Manager.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = Call_Manager.ICO
+[File - 0x0002] File Size = 3130 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Calvin&Hobbes.ICO.txt b/bmp/metadata/Calvin&Hobbes.ICO.txt
index 18d7e63..9d41f2d 100644
--- a/bmp/metadata/Calvin&Hobbes.ICO.txt
+++ b/bmp/metadata/Calvin&Hobbes.ICO.txt
@@ -1,7 +1,27 @@
 FILE: Calvin&Hobbes.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = Calvin&Hobbes.ICO
+[File - 0x0002] File Size = 3968 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Camera-2.ICO.txt b/bmp/metadata/Camera-2.ICO.txt
index 13b17e0..0dcae0e 100644
--- a/bmp/metadata/Camera-2.ICO.txt
+++ b/bmp/metadata/Camera-2.ICO.txt
@@ -1,7 +1,43 @@
 FILE: Camera-2.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = Camera-2.ICO
+[File - 0x0002] File Size = 3036 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Clip.ICO.txt b/bmp/metadata/Clip.ICO.txt
index fb79591..9078eee 100644
--- a/bmp/metadata/Clip.ICO.txt
+++ b/bmp/metadata/Clip.ICO.txt
@@ -1,7 +1,51 @@
 FILE: Clip.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = Clip.ICO
+[File - 0x0002] File Size = 3130 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Computr1.ICO.txt b/bmp/metadata/Computr1.ICO.txt
index ad6e88a..7b1c51c 100644
--- a/bmp/metadata/Computr1.ICO.txt
+++ b/bmp/metadata/Computr1.ICO.txt
@@ -1,7 +1,41 @@
 FILE: Computr1.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 2
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 3622
+[BMP Header - 0x0007] Y Pixels per Meter = 3622
+[BMP Header - 0x0008] Palette Colour Count = 2
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[File - 0x0001] File Name = Computr1.ICO
+[File - 0x0002] File Size = 4452 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/ConfigSys.ICO.txt b/bmp/metadata/ConfigSys.ICO.txt
index c5f7346..bf46b75 100644
--- a/bmp/metadata/ConfigSys.ICO.txt
+++ b/bmp/metadata/ConfigSys.ICO.txt
@@ -1,7 +1,59 @@
 FILE: ConfigSys.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = ConfigSys.ICO
+[File - 0x0002] File Size = 6578 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Contact.ICO.txt b/bmp/metadata/Contact.ICO.txt
index bb05d68..478ad11 100644
--- a/bmp/metadata/Contact.ICO.txt
+++ b/bmp/metadata/Contact.ICO.txt
@@ -1,7 +1,35 @@
 FILE: Contact.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = Contact.ICO
+[File - 0x0002] File Size = 5528 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/DataConv.ICO.txt b/bmp/metadata/DataConv.ICO.txt
index 3f86ada..703ad5b 100644
--- a/bmp/metadata/DataConv.ICO.txt
+++ b/bmp/metadata/DataConv.ICO.txt
@@ -1,7 +1,86 @@
 FILE: DataConv.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 2
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 2
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 2
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 2
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 3622
+[BMP Header - 0x0007] Y Pixels per Meter = 3622
+[BMP Header - 0x0008] Palette Colour Count = 2
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[File - 0x0001] File Name = DataConv.ICO
+[File - 0x0002] File Size = 3982 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Diag-01.ICO.txt b/bmp/metadata/Diag-01.ICO.txt
index 90c353c..f01d056 100644
--- a/bmp/metadata/Diag-01.ICO.txt
+++ b/bmp/metadata/Diag-01.ICO.txt
@@ -1,7 +1,35 @@
 FILE: Diag-01.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = Diag-01.ICO
+[File - 0x0002] File Size = 5528 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Direct.ICO.txt b/bmp/metadata/Direct.ICO.txt
index d7cc0d3..7d7ef5f 100644
--- a/bmp/metadata/Direct.ICO.txt
+++ b/bmp/metadata/Direct.ICO.txt
@@ -1,7 +1,27 @@
 FILE: Direct.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = Direct.ICO
+[File - 0x0002] File Size = 2448 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Drive_C.ICO.txt b/bmp/metadata/Drive_C.ICO.txt
index 2d2188e..244f5bc 100644
--- a/bmp/metadata/Drive_C.ICO.txt
+++ b/bmp/metadata/Drive_C.ICO.txt
@@ -1,7 +1,116 @@
 FILE: Drive_C.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 3622
+[BMP Header - 0x0007] Y Pixels per Meter = 3622
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 3622
+[BMP Header - 0x0007] Y Pixels per Meter = 3622
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 3622
+[BMP Header - 0x0007] Y Pixels per Meter = 3622
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[File - 0x0001] File Name = Drive_C.ICO
+[File - 0x0002] File Size = 4676 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Drives-8.ICO.txt b/bmp/metadata/Drives-8.ICO.txt
index f3a0ef1..e1ee682 100644
--- a/bmp/metadata/Drives-8.ICO.txt
+++ b/bmp/metadata/Drives-8.ICO.txt
@@ -1,7 +1,67 @@
 FILE: Drives-8.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = Drives-8.ICO
+[File - 0x0002] File Size = 4026 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/FaxPrint.ICO.txt b/bmp/metadata/FaxPrint.ICO.txt
index 5ca4251..bcdeef2 100644
--- a/bmp/metadata/FaxPrint.ICO.txt
+++ b/bmp/metadata/FaxPrint.ICO.txt
@@ -1,7 +1,51 @@
 FILE: FaxPrint.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Monochrome Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = FaxPrint.ICO
+[File - 0x0002] File Size = 3130 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Fence.ICO.txt b/bmp/metadata/Fence.ICO.txt
index ee4de11..82714c8 100644
--- a/bmp/metadata/Fence.ICO.txt
+++ b/bmp/metadata/Fence.ICO.txt
@@ -1,7 +1,41 @@
 FILE: Fence.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 3622
+[BMP Header - 0x0007] Y Pixels per Meter = 3622
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[File - 0x0001] File Name = Fence.ICO
+[File - 0x0002] File Size = 4452 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/FileCab8.ICO.txt b/bmp/metadata/FileCab8.ICO.txt
index 1a3e6e4..3b72c1a 100644
--- a/bmp/metadata/FileCab8.ICO.txt
+++ b/bmp/metadata/FileCab8.ICO.txt
@@ -1,7 +1,59 @@
 FILE: FileCab8.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = FileCab8.ICO
+[File - 0x0002] File Size = 3932 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Folder-C.ICO.txt b/bmp/metadata/Folder-C.ICO.txt
index 05d4ac2..ec83a20 100644
--- a/bmp/metadata/Folder-C.ICO.txt
+++ b/bmp/metadata/Folder-C.ICO.txt
@@ -1,7 +1,59 @@
 FILE: Folder-C.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = Folder-C.ICO
+[File - 0x0002] File Size = 3932 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Help-01.ICO.txt b/bmp/metadata/Help-01.ICO.txt
index 79bfbc3..a9f73ce 100644
--- a/bmp/metadata/Help-01.ICO.txt
+++ b/bmp/metadata/Help-01.ICO.txt
@@ -1,7 +1,101 @@
 FILE: Help-01.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 64
+[BMP Header - 0x0001] Image Height = 128
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 64
+[BMP Header - 0x0001] Image Height = 128
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 2667
+[BMP Header - 0x0007] Y Pixels per Meter = 2667
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 2667
+[BMP Header - 0x0007] Y Pixels per Meter = 2000
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 64
+[BMP Header - 0x0001] Image Height = 128
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 3622
+[BMP Header - 0x0007] Y Pixels per Meter = 3622
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 2667
+[BMP Header - 0x0007] Y Pixels per Meter = 1111
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 2
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[File - 0x0001] File Name = Help-01.ICO
+[File - 0x0002] File Size = 13756 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Jeep.ICO.txt b/bmp/metadata/Jeep.ICO.txt
index 413ee62..04b26cc 100644
--- a/bmp/metadata/Jeep.ICO.txt
+++ b/bmp/metadata/Jeep.ICO.txt
@@ -1,7 +1,43 @@
 FILE: Jeep.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = Jeep.ICO
+[File - 0x0002] File Size = 3036 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/MEMSIZE.BMP.txt b/bmp/metadata/MEMSIZE.BMP.txt
index 7237c29..83328f5 100644
--- a/bmp/metadata/MEMSIZE.BMP.txt
+++ b/bmp/metadata/MEMSIZE.BMP.txt
@@ -1,7 +1,19 @@
 FILE: MEMSIZE.BMP
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Standard
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 64
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 4
+
+[File - 0x0001] File Name = MEMSIZE.BMP
+[File - 0x0002] File Size = 2136 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/MEMSIZE.ICO.txt b/bmp/metadata/MEMSIZE.ICO.txt
index 6a537ba..94b17e6 100644
--- a/bmp/metadata/MEMSIZE.ICO.txt
+++ b/bmp/metadata/MEMSIZE.ICO.txt
@@ -1,7 +1,27 @@
 FILE: MEMSIZE.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 64
+[BMP Header - 0x0001] Image Height = 128
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = MEMSIZE.ICO
+[File - 0x0002] File Size = 4080 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/QC.BMP.txt b/bmp/metadata/QC.BMP.txt
index f4ad46d..1c02e46 100644
--- a/bmp/metadata/QC.BMP.txt
+++ b/bmp/metadata/QC.BMP.txt
@@ -1,6 +1,7 @@
 FILE: QC.BMP
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 12
 [BMP Header - 0x0002] Image Width = 58
 [BMP Header - 0x0001] Image Height = 79
diff --git a/bmp/metadata/QCb.BMP.txt b/bmp/metadata/QCb.BMP.txt
index 1e30677..7693643 100644
--- a/bmp/metadata/QCb.BMP.txt
+++ b/bmp/metadata/QCb.BMP.txt
@@ -1,9 +1,19 @@
 FILE: QCb.BMP
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 64
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 82
+[BMP Header - 0x0001] Image Height = 112
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 4
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
 
 [File - 0x0001] File Name = QCb.BMP
 [File - 0x0002] File Size = 5070 bytes
diff --git a/bmp/metadata/QD.BMP.txt b/bmp/metadata/QD.BMP.txt
index 025ee97..741bb03 100644
--- a/bmp/metadata/QD.BMP.txt
+++ b/bmp/metadata/QD.BMP.txt
@@ -1,6 +1,7 @@
 FILE: QD.BMP
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 12
 [BMP Header - 0x0002] Image Width = 58
 [BMP Header - 0x0001] Image Height = 79
diff --git a/bmp/metadata/QDb.BMP.txt b/bmp/metadata/QDb.BMP.txt
index 3f94023..ac703dd 100644
--- a/bmp/metadata/QDb.BMP.txt
+++ b/bmp/metadata/QDb.BMP.txt
@@ -1,9 +1,19 @@
 FILE: QDb.BMP
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 64
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 82
+[BMP Header - 0x0001] Image Height = 112
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 4
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
 
 [File - 0x0001] File Name = QDb.BMP
 [File - 0x0002] File Size = 5070 bytes
diff --git a/bmp/metadata/QH.BMP.txt b/bmp/metadata/QH.BMP.txt
index 3052680..3425a83 100644
--- a/bmp/metadata/QH.BMP.txt
+++ b/bmp/metadata/QH.BMP.txt
@@ -1,6 +1,7 @@
 FILE: QH.BMP
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 12
 [BMP Header - 0x0002] Image Width = 58
 [BMP Header - 0x0001] Image Height = 79
diff --git a/bmp/metadata/QHb.BMP.txt b/bmp/metadata/QHb.BMP.txt
index f146165..afbbd32 100644
--- a/bmp/metadata/QHb.BMP.txt
+++ b/bmp/metadata/QHb.BMP.txt
@@ -1,9 +1,19 @@
 FILE: QHb.BMP
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 64
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 82
+[BMP Header - 0x0001] Image Height = 112
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 4
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
 
 [File - 0x0001] File Name = QHb.BMP
 [File - 0x0002] File Size = 5070 bytes
diff --git a/bmp/metadata/QS.BMP.txt b/bmp/metadata/QS.BMP.txt
index 1e77a6d..125b3b1 100644
--- a/bmp/metadata/QS.BMP.txt
+++ b/bmp/metadata/QS.BMP.txt
@@ -1,6 +1,7 @@
 FILE: QS.BMP
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 12
 [BMP Header - 0x0002] Image Width = 58
 [BMP Header - 0x0001] Image Height = 79
diff --git a/bmp/metadata/QSb.BMP.txt b/bmp/metadata/QSb.BMP.txt
index 64c50c5..c4d1a80 100644
--- a/bmp/metadata/QSb.BMP.txt
+++ b/bmp/metadata/QSb.BMP.txt
@@ -1,9 +1,19 @@
 FILE: QSb.BMP
 TYPE: BMP
 
-[ERROR: BMP Header] Unexpected DIB header size: 64
-
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 82
+[BMP Header - 0x0001] Image Height = 112
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 4
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 0
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
 
 [File - 0x0001] File Name = QSb.BMP
 [File - 0x0002] File Size = 5070 bytes
diff --git a/bmp/metadata/SPADE.BMP.txt b/bmp/metadata/SPADE.BMP.txt
index 8448e63..092f53b 100644
--- a/bmp/metadata/SPADE.BMP.txt
+++ b/bmp/metadata/SPADE.BMP.txt
@@ -1,7 +1,26 @@
 FILE: SPADE.BMP
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Standard
+[BMP Header - 0xffffffff] Header Size = 64
+[BMP Header - 0x0002] Image Width = 58
+[BMP Header - 0x0001] Image Height = 79
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 4
+[BMP Header - 0x0005] Compression = None
+[BMP Header - 0x0006] X Pixels per Meter = 0
+[BMP Header - 0x0007] Y Pixels per Meter = 0
+[BMP Header - 0x0008] Palette Colour Count = 16
+[BMP Header - 0x0009] Important Colour Count = 0
+[BMP Header - 0x000a] Rendering = No Halftoning Algorithm
+[BMP Header - 0x000b] Color Encoding = RGB
+
+[File - 0x0001] File Name = SPADE.BMP
+[File - 0x0002] File Size = 2684 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Toolbox 07.ICO.txt b/bmp/metadata/Toolbox 07.ICO.txt
index be0629c..640d542 100644
--- a/bmp/metadata/Toolbox 07.ICO.txt	
+++ b/bmp/metadata/Toolbox 07.ICO.txt	
@@ -1,7 +1,35 @@
 FILE: Toolbox 07.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = Toolbox 07.ICO
+[File - 0x0002] File Size = 2968 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/WRITE.ICO.txt b/bmp/metadata/WRITE.ICO.txt
index 07133a1..158e4b7 100644
--- a/bmp/metadata/WRITE.ICO.txt
+++ b/bmp/metadata/WRITE.ICO.txt
@@ -1,7 +1,19 @@
 FILE: WRITE.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = WRITE.ICO
+[File - 0x0002] File Size = 888 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/Yogi.ICO.txt b/bmp/metadata/Yogi.ICO.txt
index 3d5b419..200c96b 100644
--- a/bmp/metadata/Yogi.ICO.txt
+++ b/bmp/metadata/Yogi.ICO.txt
@@ -1,7 +1,19 @@
 FILE: Yogi.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = Yogi.ICO
+[File - 0x0002] File Size = 2106 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/disk drive.ICO.txt b/bmp/metadata/disk drive.ICO.txt
index 42af285..874f9b8 100644
--- a/bmp/metadata/disk drive.ICO.txt	
+++ b/bmp/metadata/disk drive.ICO.txt	
@@ -1,7 +1,51 @@
 FILE: disk drive.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = disk drive.ICO
+[File - 0x0002] File Size = 3498 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/drives.ICO.txt b/bmp/metadata/drives.ICO.txt
index 19ac087..e35f5c7 100644
--- a/bmp/metadata/drives.ICO.txt
+++ b/bmp/metadata/drives.ICO.txt
@@ -1,7 +1,51 @@
 FILE: drives.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = drives.ICO
+[File - 0x0002] File Size = 3498 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/glossary.ICO.txt b/bmp/metadata/glossary.ICO.txt
index c3ae6bd..628aaf0 100644
--- a/bmp/metadata/glossary.ICO.txt
+++ b/bmp/metadata/glossary.ICO.txt
@@ -1,7 +1,51 @@
 FILE: glossary.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = glossary.ICO
+[File - 0x0002] File Size = 3498 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/programming.BMP.txt b/bmp/metadata/programming.BMP.txt
index 6db87d4..0a52cc2 100644
--- a/bmp/metadata/programming.BMP.txt
+++ b/bmp/metadata/programming.BMP.txt
@@ -1,6 +1,7 @@
 FILE: programming.BMP
 TYPE: BMP
 
+[BMP Header - 0xfffffffe] Bitmap type = Standard
 [BMP Header - 0xffffffff] Header Size = 40
 [BMP Header - 0x0002] Image Width = 76
 [BMP Header - 0x0001] Image Height = 72
diff --git a/bmp/metadata/shredder.ICO.txt b/bmp/metadata/shredder.ICO.txt
index 87c65ab..8875181 100644
--- a/bmp/metadata/shredder.ICO.txt
+++ b/bmp/metadata/shredder.ICO.txt
@@ -1,7 +1,51 @@
 FILE: shredder.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = shredder.ICO
+[File - 0x0002] File Size = 3498 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/
diff --git a/bmp/metadata/winos2 full screen.ICO.txt b/bmp/metadata/winos2 full screen.ICO.txt
index f6a90fd..bc27cad 100644
--- a/bmp/metadata/winos2 full screen.ICO.txt	
+++ b/bmp/metadata/winos2 full screen.ICO.txt	
@@ -1,7 +1,51 @@
 FILE: winos2 full screen.ICO
-TYPE: UNKNOWN
+TYPE: BMP
 
-EXCEPTION: File format is not supported
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 16
+[BMP Header - 0x0001] Image Height = 32
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 32
+[BMP Header - 0x0001] Image Height = 64
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 40
+[BMP Header - 0x0001] Image Height = 80
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[BMP Header - 0xfffffffe] Bitmap type = Color Icon
+[BMP Header - 0xffffffff] Header Size = 12
+[BMP Header - 0x0002] Image Width = 20
+[BMP Header - 0x0001] Image Height = 40
+[BMP Header - 0x0003] Planes = 1
+[BMP Header - 0x0004] Bits Per Pixel = 1
+
+[File - 0x0001] File Name = winos2 full screen.ICO
+[File - 0x0002] File Size = 3498 bytes
+[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
+
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- BMP Header
+- File
 
 Generated using metadata-extractor
 https://drewnoakes.com/code/exif/

ExtendBmpDiff.diff.txt

@Nadahar Nadahar mentioned this pull request Mar 4, 2017
Merged
@drewnoakes drewnoakes merged commit e834526 into drewnoakes:master Mar 15, 2017
@drewnoakes
Copy link
Owner

Looks great. Very thorough.

Generic formatting methods have gravitated towards TagDescriptor<T> historically. They're fine where they are now though.

You might like this.

drewnoakes added a commit to drewnoakes/metadata-extractor-images that referenced this pull request Mar 15, 2017
@drewnoakes
BMP output updates following drewnoakes/metadata-extractor#250
f3796c4
@Nadahar
Copy link
Contributor Author

Nadahar commented Mar 15, 2017

@drewnoakes Thanks for the tip, much better.

@kwhopper kwhopper mentioned this pull request Sep 8, 2018
Closed
Nadahar pushed a commit to Nadahar/metadata-extractor-images that referenced this pull request Oct 4, 2018
@drewnoakes @Nadahar
BMP output updates following drewnoakes/metadata-extractor#250
162f103
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Nadahar @drewnoakes