--- a/image/test/reftest/bmp/bmpsuite/b/reftest.list
+++ b/image/test/reftest/bmp/bmpsuite/b/reftest.list
@@ -5,17 +5,17 @@
 # BMP: bihsize=40, 127 x 64, bpp=30000, compression=0, colors=2
 # "Header indicates an absurdly large number of bits/pixel."
 # [We reject it. So does Chromium.]
 == wrapper.html?badbitcount.bmp about:blank
 
 # BMP: bihsize=40, 127 x 64, bpp=1, compression=0, colors=2
 # "Header incorrectly indicates that the bitmap is several GB in size."
 # [We accept it. So does Chromium.]
-== badbitssize.bmp pal1.png
+fuzzy(1,926) == badbitssize.bmp pal1.png
 
 # BMP: bihsize=40, 127 x 64, bpp=1, compression=0, colors=2
 # BMP: bihsize=40, 127 x 64, bpp=1, compression=0, colors=2
 # "Density (pixels per meter) suggests the image is much larger in one
 # dimension than the other."
 # [We accept them. So does Chromium.]
 == baddens1.bmp pal1.png
 == baddens2.bmp pal1.png
@@ -67,17 +67,17 @@
 # [We reject it. So does Chromium.]
 == wrapper.html?reallybig.bmp about:blank
 
 # BMP: bihsize=40, 127 x -64, bpp=8, compression=1, colors=252
 # "An RLE-compressed image that tries to use top-down orientation, which isn’t
 # allowed."
 # [We accept it. Chromium rejects it. Accepting seems better given that we can
 # decode it perfectly well.]
-fuzzy(1,899) == rletopdown.bmp pal8.png
+fuzzy(1,996) == rletopdown.bmp pal8.png
 
 # BMP: bihsize=40, 127 x 64, bpp=1, compression=0, colors=2
 # "A file that has been truncated in the middle of the bitmap."
 # [We accept it, drawing the part that is present and leaving the rest black.
 # Chromium draws the part that is present and leaves the rest transparent.
 # Using black for the invalid part is arguably better because it makes the
 # image edges more obvious.]
 == shortfile.bmp shortfile.png

--- a/image/test/reftest/bmp/bmpsuite/g/reftest.list
+++ b/image/test/reftest/bmp/bmpsuite/g/reftest.list
@@ -1,81 +1,81 @@
 # bmpsuite "good" tests
 
 # See ../README.mozilla for details.
 
 # BMP: bihsize=40, 127 x 64, bpp=1, compression=0, colors=2
 # "1 bit/pixel paletted image, in which black is the first color in the
 # palette."
-== pal1.bmp pal1.png
+fuzzy(1,926) == pal1.bmp pal1.png
 
 # BMP: bihsize=40, 127 x 64, bpp=1, compression=0, colors=2
 # "1 bit/pixel paletted image, in which white is the first color in the
 # palette."
-== pal1wb.bmp pal1.png
+fuzzy(1,926) == pal1wb.bmp pal1.png
 
 # BMP: bihsize=40, 127 x 64, bpp=1, compression=0, colors=2
 # "1 bit/pixel paletted image, with colors other than black and white."
 == pal1bg.bmp pal1bg.png
 
 # BMP: bihsize=40, 127 x 64, bpp=4, compression=0, colors=12
 # "Paletted image with 12 palette colors, and 4 bits/pixel."
 == pal4.bmp pal4.png
 
 # BMP: bihsize=40, 127 x 64, bpp=4, compression=2, colors=12
 # "4-bit image that uses RLE compression."
 == pal4rle.bmp pal4.png
 
 # BMP: bihsize=40, 127 x 64, bpp=8, compression=0, colors=252
 # "Our standard paletted image, with 252 palette colors, and 8 bits/pixel."
-fuzzy(1,899) == pal8.bmp pal8.png
+fuzzy(1,996) == pal8.bmp pal8.png
 
 # BMP: bihsize=40, 127 x 64, bpp=8, compression=0, colors=0
 # "Every field that can be set to 0 is set to 0: pixels/meter=0; colors used=0
 # (meaning the default 256); size-of-image=0."
-fuzzy(1,899) == pal8-0.bmp pal8.png
+fuzzy(1,996) == pal8-0.bmp pal8.png
 
 # BMP: bihsize=40, 127 x 64, bpp=8, compression=1, colors=252
 # "8-bit image that uses RLE compression."
-fuzzy(1,899) == pal8rle.bmp pal8.png
+fuzzy(1,996) == pal8rle.bmp pal8.png
 
 # BMP: bihsize=40, 126 x 63, bpp=8, compression=0, colors=252
 # BMP: bihsize=40, 125 x 62, bpp=8, compression=0, colors=252
 # BMP: bihsize=40, 124 x 61, bpp=8, compression=0, colors=252
 # "Images with different widths and heights. In BMP format, rows are padded to
 # a multiple of four bytes, so we test all four possibilities."
 fuzzy(1,889) == pal8w126.bmp pal8w126.png
-fuzzy(1,879) == pal8w125.bmp pal8w125.png
-fuzzy(1,869) == pal8w124.bmp pal8w124.png
+fuzzy(1,974) == pal8w125.bmp pal8w125.png
+fuzzy(1,870) == pal8w124.bmp pal8w124.png
 
 # BMP: bihsize=40, 127 x -64, bpp=8, compression=0, colors=252
 # "BMP images are normally stored from the bottom up, but there is a way to
 # store them from the top down."
-fuzzy(1,899) == pal8topdown.bmp pal8.png
+fuzzy(1,996) == pal8topdown.bmp pal8.png
 
 # BMP: bihsize=40, 127 x 32, bpp=8, compression=0, colors=252
 # "An image with non-square pixels: the X pixels/meter is twice the Y
 # pixels/meter. Image editors can be expected to leave the image 'squashed';
 # image viewers should consider stretching it to its correct proportions."
 # [We leave it squashed, as does Chromium.]
-fuzzy(1,473) == pal8nonsquare.bmp pal8nonsquare-e.png
+fuzzy(1,1462) == pal8nonsquare.bmp pal8nonsquare-e.png
 
 # BMP: bihsize=12, 127 x 64, bpp=8, compression=0, colors=0
 # "An OS/2-style bitmap."
-fuzzy(1,899) == pal8os2.bmp pal8.png
+fuzzy(1,996) == pal8os2.bmp pal8.png
 
 # BMP: bihsize=108, 127 x 64, bpp=8, compression=0, colors=252
 # "A v4 bitmap. I’m not sure that the gamma and chromaticity values in this
 # file are sensible, because I can’t find any detailed documentation of them."
-fuzzy(1,899) == pal8v4.bmp pal8.png
+fuzzy(1,996) == pal8v4.bmp pal8.png
 
 # BMP: bihsize=124, 127 x 64, bpp=8, compression=0, colors=252
 # "A v5 bitmap. Version 5 has additional colorspace options over v4, so it is
 # easier to create, and ought to be more portable."
-fuzzy(1,899) == pal8v5.bmp pal8.png
+fuzzy(1,996) == pal8v5.bmp pal8.png
 
 # BMP: bihsize=40, 127 x 64, bpp=16, compression=0, colors=0
 # "A 16-bit image with the default color format: 5 bits each for red, green, and
 # blue, and 1 unused bit. The whitest colors should (I assume) be displayed as
 # pure white: (255,255,255), not (248,248,248)."
 fuzzy(1,1296) == rgb16.bmp rgb16.png
 
 # BMP: bihsize=40, 127 x 64, bpp=16, compression=3, colors=0

--- a/image/test/reftest/bmp/bmpsuite/q/reftest.list
+++ b/image/test/reftest/bmp/bmpsuite/q/reftest.list
@@ -2,17 +2,17 @@
 
 # See ../README.mozilla for details.
 
 # BMP: bihsize=40, 127 x 64, bpp=1, compression=0, colors=1
 # "1 bit/pixel paletted image, with only one color in the palette. The
 # documentation says that 1-bpp images have a palette size of 2 (not 'up to
 # 2'), but it would be silly for a viewer not to support a size of 1."
 # [We accept it. So does Chromium.]
-== pal1p1.bmp pal1p1.png
+fuzzy(1,926) == pal1p1.bmp pal1p1.png
 
 # BMP: bihsize=40, 127 x 64, bpp=2, compression=0, colors=4
 # "A paletted image with 2 bits/pixel. Usually only 1, 4, and 8 are allowed,
 # but 2 is legal on Windows CE."
 # [We reject it. So does Chromium.]
 == wrapper.html?pal2.bmp about:blank
 
 # BMP: bihsize=40, 127 x 64, bpp=4, compression=2, colors=13
@@ -27,42 +27,42 @@
 # "8-bit version of q/pal4rletrns.bmp."
 # [Ditto.]
 == pal8rletrns.bmp pal8rletrns.png
 
 # BMP: bihsize=40, 127 x 64, bpp=8, compression=0, colors=252
 # "A file with some unused bytes between the palette and the image. This is
 # probably valid, but I’m not 100% sure."
 # [We accept it. So does Chromium.]
-fuzzy(1,899) == pal8offs.bmp pal8.png
+fuzzy(1,996) == pal8offs.bmp pal8.png
 
 # BMP: bihsize=40, 127 x 64, bpp=8, compression=0, colors=300
 # "An 8-bit image with 300 palette colors. This may be invalid, because the
 # documentation could be interpreted to imply that 8-bit images aren’t allowed
 # to have more than 256 colors."
 # [We accept it. So does Chromium.]
-fuzzy(1,899) == pal8oversizepal.bmp pal8.png
+fuzzy(1,996) == pal8oversizepal.bmp pal8.png
 
 # BMP: bihsize=12, 127 x 64, bpp=8, compression=0, colors=0
 # "An OS/2v1 with a less-than-full-sized palette. Probably not valid, but such
 # files have been seen in the wild."
 # [We reject it. Chromium accepts it but draws nothing. Rejecting seems
 # preferable given that the color and pixel data must overlap, which can only
 # lead to rubbish results.]
 == wrapper.html?pal8os2sp.bmp about:blank
 
 # BMP: bihsize=64, 127 x 64, bpp=8, compression=0, colors=252
 # "My attempt to make an OS/2v2 bitmap."
 # [We accept it. So does Chromium.]
-fuzzy(1,899) == pal8os2v2.bmp pal8.png
+fuzzy(1,996) == pal8os2v2.bmp pal8.png
 
 # BMP: bihsize=16, 127 x 64, bpp=8, compression=0, colors=0
 # "An OS/2v2 bitmap whose header has only 16 bytes, instead of the full 64."
 # [We accept it. So does Chromium.]
-fuzzy(1,899) == pal8os2v2-16.bmp pal8.png
+fuzzy(1,996) == pal8os2v2-16.bmp pal8.png
 
 # BMP: bihsize=40, 127 x 64, bpp=16, compression=3, colors=0
 # "An unusual and silly 16-bit image, with 2 red bits, 3 green bits, and 1 blue
 # bit. Most viewers do support this image, but the colors may be darkened with
 # a yellow-green shadow. That’s because they’re doing simple bit-shifting
 # (possibly including one round of bit replication), instead of proper
 # scaling."
 == rgb16-231.bmp rgb16-231.png