Issue %3005 - Move image/ to system/

- Since the early days this has grown quite a bit and so won't be going to components or modules.. Best to just leave it as-is under system.

1384 files changed, 21 insertions, 21 deletions

diff --git a/dom/base/moz.build b/dom/base/moz.build
index 814025034..e3876d887 100755
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -438,7 +438,6 @@ LOCAL_INCLUDES += [
     '/dom/xml',
     '/dom/xslt/xpath',
     '/dom/xul',
-    '/image',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
     '/layout/base',
@@ -449,6 +448,7 @@ LOCAL_INCLUDES += [
     '/layout/xul',
     '/system/docshell/base',
     '/system/graphics/2d',
+    '/system/image',
     '/system/interface',
     '/system/network/base',
     '/system/security/manager/ssl',
diff --git a/dom/canvas/moz.build b/dom/canvas/moz.build
index 7cc95aadd..26cfab599 100644
--- a/dom/canvas/moz.build
+++ b/dom/canvas/moz.build
@@ -172,13 +172,13 @@ LOCAL_INCLUDES += [
     '/dom/svg',
     '/dom/workers',
     '/dom/xul',
-    '/image',
     '/js/xpconnect/src',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
     '/libs/libyuv/include',
     '/system/graphics/gl',
+    '/system/image',
 ]
 
 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
diff --git a/dom/html/moz.build b/dom/html/moz.build
index 67e96c893..e5a6340e1 100644
--- a/dom/html/moz.build
+++ b/dom/html/moz.build
@@ -225,13 +225,13 @@ LOCAL_INCLUDES += [
     '/dom/xbl',
     '/dom/xul',
     '/editor/txmgr',
-    '/image',
     '/layout/forms',
     '/layout/generic',
     '/layout/style',
     '/layout/tables',
     '/layout/xul',
     '/system/docshell/base',
+    '/system/image',
     '/system/network/base',
     '/system/security/script',
 ]
diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list
index d4797993e..8a0340a87 100644
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -9,7 +9,7 @@
 include reftest-sanity/reftest.list
 
 # images (if ImageLib is busted, could result in weird failures in other tests)
-include ../../image/test/reftest/reftest.list
+include ../../system/image/test/reftest/reftest.list
 
 # CSSWG tests
 include w3c-css/submitted/reftest.list
diff --git a/layout/style/moz.build b/layout/style/moz.build
index 7f08fc236..0db4bebb0 100644
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -226,7 +226,7 @@ LOCAL_INCLUDES += [
     '/dom/html',
     '/dom/xbl',
     '/dom/xul',
-    '/image',
+    '/system/image',
 ]
 
 JAR_MANIFESTS += ['jar.mn']
diff --git a/image/AnimationParams.h b/system/image/AnimationParams.h
index dc403a4e8..dc403a4e8 100644
--- a/image/AnimationParams.h
+++ b/system/image/AnimationParams.h
diff --git a/image/AnimationSurfaceProvider.cpp b/system/image/AnimationSurfaceProvider.cpp
index 0dacf25c2..0dacf25c2 100644
--- a/image/AnimationSurfaceProvider.cpp
+++ b/system/image/AnimationSurfaceProvider.cpp
diff --git a/image/AnimationSurfaceProvider.h b/system/image/AnimationSurfaceProvider.h
index bf87f37ac..bf87f37ac 100644
--- a/image/AnimationSurfaceProvider.h
+++ b/system/image/AnimationSurfaceProvider.h
diff --git a/image/BMPHeaders.h b/system/image/BMPHeaders.h
index 0fdc806bc..0fdc806bc 100644
--- a/image/BMPHeaders.h
+++ b/system/image/BMPHeaders.h
diff --git a/image/ClippedImage.cpp b/system/image/ClippedImage.cpp
index 6372f5950..6372f5950 100644
--- a/image/ClippedImage.cpp
+++ b/system/image/ClippedImage.cpp
diff --git a/image/ClippedImage.h b/system/image/ClippedImage.h
index 65963b756..65963b756 100644
--- a/image/ClippedImage.h
+++ b/system/image/ClippedImage.h
diff --git a/image/CopyOnWrite.h b/system/image/CopyOnWrite.h
index 21db5c3bc..21db5c3bc 100644
--- a/image/CopyOnWrite.h
+++ b/system/image/CopyOnWrite.h
diff --git a/image/DecodePool.cpp b/system/image/DecodePool.cpp
index a8c4cbecc..a8c4cbecc 100644
--- a/image/DecodePool.cpp
+++ b/system/image/DecodePool.cpp
diff --git a/image/DecodePool.h b/system/image/DecodePool.h
index 9d62731e5..9d62731e5 100644
--- a/image/DecodePool.h
+++ b/system/image/DecodePool.h
diff --git a/image/DecodedSurfaceProvider.cpp b/system/image/DecodedSurfaceProvider.cpp
index 45b4849d2..45b4849d2 100644
--- a/image/DecodedSurfaceProvider.cpp
+++ b/system/image/DecodedSurfaceProvider.cpp
diff --git a/image/DecodedSurfaceProvider.h b/system/image/DecodedSurfaceProvider.h
index 22fd33371..22fd33371 100644
--- a/image/DecodedSurfaceProvider.h
+++ b/system/image/DecodedSurfaceProvider.h
diff --git a/image/Decoder.cpp b/system/image/Decoder.cpp
index 5d3908092..5d3908092 100644
--- a/image/Decoder.cpp
+++ b/system/image/Decoder.cpp
diff --git a/image/Decoder.h b/system/image/Decoder.h
index c0f4a20a6..c0f4a20a6 100644
--- a/image/Decoder.h
+++ b/system/image/Decoder.h
diff --git a/image/DecoderFactory.cpp b/system/image/DecoderFactory.cpp
index dffe4dc21..dffe4dc21 100644
--- a/image/DecoderFactory.cpp
+++ b/system/image/DecoderFactory.cpp
diff --git a/image/DecoderFactory.h b/system/image/DecoderFactory.h
index 5638789ff..5638789ff 100644
--- a/image/DecoderFactory.h
+++ b/system/image/DecoderFactory.h
diff --git a/image/DecoderFlags.h b/system/image/DecoderFlags.h
index c4a4df0e5..c4a4df0e5 100644
--- a/image/DecoderFlags.h
+++ b/system/image/DecoderFlags.h
diff --git a/image/Downscaler.cpp b/system/image/Downscaler.cpp
index 2ded487a5..2ded487a5 100644
--- a/image/Downscaler.cpp
+++ b/system/image/Downscaler.cpp
diff --git a/image/Downscaler.h b/system/image/Downscaler.h
index 21179a38f..21179a38f 100644
--- a/image/Downscaler.h
+++ b/system/image/Downscaler.h
diff --git a/image/DownscalingFilter.h b/system/image/DownscalingFilter.h
index 013c4d877..013c4d877 100644
--- a/image/DownscalingFilter.h
+++ b/system/image/DownscalingFilter.h
diff --git a/image/DrawResult.h b/system/image/DrawResult.h
index 912f59dc3..912f59dc3 100644
--- a/image/DrawResult.h
+++ b/system/image/DrawResult.h
diff --git a/image/DynamicImage.cpp b/system/image/DynamicImage.cpp
index aeb1fcf78..aeb1fcf78 100644
--- a/image/DynamicImage.cpp
+++ b/system/image/DynamicImage.cpp
diff --git a/image/DynamicImage.h b/system/image/DynamicImage.h
index 751bed82a..751bed82a 100644
--- a/image/DynamicImage.h
+++ b/system/image/DynamicImage.h
diff --git a/image/FrameAnimator.cpp b/system/image/FrameAnimator.cpp
index 8c29b5636..8c29b5636 100644
--- a/image/FrameAnimator.cpp
+++ b/system/image/FrameAnimator.cpp
diff --git a/image/FrameAnimator.h b/system/image/FrameAnimator.h
index da0cb4bf5..da0cb4bf5 100644
--- a/image/FrameAnimator.h
+++ b/system/image/FrameAnimator.h
diff --git a/image/FrameTimeout.h b/system/image/FrameTimeout.h
index 4070bba65..4070bba65 100644
--- a/image/FrameTimeout.h
+++ b/system/image/FrameTimeout.h
diff --git a/image/FrozenImage.cpp b/system/image/FrozenImage.cpp
index 46047e71f..46047e71f 100644
--- a/image/FrozenImage.cpp
+++ b/system/image/FrozenImage.cpp
diff --git a/image/FrozenImage.h b/system/image/FrozenImage.h
index 24b57304e..24b57304e 100644
--- a/image/FrozenImage.h
+++ b/system/image/FrozenImage.h
diff --git a/image/ICOFileHeaders.h b/system/image/ICOFileHeaders.h
index aae5c99e8..aae5c99e8 100644
--- a/image/ICOFileHeaders.h
+++ b/system/image/ICOFileHeaders.h
diff --git a/image/IDecodingTask.cpp b/system/image/IDecodingTask.cpp
index b13db8aa0..b13db8aa0 100644
--- a/image/IDecodingTask.cpp
+++ b/system/image/IDecodingTask.cpp
diff --git a/image/IDecodingTask.h b/system/image/IDecodingTask.h
index 3cbab5006..3cbab5006 100644
--- a/image/IDecodingTask.h
+++ b/system/image/IDecodingTask.h
diff --git a/image/IProgressObserver.h b/system/image/IProgressObserver.h
index ba2f1e9ac..ba2f1e9ac 100644
--- a/image/IProgressObserver.h
+++ b/system/image/IProgressObserver.h
diff --git a/image/ISurfaceProvider.h b/system/image/ISurfaceProvider.h
index 80e1f8e9b..80e1f8e9b 100644
--- a/image/ISurfaceProvider.h
+++ b/system/image/ISurfaceProvider.h
diff --git a/image/Image.cpp b/system/image/Image.cpp
index b757a60f7..b757a60f7 100644
--- a/image/Image.cpp
+++ b/system/image/Image.cpp
diff --git a/image/Image.h b/system/image/Image.h
index 98c5e8ca5..98c5e8ca5 100644
--- a/image/Image.h
+++ b/system/image/Image.h
diff --git a/image/ImageCacheKey.cpp b/system/image/ImageCacheKey.cpp
index da194fa55..da194fa55 100644
--- a/image/ImageCacheKey.cpp
+++ b/system/image/ImageCacheKey.cpp
diff --git a/image/ImageCacheKey.h b/system/image/ImageCacheKey.h
index dd7340703..dd7340703 100644
--- a/image/ImageCacheKey.h
+++ b/system/image/ImageCacheKey.h
diff --git a/image/ImageFactory.cpp b/system/image/ImageFactory.cpp
index 428be1424..428be1424 100644
--- a/image/ImageFactory.cpp
+++ b/system/image/ImageFactory.cpp
diff --git a/image/ImageFactory.h b/system/image/ImageFactory.h
index 6c2e0f504..6c2e0f504 100644
--- a/image/ImageFactory.h
+++ b/system/image/ImageFactory.h
diff --git a/image/ImageLogging.h b/system/image/ImageLogging.h
index 4e4a4b9c5..4e4a4b9c5 100644
--- a/image/ImageLogging.h
+++ b/system/image/ImageLogging.h
diff --git a/image/ImageMetadata.h b/system/image/ImageMetadata.h
index 05f572980..05f572980 100644
--- a/image/ImageMetadata.h
+++ b/system/image/ImageMetadata.h
diff --git a/image/ImageOps.cpp b/system/image/ImageOps.cpp
index ddd2f200e..ddd2f200e 100644
--- a/image/ImageOps.cpp
+++ b/system/image/ImageOps.cpp
diff --git a/image/ImageOps.h b/system/image/ImageOps.h
index 7a8e19be3..7a8e19be3 100644
--- a/image/ImageOps.h
+++ b/system/image/ImageOps.h
diff --git a/image/ImageRegion.h b/system/image/ImageRegion.h
index 3b7ff7482..3b7ff7482 100644
--- a/image/ImageRegion.h
+++ b/system/image/ImageRegion.h
diff --git a/image/ImageURL.h b/system/image/ImageURL.h
index fa60ff79e..fa60ff79e 100644
--- a/image/ImageURL.h
+++ b/system/image/ImageURL.h
diff --git a/image/ImageWrapper.cpp b/system/image/ImageWrapper.cpp
index 5ed6c7817..5ed6c7817 100644
--- a/image/ImageWrapper.cpp
+++ b/system/image/ImageWrapper.cpp
diff --git a/image/ImageWrapper.h b/system/image/ImageWrapper.h
index f60a1c09c..f60a1c09c 100644
--- a/image/ImageWrapper.h
+++ b/system/image/ImageWrapper.h
diff --git a/image/LookupResult.h b/system/image/LookupResult.h
index b6fc09111..b6fc09111 100644
--- a/image/LookupResult.h
+++ b/system/image/LookupResult.h
diff --git a/image/MultipartImage.cpp b/system/image/MultipartImage.cpp
index 59aa24aaf..59aa24aaf 100644
--- a/image/MultipartImage.cpp
+++ b/system/image/MultipartImage.cpp
diff --git a/image/MultipartImage.h b/system/image/MultipartImage.h
index 089ec993b..089ec993b 100644
--- a/image/MultipartImage.h
+++ b/system/image/MultipartImage.h
diff --git a/image/Orientation.h b/system/image/Orientation.h
index a0f2e1b75..a0f2e1b75 100644
--- a/image/Orientation.h
+++ b/system/image/Orientation.h
diff --git a/image/OrientedImage.cpp b/system/image/OrientedImage.cpp
index 0b6560df1..0b6560df1 100644
--- a/image/OrientedImage.cpp
+++ b/system/image/OrientedImage.cpp
diff --git a/image/OrientedImage.h b/system/image/OrientedImage.h
index b77571f4a..b77571f4a 100644
--- a/image/OrientedImage.h
+++ b/system/image/OrientedImage.h
diff --git a/image/PlaybackType.h b/system/image/PlaybackType.h
index 0fbc6b024..0fbc6b024 100644
--- a/image/PlaybackType.h
+++ b/system/image/PlaybackType.h
diff --git a/image/ProgressTracker.cpp b/system/image/ProgressTracker.cpp
index 912b1d17c..912b1d17c 100644
--- a/image/ProgressTracker.cpp
+++ b/system/image/ProgressTracker.cpp
diff --git a/image/ProgressTracker.h b/system/image/ProgressTracker.h
index e15e85323..e15e85323 100644
--- a/image/ProgressTracker.h
+++ b/system/image/ProgressTracker.h
diff --git a/image/RasterImage.cpp b/system/image/RasterImage.cpp
index eff6cb7b3..eff6cb7b3 100644
--- a/image/RasterImage.cpp
+++ b/system/image/RasterImage.cpp
diff --git a/image/RasterImage.h b/system/image/RasterImage.h
index 860983b22..860983b22 100644
--- a/image/RasterImage.h
+++ b/system/image/RasterImage.h
diff --git a/image/SVGDocumentWrapper.cpp b/system/image/SVGDocumentWrapper.cpp
index d4b71b907..d4b71b907 100644
--- a/image/SVGDocumentWrapper.cpp
+++ b/system/image/SVGDocumentWrapper.cpp
diff --git a/image/SVGDocumentWrapper.h b/system/image/SVGDocumentWrapper.h
index 7d7586ae3..7d7586ae3 100644
--- a/image/SVGDocumentWrapper.h
+++ b/system/image/SVGDocumentWrapper.h
diff --git a/image/ScriptedNotificationObserver.cpp b/system/image/ScriptedNotificationObserver.cpp
index 3c7f05296..3c7f05296 100644
--- a/image/ScriptedNotificationObserver.cpp
+++ b/system/image/ScriptedNotificationObserver.cpp
diff --git a/image/ScriptedNotificationObserver.h b/system/image/ScriptedNotificationObserver.h
index 1a1e35d70..1a1e35d70 100644
--- a/image/ScriptedNotificationObserver.h
+++ b/system/image/ScriptedNotificationObserver.h
diff --git a/image/ShutdownTracker.cpp b/system/image/ShutdownTracker.cpp
index c52c0b79e..c52c0b79e 100644
--- a/image/ShutdownTracker.cpp
+++ b/system/image/ShutdownTracker.cpp
diff --git a/image/ShutdownTracker.h b/system/image/ShutdownTracker.h
index 9a38735db..9a38735db 100644
--- a/image/ShutdownTracker.h
+++ b/system/image/ShutdownTracker.h
diff --git a/image/SourceBuffer.cpp b/system/image/SourceBuffer.cpp
index de066e29f..de066e29f 100644
--- a/image/SourceBuffer.cpp
+++ b/system/image/SourceBuffer.cpp
diff --git a/image/SourceBuffer.h b/system/image/SourceBuffer.h
index 6f2c74d33..6f2c74d33 100644
--- a/image/SourceBuffer.h
+++ b/system/image/SourceBuffer.h
diff --git a/image/StreamingLexer.h b/system/image/StreamingLexer.h
index 35379d86e..35379d86e 100644
--- a/image/StreamingLexer.h
+++ b/system/image/StreamingLexer.h
diff --git a/image/SurfaceCache.cpp b/system/image/SurfaceCache.cpp
index 66fdfcca0..66fdfcca0 100644
--- a/image/SurfaceCache.cpp
+++ b/system/image/SurfaceCache.cpp
diff --git a/image/SurfaceCache.h b/system/image/SurfaceCache.h
index e0c22c999..e0c22c999 100644
--- a/image/SurfaceCache.h
+++ b/system/image/SurfaceCache.h
diff --git a/image/SurfaceCacheUtils.cpp b/system/image/SurfaceCacheUtils.cpp
index f97674c4f..f97674c4f 100644
--- a/image/SurfaceCacheUtils.cpp
+++ b/system/image/SurfaceCacheUtils.cpp
diff --git a/image/SurfaceCacheUtils.h b/system/image/SurfaceCacheUtils.h
index fcce7a334..fcce7a334 100644
--- a/image/SurfaceCacheUtils.h
+++ b/system/image/SurfaceCacheUtils.h
diff --git a/image/SurfaceFilters.h b/system/image/SurfaceFilters.h
index 8f874dfdf..8f874dfdf 100644
--- a/image/SurfaceFilters.h
+++ b/system/image/SurfaceFilters.h
diff --git a/image/SurfaceFlags.h b/system/image/SurfaceFlags.h
index 1a0000542..1a0000542 100644
--- a/image/SurfaceFlags.h
+++ b/system/image/SurfaceFlags.h
diff --git a/image/SurfacePipe.cpp b/system/image/SurfacePipe.cpp
index a269c58ff..a269c58ff 100644
--- a/image/SurfacePipe.cpp
+++ b/system/image/SurfacePipe.cpp
diff --git a/image/SurfacePipe.h b/system/image/SurfacePipe.h
index 2c9d07b2f..2c9d07b2f 100644
--- a/image/SurfacePipe.h
+++ b/system/image/SurfacePipe.h
diff --git a/image/SurfacePipeFactory.h b/system/image/SurfacePipeFactory.h
index 684e308e8..684e308e8 100644
--- a/image/SurfacePipeFactory.h
+++ b/system/image/SurfacePipeFactory.h
diff --git a/image/VectorImage.cpp b/system/image/VectorImage.cpp
index 3fcb296f5..3fcb296f5 100644
--- a/image/VectorImage.cpp
+++ b/system/image/VectorImage.cpp
diff --git a/image/VectorImage.h b/system/image/VectorImage.h
index bd4d393ed..bd4d393ed 100644
--- a/image/VectorImage.h
+++ b/system/image/VectorImage.h
diff --git a/image/build/moz.build b/system/image/build/moz.build
index 121a78847..b096c36a2 100644
--- a/image/build/moz.build
+++ b/system/image/build/moz.build
@@ -13,9 +13,9 @@ SOURCES += [
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '/image',
-    '/image/encoders/bmp',
-    '/image/encoders/ico',
-    '/image/encoders/jpeg',
-    '/image/encoders/png',
+    '/system/image',
+    '/system/image/encoders/bmp',
+    '/system/image/encoders/ico',
+    '/system/image/encoders/jpeg',
+    '/system/image/encoders/png',
 ]
diff --git a/image/build/nsImageModule.cpp b/system/image/build/nsImageModule.cpp
index 9d52c07b6..9d52c07b6 100644
--- a/image/build/nsImageModule.cpp
+++ b/system/image/build/nsImageModule.cpp
diff --git a/image/build/nsImageModule.h b/system/image/build/nsImageModule.h
index bb2ace0f3..bb2ace0f3 100644
--- a/image/build/nsImageModule.h
+++ b/system/image/build/nsImageModule.h
diff --git a/image/decoders/EXIF.cpp b/system/image/decoders/EXIF.cpp
index 8197c886c..8197c886c 100644
--- a/image/decoders/EXIF.cpp
+++ b/system/image/decoders/EXIF.cpp
diff --git a/image/decoders/EXIF.h b/system/image/decoders/EXIF.h
index 9028f2cf8..9028f2cf8 100644
--- a/image/decoders/EXIF.h
+++ b/system/image/decoders/EXIF.h
diff --git a/image/decoders/GIF2.h b/system/image/decoders/GIF2.h
index 2521667d4..2521667d4 100644
--- a/image/decoders/GIF2.h
+++ b/system/image/decoders/GIF2.h
diff --git a/image/decoders/iccjpeg.c b/system/image/decoders/iccjpeg.c
index af014cf6b..af014cf6b 100644
--- a/image/decoders/iccjpeg.c
+++ b/system/image/decoders/iccjpeg.c
diff --git a/image/decoders/iccjpeg.h b/system/image/decoders/iccjpeg.h
index 474df719c..474df719c 100644
--- a/image/decoders/iccjpeg.h
+++ b/system/image/decoders/iccjpeg.h
diff --git a/image/decoders/icon/gtk/moz.build b/system/image/decoders/icon/gtk/moz.build
index e68d5d407..e68d5d407 100644
--- a/image/decoders/icon/gtk/moz.build
+++ b/system/image/decoders/icon/gtk/moz.build
diff --git a/image/decoders/icon/gtk/nsIconChannel.cpp b/system/image/decoders/icon/gtk/nsIconChannel.cpp
index b014e4c04..b014e4c04 100644
--- a/image/decoders/icon/gtk/nsIconChannel.cpp
+++ b/system/image/decoders/icon/gtk/nsIconChannel.cpp
diff --git a/image/decoders/icon/gtk/nsIconChannel.h b/system/image/decoders/icon/gtk/nsIconChannel.h
index 5d59272d5..5d59272d5 100644
--- a/image/decoders/icon/gtk/nsIconChannel.h
+++ b/system/image/decoders/icon/gtk/nsIconChannel.h
diff --git a/image/decoders/icon/moz.build b/system/image/decoders/icon/moz.build
index 56465dd27..56465dd27 100644
--- a/image/decoders/icon/moz.build
+++ b/system/image/decoders/icon/moz.build
diff --git a/image/decoders/icon/nsIconModule.cpp b/system/image/decoders/icon/nsIconModule.cpp
index 36225374d..36225374d 100644
--- a/image/decoders/icon/nsIconModule.cpp
+++ b/system/image/decoders/icon/nsIconModule.cpp
diff --git a/image/decoders/icon/nsIconProtocolHandler.cpp b/system/image/decoders/icon/nsIconProtocolHandler.cpp
index 03aaa2a14..03aaa2a14 100644
--- a/image/decoders/icon/nsIconProtocolHandler.cpp
+++ b/system/image/decoders/icon/nsIconProtocolHandler.cpp
diff --git a/image/decoders/icon/nsIconProtocolHandler.h b/system/image/decoders/icon/nsIconProtocolHandler.h
index 9653d36f6..9653d36f6 100644
--- a/image/decoders/icon/nsIconProtocolHandler.h
+++ b/system/image/decoders/icon/nsIconProtocolHandler.h
diff --git a/image/decoders/icon/nsIconURI.cpp b/system/image/decoders/icon/nsIconURI.cpp
index 1708331df..1708331df 100644
--- a/image/decoders/icon/nsIconURI.cpp
+++ b/system/image/decoders/icon/nsIconURI.cpp
diff --git a/image/decoders/icon/nsIconURI.h b/system/image/decoders/icon/nsIconURI.h
index 1c0310bec..1c0310bec 100644
--- a/image/decoders/icon/nsIconURI.h
+++ b/system/image/decoders/icon/nsIconURI.h
diff --git a/image/decoders/icon/win/moz.build b/system/image/decoders/icon/win/moz.build
index c0ff840eb..c0ff840eb 100644
--- a/image/decoders/icon/win/moz.build
+++ b/system/image/decoders/icon/win/moz.build
diff --git a/image/decoders/icon/win/nsIconChannel.cpp b/system/image/decoders/icon/win/nsIconChannel.cpp
index 04680627a..04680627a 100644
--- a/image/decoders/icon/win/nsIconChannel.cpp
+++ b/system/image/decoders/icon/win/nsIconChannel.cpp
diff --git a/image/decoders/icon/win/nsIconChannel.h b/system/image/decoders/icon/win/nsIconChannel.h
index 94df5a52e..94df5a52e 100644
--- a/image/decoders/icon/win/nsIconChannel.h
+++ b/system/image/decoders/icon/win/nsIconChannel.h
diff --git a/image/decoders/moz.build b/system/image/decoders/moz.build
index 374ff30b4..78bbd638b 100644
--- a/image/decoders/moz.build
+++ b/system/image/decoders/moz.build
@@ -28,10 +28,10 @@ UNIFIED_SOURCES += [
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
-    # Decoders need ImageLib headers.
-    '/image',
     # Access to Skia headers for Downscaler.
     '/system/graphics/2d',
+    # Decoders need ImageLib headers.
+    '/system/image',
 ]
 
 LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
diff --git a/image/decoders/nsBMPDecoder.cpp b/system/image/decoders/nsBMPDecoder.cpp
index 7a9fecf18..7a9fecf18 100644
--- a/image/decoders/nsBMPDecoder.cpp
+++ b/system/image/decoders/nsBMPDecoder.cpp
diff --git a/image/decoders/nsBMPDecoder.h b/system/image/decoders/nsBMPDecoder.h
index 26724d44e..26724d44e 100644
--- a/image/decoders/nsBMPDecoder.h
+++ b/system/image/decoders/nsBMPDecoder.h
diff --git a/image/decoders/nsGIFDecoder2.cpp b/system/image/decoders/nsGIFDecoder2.cpp
index 7a0628e8e..7a0628e8e 100644
--- a/image/decoders/nsGIFDecoder2.cpp
+++ b/system/image/decoders/nsGIFDecoder2.cpp
diff --git a/image/decoders/nsGIFDecoder2.h b/system/image/decoders/nsGIFDecoder2.h
index d1bf90e50..d1bf90e50 100644
--- a/image/decoders/nsGIFDecoder2.h
+++ b/system/image/decoders/nsGIFDecoder2.h
diff --git a/image/decoders/nsICODecoder.cpp b/system/image/decoders/nsICODecoder.cpp
index 633bb1255..633bb1255 100644
--- a/image/decoders/nsICODecoder.cpp
+++ b/system/image/decoders/nsICODecoder.cpp
diff --git a/image/decoders/nsICODecoder.h b/system/image/decoders/nsICODecoder.h
index 46e1377aa..46e1377aa 100644
--- a/image/decoders/nsICODecoder.h
+++ b/system/image/decoders/nsICODecoder.h
diff --git a/image/decoders/nsIconDecoder.cpp b/system/image/decoders/nsIconDecoder.cpp
index 4992f5417..4992f5417 100644
--- a/image/decoders/nsIconDecoder.cpp
+++ b/system/image/decoders/nsIconDecoder.cpp
diff --git a/image/decoders/nsIconDecoder.h b/system/image/decoders/nsIconDecoder.h
index 69198315b..69198315b 100644
--- a/image/decoders/nsIconDecoder.h
+++ b/system/image/decoders/nsIconDecoder.h
diff --git a/image/decoders/nsJPEGDecoder.cpp b/system/image/decoders/nsJPEGDecoder.cpp
index 7fc749890..7fc749890 100644
--- a/image/decoders/nsJPEGDecoder.cpp
+++ b/system/image/decoders/nsJPEGDecoder.cpp
diff --git a/image/decoders/nsJPEGDecoder.h b/system/image/decoders/nsJPEGDecoder.h
index 7df89318c..7df89318c 100644
--- a/image/decoders/nsJPEGDecoder.h
+++ b/system/image/decoders/nsJPEGDecoder.h
diff --git a/image/decoders/nsPNGDecoder.cpp b/system/image/decoders/nsPNGDecoder.cpp
index 78ed182d5..78ed182d5 100644
--- a/image/decoders/nsPNGDecoder.cpp
+++ b/system/image/decoders/nsPNGDecoder.cpp
diff --git a/image/decoders/nsPNGDecoder.h b/system/image/decoders/nsPNGDecoder.h
index 7e677d40a..7e677d40a 100644
--- a/image/decoders/nsPNGDecoder.h
+++ b/system/image/decoders/nsPNGDecoder.h
diff --git a/image/decoders/nsWebPDecoder.cpp b/system/image/decoders/nsWebPDecoder.cpp
index 3181e3a3a..3181e3a3a 100644
--- a/image/decoders/nsWebPDecoder.cpp
+++ b/system/image/decoders/nsWebPDecoder.cpp
diff --git a/image/decoders/nsWebPDecoder.h b/system/image/decoders/nsWebPDecoder.h
index cdd2849f3..cdd2849f3 100644
--- a/image/decoders/nsWebPDecoder.h
+++ b/system/image/decoders/nsWebPDecoder.h
diff --git a/image/encoders/bmp/moz.build b/system/image/encoders/bmp/moz.build
index 36f3e09e8..2eca00c9f 100644
--- a/image/encoders/bmp/moz.build
+++ b/system/image/encoders/bmp/moz.build
@@ -8,7 +8,7 @@ SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
-    '/image',
+    '/system/image',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/image/encoders/bmp/nsBMPEncoder.cpp b/system/image/encoders/bmp/nsBMPEncoder.cpp
index af959a46e..af959a46e 100644
--- a/image/encoders/bmp/nsBMPEncoder.cpp
+++ b/system/image/encoders/bmp/nsBMPEncoder.cpp
diff --git a/image/encoders/bmp/nsBMPEncoder.h b/system/image/encoders/bmp/nsBMPEncoder.h
index b90af4d19..b90af4d19 100644
--- a/image/encoders/bmp/nsBMPEncoder.h
+++ b/system/image/encoders/bmp/nsBMPEncoder.h
diff --git a/image/encoders/ico/moz.build b/system/image/encoders/ico/moz.build
index 277638a6c..7be1b86cc 100644
--- a/image/encoders/ico/moz.build
+++ b/system/image/encoders/ico/moz.build
@@ -9,9 +9,9 @@ SOURCES += [
 
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += [
-    '/image',
-    '/image/encoders/bmp',
-    '/image/encoders/png',
+    '/system/image',
+    '/system/image/encoders/bmp',
+    '/system/image/encoders/png',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/image/encoders/ico/nsICOEncoder.cpp b/system/image/encoders/ico/nsICOEncoder.cpp
index 5b26f5ca2..5b26f5ca2 100644
--- a/image/encoders/ico/nsICOEncoder.cpp
+++ b/system/image/encoders/ico/nsICOEncoder.cpp
diff --git a/image/encoders/ico/nsICOEncoder.h b/system/image/encoders/ico/nsICOEncoder.h
index a8a9a5049..a8a9a5049 100644
--- a/image/encoders/ico/nsICOEncoder.h
+++ b/system/image/encoders/ico/nsICOEncoder.h
diff --git a/image/encoders/jpeg/moz.build b/system/image/encoders/jpeg/moz.build
index 16903c9dd..16903c9dd 100644
--- a/image/encoders/jpeg/moz.build
+++ b/system/image/encoders/jpeg/moz.build
diff --git a/image/encoders/jpeg/nsJPEGEncoder.cpp b/system/image/encoders/jpeg/nsJPEGEncoder.cpp
index e5835c295..e5835c295 100644
--- a/image/encoders/jpeg/nsJPEGEncoder.cpp
+++ b/system/image/encoders/jpeg/nsJPEGEncoder.cpp
diff --git a/image/encoders/jpeg/nsJPEGEncoder.h b/system/image/encoders/jpeg/nsJPEGEncoder.h
index 2bcf5c2f3..2bcf5c2f3 100644
--- a/image/encoders/jpeg/nsJPEGEncoder.h
+++ b/system/image/encoders/jpeg/nsJPEGEncoder.h
diff --git a/image/encoders/moz.build b/system/image/encoders/moz.build
index 573411b46..573411b46 100644
--- a/image/encoders/moz.build
+++ b/system/image/encoders/moz.build
diff --git a/image/encoders/png/moz.build b/system/image/encoders/png/moz.build
index 1ff2a6344..fe098b856 100644
--- a/image/encoders/png/moz.build
+++ b/system/image/encoders/png/moz.build
@@ -8,7 +8,7 @@ SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
-    '/image',
+    '/system/image',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/image/encoders/png/nsPNGEncoder.cpp b/system/image/encoders/png/nsPNGEncoder.cpp
index a4c87ea46..a4c87ea46 100644
--- a/image/encoders/png/nsPNGEncoder.cpp
+++ b/system/image/encoders/png/nsPNGEncoder.cpp
diff --git a/image/encoders/png/nsPNGEncoder.h b/system/image/encoders/png/nsPNGEncoder.h
index 8c2239c11..8c2239c11 100644
--- a/image/encoders/png/nsPNGEncoder.h
+++ b/system/image/encoders/png/nsPNGEncoder.h
diff --git a/image/imgFrame.cpp b/system/image/imgFrame.cpp
index e2be7673b..e2be7673b 100644
--- a/image/imgFrame.cpp
+++ b/system/image/imgFrame.cpp
diff --git a/image/imgFrame.h b/system/image/imgFrame.h
index 928f6ad86..928f6ad86 100644
--- a/image/imgFrame.h
+++ b/system/image/imgFrame.h
diff --git a/image/imgICache.idl b/system/image/imgICache.idl
index 2a12e2bb1..2a12e2bb1 100644
--- a/image/imgICache.idl
+++ b/system/image/imgICache.idl
diff --git a/image/imgIContainer.idl b/system/image/imgIContainer.idl
index ba1c494af..ba1c494af 100644
--- a/image/imgIContainer.idl
+++ b/system/image/imgIContainer.idl
diff --git a/image/imgIContainerDebug.idl b/system/image/imgIContainerDebug.idl
index 426ae1df8..426ae1df8 100644
--- a/image/imgIContainerDebug.idl
+++ b/system/image/imgIContainerDebug.idl
diff --git a/image/imgIEncoder.idl b/system/image/imgIEncoder.idl
index 8d6eae76e..8d6eae76e 100644
--- a/image/imgIEncoder.idl
+++ b/system/image/imgIEncoder.idl
diff --git a/image/imgILoader.idl b/system/image/imgILoader.idl
index 36505da9d..36505da9d 100644
--- a/image/imgILoader.idl
+++ b/system/image/imgILoader.idl
diff --git a/image/imgINotificationObserver.idl b/system/image/imgINotificationObserver.idl
index abf62535b..abf62535b 100644
--- a/image/imgINotificationObserver.idl
+++ b/system/image/imgINotificationObserver.idl
diff --git a/image/imgIOnloadBlocker.idl b/system/image/imgIOnloadBlocker.idl
index c4075330d..c4075330d 100644
--- a/image/imgIOnloadBlocker.idl
+++ b/system/image/imgIOnloadBlocker.idl
diff --git a/image/imgIRequest.idl b/system/image/imgIRequest.idl
index 680bd6e3a..680bd6e3a 100644
--- a/image/imgIRequest.idl
+++ b/system/image/imgIRequest.idl
diff --git a/image/imgIScriptedNotificationObserver.idl b/system/image/imgIScriptedNotificationObserver.idl
index 54769e38f..54769e38f 100644
--- a/image/imgIScriptedNotificationObserver.idl
+++ b/system/image/imgIScriptedNotificationObserver.idl
diff --git a/image/imgITools.idl b/system/image/imgITools.idl
index 111efa07c..111efa07c 100644
--- a/image/imgITools.idl
+++ b/system/image/imgITools.idl
diff --git a/image/imgLoader.cpp b/system/image/imgLoader.cpp
index 3b64f065b..3b64f065b 100644
--- a/image/imgLoader.cpp
+++ b/system/image/imgLoader.cpp
diff --git a/image/imgLoader.h b/system/image/imgLoader.h
index 8e818a290..8e818a290 100644
--- a/image/imgLoader.h
+++ b/system/image/imgLoader.h
diff --git a/image/imgRequest.cpp b/system/image/imgRequest.cpp
index ba99779d3..ba99779d3 100644
--- a/image/imgRequest.cpp
+++ b/system/image/imgRequest.cpp
diff --git a/image/imgRequest.h b/system/image/imgRequest.h
index c05e6a4a9..c05e6a4a9 100644
--- a/image/imgRequest.h
+++ b/system/image/imgRequest.h
diff --git a/image/imgRequestProxy.cpp b/system/image/imgRequestProxy.cpp
index 4ccf1ff1d..4ccf1ff1d 100644
--- a/image/imgRequestProxy.cpp
+++ b/system/image/imgRequestProxy.cpp
diff --git a/image/imgRequestProxy.h b/system/image/imgRequestProxy.h
index 558b7eaaf..558b7eaaf 100644
--- a/image/imgRequestProxy.h
+++ b/system/image/imgRequestProxy.h
diff --git a/image/imgTools.cpp b/system/image/imgTools.cpp
index 29905c1ab..29905c1ab 100644
--- a/image/imgTools.cpp
+++ b/system/image/imgTools.cpp
diff --git a/image/imgTools.h b/system/image/imgTools.h
index 52d9d7443..52d9d7443 100644
--- a/image/imgTools.h
+++ b/system/image/imgTools.h
diff --git a/image/moz.build b/system/image/moz.build
index 950c4159e..6f01af44a 100644
--- a/image/moz.build
+++ b/system/image/moz.build
@@ -95,12 +95,12 @@ LOCAL_INCLUDES += [
     # Because SVGDocumentWrapper.cpp includes "mozilla/dom/SVGSVGElement.h"
     '/dom/base',
     '/dom/svg',
-    # We need to instantiate the decoders
-    '/image/decoders',
     # Because VectorImage.cpp includes nsSVGUtils.h and nsSVGEffects.h
     '/layout/svg',
     # Access to Skia headers for Downscaler
     '/system/graphics/2d',
+    # We need to instantiate the decoders
+    '/system/image/decoders',
     # For URI-related functionality
     '/system/network/base',
     # DecodePool uses thread-related facilities.
diff --git a/image/nsIIconURI.idl b/system/image/nsIIconURI.idl
index d6f393aad..d6f393aad 100644
--- a/image/nsIIconURI.idl
+++ b/system/image/nsIIconURI.idl
diff --git a/image/test/browser/animated.gif b/system/image/test/browser/animated.gif
index eb034e150..eb034e150 100644
--- a/image/test/browser/animated.gif
+++ b/system/image/test/browser/animated.gif
diff --git a/image/test/browser/animated2.gif b/system/image/test/browser/animated2.gif
index 053eaae68..053eaae68 100644
--- a/image/test/browser/animated2.gif
+++ b/system/image/test/browser/animated2.gif
diff --git a/image/test/browser/big.png b/system/image/test/browser/big.png
index 94e7eb6db..94e7eb6db 100644
--- a/image/test/browser/big.png
+++ b/system/image/test/browser/big.png
diff --git a/image/test/browser/browser.ini b/system/image/test/browser/browser.ini
index d5e94e575..d5e94e575 100644
--- a/image/test/browser/browser.ini
+++ b/system/image/test/browser/browser.ini
diff --git a/image/test/browser/browser_bug666317.js b/system/image/test/browser/browser_bug666317.js
index 2bd2d0615..2bd2d0615 100644
--- a/image/test/browser/browser_bug666317.js
+++ b/system/image/test/browser/browser_bug666317.js
diff --git a/image/test/browser/browser_docshell_type_editor.js b/system/image/test/browser/browser_docshell_type_editor.js
index 8ac98924f..8ac98924f 100644
--- a/image/test/browser/browser_docshell_type_editor.js
+++ b/system/image/test/browser/browser_docshell_type_editor.js
diff --git a/image/test/browser/browser_image.js b/system/image/test/browser/browser_image.js
index 9527726c3..9527726c3 100644
--- a/image/test/browser/browser_image.js
+++ b/system/image/test/browser/browser_image.js
diff --git a/image/test/browser/head.js b/system/image/test/browser/head.js
index 91a5f5793..91a5f5793 100644
--- a/image/test/browser/head.js
+++ b/system/image/test/browser/head.js
diff --git a/image/test/browser/image.html b/system/image/test/browser/image.html
index 298bf1bdc..298bf1bdc 100644
--- a/image/test/browser/image.html
+++ b/system/image/test/browser/image.html
diff --git a/image/test/browser/imageX2.html b/system/image/test/browser/imageX2.html
index bdacd0888..bdacd0888 100644
--- a/image/test/browser/imageX2.html
+++ b/system/image/test/browser/imageX2.html
diff --git a/image/test/crashtests/1205923-1.html b/system/image/test/crashtests/1205923-1.html
index 456fc51b6..456fc51b6 100644
--- a/image/test/crashtests/1205923-1.html
+++ b/system/image/test/crashtests/1205923-1.html
diff --git a/image/test/crashtests/1210745-1.gif b/system/image/test/crashtests/1210745-1.gif
index 92bcf7222..92bcf7222 100644
--- a/image/test/crashtests/1210745-1.gif
+++ b/system/image/test/crashtests/1210745-1.gif
diff --git a/image/test/crashtests/1212954-1.svg b/system/image/test/crashtests/1212954-1.svg
index 83dd7b9c7..83dd7b9c7 100644
--- a/image/test/crashtests/1212954-1.svg
+++ b/system/image/test/crashtests/1212954-1.svg
diff --git a/image/test/crashtests/1235605.gif b/system/image/test/crashtests/1235605.gif
index e7c3ea0b8..e7c3ea0b8 100644
--- a/image/test/crashtests/1235605.gif
+++ b/system/image/test/crashtests/1235605.gif
diff --git a/image/test/crashtests/1241728-1.html b/system/image/test/crashtests/1241728-1.html
index 126c02e62..126c02e62 100644
--- a/image/test/crashtests/1241728-1.html
+++ b/system/image/test/crashtests/1241728-1.html
diff --git a/image/test/crashtests/1241729-1.bmp b/system/image/test/crashtests/1241729-1.bmp
index e6f36d039..e6f36d039 100644
--- a/image/test/crashtests/1241729-1.bmp
+++ b/system/image/test/crashtests/1241729-1.bmp
diff --git a/image/test/crashtests/1241729-1.html b/system/image/test/crashtests/1241729-1.html
index 47f23134b..47f23134b 100644
--- a/image/test/crashtests/1241729-1.html
+++ b/system/image/test/crashtests/1241729-1.html
diff --git a/image/test/crashtests/1242093-1.html b/system/image/test/crashtests/1242093-1.html
index 3eab166ef..3eab166ef 100644
--- a/image/test/crashtests/1242093-1.html
+++ b/system/image/test/crashtests/1242093-1.html
diff --git a/image/test/crashtests/1242778-1.png b/system/image/test/crashtests/1242778-1.png
index 4504d54e4..4504d54e4 100644
--- a/image/test/crashtests/1242778-1.png
+++ b/system/image/test/crashtests/1242778-1.png
diff --git a/image/test/crashtests/1249576-1.png b/system/image/test/crashtests/1249576-1.png
index 637dafbc2..637dafbc2 100644
--- a/image/test/crashtests/1249576-1.png
+++ b/system/image/test/crashtests/1249576-1.png
diff --git a/image/test/crashtests/1251091-1.html b/system/image/test/crashtests/1251091-1.html
index 520a393b4..520a393b4 100644
--- a/image/test/crashtests/1251091-1.html
+++ b/system/image/test/crashtests/1251091-1.html
diff --git a/image/test/crashtests/1251091-1.png b/system/image/test/crashtests/1251091-1.png
index 078b19a56..078b19a56 100644
--- a/image/test/crashtests/1251091-1.png
+++ b/system/image/test/crashtests/1251091-1.png
diff --git a/image/test/crashtests/1253362-1.html b/system/image/test/crashtests/1253362-1.html
index fdee850aa..fdee850aa 100644
--- a/image/test/crashtests/1253362-1.html
+++ b/system/image/test/crashtests/1253362-1.html
diff --git a/image/test/crashtests/256-height.ico b/system/image/test/crashtests/256-height.ico
index 6a3c5c194..6a3c5c194 100644
--- a/image/test/crashtests/256-height.ico
+++ b/system/image/test/crashtests/256-height.ico
diff --git a/image/test/crashtests/256-width.ico b/system/image/test/crashtests/256-width.ico
index a82983ce4..a82983ce4 100644
--- a/image/test/crashtests/256-width.ico
+++ b/system/image/test/crashtests/256-width.ico
diff --git a/image/test/crashtests/463696.bmp b/system/image/test/crashtests/463696.bmp
index ec80d5412..ec80d5412 100644
--- a/image/test/crashtests/463696.bmp
+++ b/system/image/test/crashtests/463696.bmp
diff --git a/image/test/crashtests/523528-1.gif b/system/image/test/crashtests/523528-1.gif
index abadca7ad..abadca7ad 100644
--- a/image/test/crashtests/523528-1.gif
+++ b/system/image/test/crashtests/523528-1.gif
diff --git a/image/test/crashtests/523528-2.gif b/system/image/test/crashtests/523528-2.gif
index 5be3bd46f..5be3bd46f 100644
--- a/image/test/crashtests/523528-2.gif
+++ b/system/image/test/crashtests/523528-2.gif
diff --git a/image/test/crashtests/570451.png b/system/image/test/crashtests/570451.png
index c49f2d11f..c49f2d11f 100644
--- a/image/test/crashtests/570451.png
+++ b/system/image/test/crashtests/570451.png
diff --git a/image/test/crashtests/681190.html b/system/image/test/crashtests/681190.html
index b513d5ac6..b513d5ac6 100644
--- a/image/test/crashtests/681190.html
+++ b/system/image/test/crashtests/681190.html
diff --git a/image/test/crashtests/694165-1.xhtml b/system/image/test/crashtests/694165-1.xhtml
index 1e340a0f2..1e340a0f2 100644
--- a/image/test/crashtests/694165-1.xhtml
+++ b/system/image/test/crashtests/694165-1.xhtml
diff --git a/image/test/crashtests/732319-1.html b/system/image/test/crashtests/732319-1.html
index b9d9c6de8..b9d9c6de8 100644
--- a/image/test/crashtests/732319-1.html
+++ b/system/image/test/crashtests/732319-1.html
diff --git a/image/test/crashtests/83804-1.gif b/system/image/test/crashtests/83804-1.gif
index 3967c703f..3967c703f 100644
--- a/image/test/crashtests/83804-1.gif
+++ b/system/image/test/crashtests/83804-1.gif
diff --git a/image/test/crashtests/844403-1.html b/system/image/test/crashtests/844403-1.html
index 5da6c9021..5da6c9021 100644
--- a/image/test/crashtests/844403-1.html
+++ b/system/image/test/crashtests/844403-1.html
diff --git a/image/test/crashtests/856616.gif b/system/image/test/crashtests/856616.gif
index 0fac81101..0fac81101 100644
--- a/image/test/crashtests/856616.gif
+++ b/system/image/test/crashtests/856616.gif
diff --git a/image/test/crashtests/89341-1.gif b/system/image/test/crashtests/89341-1.gif
index 14b3892d1..14b3892d1 100644
--- a/image/test/crashtests/89341-1.gif
+++ b/system/image/test/crashtests/89341-1.gif
diff --git a/image/test/crashtests/944353.jpg b/system/image/test/crashtests/944353.jpg
index fd81c5826..fd81c5826 100644
--- a/image/test/crashtests/944353.jpg
+++ b/system/image/test/crashtests/944353.jpg
diff --git a/image/test/crashtests/colormap-range.gif b/system/image/test/crashtests/colormap-range.gif
index 887add653..887add653 100644
--- a/image/test/crashtests/colormap-range.gif
+++ b/system/image/test/crashtests/colormap-range.gif
diff --git a/image/test/crashtests/crashtests.list b/system/image/test/crashtests/crashtests.list
index 799c37314..799c37314 100644
--- a/image/test/crashtests/crashtests.list
+++ b/system/image/test/crashtests/crashtests.list
diff --git a/image/test/crashtests/delayedframe.sjs b/system/image/test/crashtests/delayedframe.sjs
index 31eb1eff8..31eb1eff8 100644
--- a/image/test/crashtests/delayedframe.sjs
+++ b/system/image/test/crashtests/delayedframe.sjs
diff --git a/image/test/crashtests/delaytest.html b/system/image/test/crashtests/delaytest.html
index 762aec789..762aec789 100644
--- a/image/test/crashtests/delaytest.html
+++ b/system/image/test/crashtests/delaytest.html
diff --git a/image/test/crashtests/discardframe.htm b/system/image/test/crashtests/discardframe.htm
index 5ced0029c..5ced0029c 100644
--- a/image/test/crashtests/discardframe.htm
+++ b/system/image/test/crashtests/discardframe.htm
diff --git a/image/test/crashtests/ie.png b/system/image/test/crashtests/ie.png
index 74c4a1a32..74c4a1a32 100644
--- a/image/test/crashtests/ie.png
+++ b/system/image/test/crashtests/ie.png
diff --git a/image/test/crashtests/invalid-disposal-method-1.gif b/system/image/test/crashtests/invalid-disposal-method-1.gif
index 30c61de18..30c61de18 100644
--- a/image/test/crashtests/invalid-disposal-method-1.gif
+++ b/system/image/test/crashtests/invalid-disposal-method-1.gif
diff --git a/image/test/crashtests/invalid-disposal-method-2.gif b/system/image/test/crashtests/invalid-disposal-method-2.gif
index 66158d81a..66158d81a 100644
--- a/image/test/crashtests/invalid-disposal-method-2.gif
+++ b/system/image/test/crashtests/invalid-disposal-method-2.gif
diff --git a/image/test/crashtests/invalid-disposal-method-3.gif b/system/image/test/crashtests/invalid-disposal-method-3.gif
index 0da072377..0da072377 100644
--- a/image/test/crashtests/invalid-disposal-method-3.gif
+++ b/system/image/test/crashtests/invalid-disposal-method-3.gif
diff --git a/image/test/crashtests/invalid-icc-profile.jpg b/system/image/test/crashtests/invalid-icc-profile.jpg
index 938c7713c..938c7713c 100644
--- a/image/test/crashtests/invalid-icc-profile.jpg
+++ b/system/image/test/crashtests/invalid-icc-profile.jpg
diff --git a/image/test/crashtests/invalid-size-second-frame.gif b/system/image/test/crashtests/invalid-size-second-frame.gif
index 22005ae4c..22005ae4c 100644
--- a/image/test/crashtests/invalid-size-second-frame.gif
+++ b/system/image/test/crashtests/invalid-size-second-frame.gif
diff --git a/image/test/crashtests/invalid-size.gif b/system/image/test/crashtests/invalid-size.gif
index 665ca9b5d..665ca9b5d 100644
--- a/image/test/crashtests/invalid-size.gif
+++ b/system/image/test/crashtests/invalid-size.gif
diff --git a/image/test/crashtests/invalid_ico_height.ico b/system/image/test/crashtests/invalid_ico_height.ico
index 50d684227..50d684227 100644
--- a/image/test/crashtests/invalid_ico_height.ico
+++ b/system/image/test/crashtests/invalid_ico_height.ico
diff --git a/image/test/crashtests/invalid_ico_width.ico b/system/image/test/crashtests/invalid_ico_width.ico
index 4ace07c16..4ace07c16 100644
--- a/image/test/crashtests/invalid_ico_width.ico
+++ b/system/image/test/crashtests/invalid_ico_width.ico
diff --git a/image/test/crashtests/multiple-png-hassize.ico b/system/image/test/crashtests/multiple-png-hassize.ico
index 694422001..694422001 100644
--- a/image/test/crashtests/multiple-png-hassize.ico
+++ b/system/image/test/crashtests/multiple-png-hassize.ico
diff --git a/image/test/crashtests/ownerdiscard.html b/system/image/test/crashtests/ownerdiscard.html
index 8d4a619fc..8d4a619fc 100644
--- a/image/test/crashtests/ownerdiscard.html
+++ b/system/image/test/crashtests/ownerdiscard.html
diff --git a/image/test/crashtests/threeframes-end.gif b/system/image/test/crashtests/threeframes-end.gif
index baf6a418c..baf6a418c 100644
--- a/image/test/crashtests/threeframes-end.gif
+++ b/system/image/test/crashtests/threeframes-end.gif
diff --git a/image/test/crashtests/threeframes-start.gif b/system/image/test/crashtests/threeframes-start.gif
index bc641a316..bc641a316 100644
--- a/image/test/crashtests/threeframes-start.gif
+++ b/system/image/test/crashtests/threeframes-start.gif
diff --git a/image/test/crashtests/truncated-second-frame.png b/system/image/test/crashtests/truncated-second-frame.png
index 0aef5e44d..0aef5e44d 100644
--- a/image/test/crashtests/truncated-second-frame.png
+++ b/system/image/test/crashtests/truncated-second-frame.png
diff --git a/image/test/crashtests/unsized-svg.svg b/system/image/test/crashtests/unsized-svg.svg
index 714efc7ef..714efc7ef 100644
--- a/image/test/crashtests/unsized-svg.svg
+++ b/system/image/test/crashtests/unsized-svg.svg
diff --git a/image/test/mochitest/12M-pixels-1.png b/system/image/test/mochitest/12M-pixels-1.png
index f802dd539..f802dd539 100644
--- a/image/test/mochitest/12M-pixels-1.png
+++ b/system/image/test/mochitest/12M-pixels-1.png
diff --git a/image/test/mochitest/12M-pixels-2.png b/system/image/test/mochitest/12M-pixels-2.png
index a6d430442..a6d430442 100644
--- a/image/test/mochitest/12M-pixels-2.png
+++ b/system/image/test/mochitest/12M-pixels-2.png
diff --git a/image/test/mochitest/6M-pixels.png b/system/image/test/mochitest/6M-pixels.png
index c813d8b56..c813d8b56 100644
--- a/image/test/mochitest/6M-pixels.png
+++ b/system/image/test/mochitest/6M-pixels.png
diff --git a/image/test/mochitest/INT32_MIN.bmp b/system/image/test/mochitest/INT32_MIN.bmp
index d9a001610..d9a001610 100644
--- a/image/test/mochitest/INT32_MIN.bmp
+++ b/system/image/test/mochitest/INT32_MIN.bmp
diff --git a/image/test/mochitest/animated-gif-finalframe.gif b/system/image/test/mochitest/animated-gif-finalframe.gif
index 4e80d31a7..4e80d31a7 100644
--- a/image/test/mochitest/animated-gif-finalframe.gif
+++ b/system/image/test/mochitest/animated-gif-finalframe.gif
diff --git a/image/test/mochitest/animated-gif.gif b/system/image/test/mochitest/animated-gif.gif
index 001cbfb87..001cbfb87 100644
--- a/image/test/mochitest/animated-gif.gif
+++ b/system/image/test/mochitest/animated-gif.gif
diff --git a/image/test/mochitest/animated-gif2.gif b/system/image/test/mochitest/animated-gif2.gif
index c66cc4b73..c66cc4b73 100644
--- a/image/test/mochitest/animated-gif2.gif
+++ b/system/image/test/mochitest/animated-gif2.gif
diff --git a/image/test/mochitest/animated-gif_trailing-garbage.gif b/system/image/test/mochitest/animated-gif_trailing-garbage.gif
index 02f4de2e3..02f4de2e3 100644
--- a/image/test/mochitest/animated-gif_trailing-garbage.gif
+++ b/system/image/test/mochitest/animated-gif_trailing-garbage.gif
diff --git a/image/test/mochitest/animated1.gif b/system/image/test/mochitest/animated1.gif
index 2f9d8a512..2f9d8a512 100644
--- a/image/test/mochitest/animated1.gif
+++ b/system/image/test/mochitest/animated1.gif
diff --git a/image/test/mochitest/animated2.gif b/system/image/test/mochitest/animated2.gif
index 2f9d8a512..2f9d8a512 100644
--- a/image/test/mochitest/animated2.gif
+++ b/system/image/test/mochitest/animated2.gif
diff --git a/image/test/mochitest/animation.svg b/system/image/test/mochitest/animation.svg
index 2141d8679..2141d8679 100644
--- a/image/test/mochitest/animation.svg
+++ b/system/image/test/mochitest/animation.svg
diff --git a/image/test/mochitest/animationPolling.js b/system/image/test/mochitest/animationPolling.js
index 6f5e7c889..6f5e7c889 100644
--- a/image/test/mochitest/animationPolling.js
+++ b/system/image/test/mochitest/animationPolling.js
diff --git a/image/test/mochitest/bad.jpg b/system/image/test/mochitest/bad.jpg
index 555a416d7..555a416d7 100644
--- a/image/test/mochitest/bad.jpg
+++ b/system/image/test/mochitest/bad.jpg
diff --git a/image/test/mochitest/big.png b/system/image/test/mochitest/big.png
index 94e7eb6db..94e7eb6db 100644
--- a/image/test/mochitest/big.png
+++ b/system/image/test/mochitest/big.png
diff --git a/image/test/mochitest/blue.gif b/system/image/test/mochitest/blue.gif
index 339f3702f..339f3702f 100644
--- a/image/test/mochitest/blue.gif
+++ b/system/image/test/mochitest/blue.gif
diff --git a/image/test/mochitest/blue.png b/system/image/test/mochitest/blue.png
index 8df58f3a5..8df58f3a5 100644
--- a/image/test/mochitest/blue.png
+++ b/system/image/test/mochitest/blue.png
diff --git a/image/test/mochitest/bug1132427.gif b/system/image/test/mochitest/bug1132427.gif
index 39f49689a..39f49689a 100644
--- a/image/test/mochitest/bug1132427.gif
+++ b/system/image/test/mochitest/bug1132427.gif
diff --git a/image/test/mochitest/bug1132427.html b/system/image/test/mochitest/bug1132427.html
index c765ce14c..c765ce14c 100644
--- a/image/test/mochitest/bug1132427.html
+++ b/system/image/test/mochitest/bug1132427.html
diff --git a/image/test/mochitest/bug1180105-waiter.sjs b/system/image/test/mochitest/bug1180105-waiter.sjs
index 4e86ae287..4e86ae287 100644
--- a/image/test/mochitest/bug1180105-waiter.sjs
+++ b/system/image/test/mochitest/bug1180105-waiter.sjs
diff --git a/image/test/mochitest/bug1180105.sjs b/system/image/test/mochitest/bug1180105.sjs
index e138e548e..e138e548e 100644
--- a/image/test/mochitest/bug1180105.sjs
+++ b/system/image/test/mochitest/bug1180105.sjs
diff --git a/image/test/mochitest/bug1217571-iframe.html b/system/image/test/mochitest/bug1217571-iframe.html
index d67bb9ed7..d67bb9ed7 100644
--- a/image/test/mochitest/bug1217571-iframe.html
+++ b/system/image/test/mochitest/bug1217571-iframe.html
diff --git a/image/test/mochitest/bug1319025-ref.png b/system/image/test/mochitest/bug1319025-ref.png
index 482d027a0..482d027a0 100644
--- a/image/test/mochitest/bug1319025-ref.png
+++ b/system/image/test/mochitest/bug1319025-ref.png
diff --git a/image/test/mochitest/bug1319025.png b/system/image/test/mochitest/bug1319025.png
index 8023e7787..8023e7787 100644
--- a/image/test/mochitest/bug1319025.png
+++ b/system/image/test/mochitest/bug1319025.png
diff --git a/image/test/mochitest/bug399925.gif b/system/image/test/mochitest/bug399925.gif
index fc1c8f3af..fc1c8f3af 100644
--- a/image/test/mochitest/bug399925.gif
+++ b/system/image/test/mochitest/bug399925.gif
diff --git a/image/test/mochitest/bug415761.ico b/system/image/test/mochitest/bug415761.ico
index d3f65abc2..d3f65abc2 100644
--- a/image/test/mochitest/bug415761.ico
+++ b/system/image/test/mochitest/bug415761.ico
diff --git a/image/test/mochitest/bug468160.sjs b/system/image/test/mochitest/bug468160.sjs
index 4a654216a..4a654216a 100644
--- a/image/test/mochitest/bug468160.sjs
+++ b/system/image/test/mochitest/bug468160.sjs
diff --git a/image/test/mochitest/bug478398_ONLY.png b/system/image/test/mochitest/bug478398_ONLY.png
index e094ae2cf..e094ae2cf 100644
--- a/image/test/mochitest/bug478398_ONLY.png
+++ b/system/image/test/mochitest/bug478398_ONLY.png
diff --git a/image/test/mochitest/bug490949-iframe.html b/system/image/test/mochitest/bug490949-iframe.html
index 68f74b587..68f74b587 100644
--- a/image/test/mochitest/bug490949-iframe.html
+++ b/system/image/test/mochitest/bug490949-iframe.html
diff --git a/image/test/mochitest/bug490949.sjs b/system/image/test/mochitest/bug490949.sjs
index f306b8337..f306b8337 100644
--- a/image/test/mochitest/bug490949.sjs
+++ b/system/image/test/mochitest/bug490949.sjs
diff --git a/image/test/mochitest/bug496292-1.sjs b/system/image/test/mochitest/bug496292-1.sjs
index 0326b75d6..0326b75d6 100644
--- a/image/test/mochitest/bug496292-1.sjs
+++ b/system/image/test/mochitest/bug496292-1.sjs
diff --git a/image/test/mochitest/bug496292-2.sjs b/system/image/test/mochitest/bug496292-2.sjs
index 756ea9db2..756ea9db2 100644
--- a/image/test/mochitest/bug496292-2.sjs
+++ b/system/image/test/mochitest/bug496292-2.sjs
diff --git a/image/test/mochitest/bug496292-iframe-1.html b/system/image/test/mochitest/bug496292-iframe-1.html
index 00f0fbcfc..00f0fbcfc 100644
--- a/image/test/mochitest/bug496292-iframe-1.html
+++ b/system/image/test/mochitest/bug496292-iframe-1.html
diff --git a/image/test/mochitest/bug496292-iframe-2.html b/system/image/test/mochitest/bug496292-iframe-2.html
index 67c1ecea1..67c1ecea1 100644
--- a/image/test/mochitest/bug496292-iframe-2.html
+++ b/system/image/test/mochitest/bug496292-iframe-2.html
diff --git a/image/test/mochitest/bug496292-iframe-ref.html b/system/image/test/mochitest/bug496292-iframe-ref.html
index 2e804502e..2e804502e 100644
--- a/image/test/mochitest/bug496292-iframe-ref.html
+++ b/system/image/test/mochitest/bug496292-iframe-ref.html
diff --git a/image/test/mochitest/bug497665-iframe.html b/system/image/test/mochitest/bug497665-iframe.html
index a2b098e31..a2b098e31 100644
--- a/image/test/mochitest/bug497665-iframe.html
+++ b/system/image/test/mochitest/bug497665-iframe.html
diff --git a/image/test/mochitest/bug497665.sjs b/system/image/test/mochitest/bug497665.sjs
index 67151e25b..67151e25b 100644
--- a/image/test/mochitest/bug497665.sjs
+++ b/system/image/test/mochitest/bug497665.sjs
diff --git a/image/test/mochitest/bug552605.sjs b/system/image/test/mochitest/bug552605.sjs
index 806a065b4..806a065b4 100644
--- a/image/test/mochitest/bug552605.sjs
+++ b/system/image/test/mochitest/bug552605.sjs
diff --git a/image/test/mochitest/bug657191.sjs b/system/image/test/mochitest/bug657191.sjs
index 7451d98ee..7451d98ee 100644
--- a/image/test/mochitest/bug657191.sjs
+++ b/system/image/test/mochitest/bug657191.sjs
diff --git a/image/test/mochitest/bug671906-iframe.html b/system/image/test/mochitest/bug671906-iframe.html
index 87f8183a4..87f8183a4 100644
--- a/image/test/mochitest/bug671906-iframe.html
+++ b/system/image/test/mochitest/bug671906-iframe.html
diff --git a/image/test/mochitest/bug671906.sjs b/system/image/test/mochitest/bug671906.sjs
index f1fbc1b73..f1fbc1b73 100644
--- a/image/test/mochitest/bug671906.sjs
+++ b/system/image/test/mochitest/bug671906.sjs
diff --git a/image/test/mochitest/bug733553-informant.sjs b/system/image/test/mochitest/bug733553-informant.sjs
index 6f15a1195..6f15a1195 100644
--- a/image/test/mochitest/bug733553-informant.sjs
+++ b/system/image/test/mochitest/bug733553-informant.sjs
diff --git a/image/test/mochitest/bug733553.sjs b/system/image/test/mochitest/bug733553.sjs
index c5279f3d2..c5279f3d2 100644
--- a/image/test/mochitest/bug733553.sjs
+++ b/system/image/test/mochitest/bug733553.sjs
diff --git a/image/test/mochitest/bug767779.sjs b/system/image/test/mochitest/bug767779.sjs
index 9a7948d85..9a7948d85 100644
--- a/image/test/mochitest/bug767779.sjs
+++ b/system/image/test/mochitest/bug767779.sjs
diff --git a/image/test/mochitest/bug89419-iframe.html b/system/image/test/mochitest/bug89419-iframe.html
index 191531563..191531563 100644
--- a/image/test/mochitest/bug89419-iframe.html
+++ b/system/image/test/mochitest/bug89419-iframe.html
diff --git a/image/test/mochitest/bug89419.sjs b/system/image/test/mochitest/bug89419.sjs
index 806a065b4..806a065b4 100644
--- a/image/test/mochitest/bug89419.sjs
+++ b/system/image/test/mochitest/bug89419.sjs
diff --git a/image/test/mochitest/bug900200-ref.png b/system/image/test/mochitest/bug900200-ref.png
index 636013132..636013132 100644
--- a/image/test/mochitest/bug900200-ref.png
+++ b/system/image/test/mochitest/bug900200-ref.png
diff --git a/image/test/mochitest/bug900200.png b/system/image/test/mochitest/bug900200.png
index d7d87adce..d7d87adce 100644
--- a/image/test/mochitest/bug900200.png
+++ b/system/image/test/mochitest/bug900200.png
diff --git a/image/test/mochitest/chrome.ini b/system/image/test/mochitest/chrome.ini
index b84d0af89..b84d0af89 100644
--- a/image/test/mochitest/chrome.ini
+++ b/system/image/test/mochitest/chrome.ini
diff --git a/image/test/mochitest/clear.gif b/system/image/test/mochitest/clear.gif
index 7ae79ba86..7ae79ba86 100644
--- a/image/test/mochitest/clear.gif
+++ b/system/image/test/mochitest/clear.gif
diff --git a/image/test/mochitest/clear.png b/system/image/test/mochitest/clear.png
index b09aecaaa..b09aecaaa 100644
--- a/image/test/mochitest/clear.png
+++ b/system/image/test/mochitest/clear.png
diff --git a/image/test/mochitest/clear2-results.gif b/system/image/test/mochitest/clear2-results.gif
index 965b65025..965b65025 100644
--- a/image/test/mochitest/clear2-results.gif
+++ b/system/image/test/mochitest/clear2-results.gif
diff --git a/image/test/mochitest/clear2.gif b/system/image/test/mochitest/clear2.gif
index 00ad873c6..00ad873c6 100644
--- a/image/test/mochitest/clear2.gif
+++ b/system/image/test/mochitest/clear2.gif
diff --git a/image/test/mochitest/damon.jpg b/system/image/test/mochitest/damon.jpg
index 917b33660..917b33660 100644
--- a/image/test/mochitest/damon.jpg
+++ b/system/image/test/mochitest/damon.jpg
diff --git a/image/test/mochitest/error-early.png b/system/image/test/mochitest/error-early.png
index 5df7507e2..5df7507e2 100644
--- a/image/test/mochitest/error-early.png
+++ b/system/image/test/mochitest/error-early.png
diff --git a/image/test/mochitest/filter-final.svg b/system/image/test/mochitest/filter-final.svg
index b2b3dca00..b2b3dca00 100644
--- a/image/test/mochitest/filter-final.svg
+++ b/system/image/test/mochitest/filter-final.svg
diff --git a/image/test/mochitest/filter.svg b/system/image/test/mochitest/filter.svg
index e185f15b6..e185f15b6 100644
--- a/image/test/mochitest/filter.svg
+++ b/system/image/test/mochitest/filter.svg
diff --git a/image/test/mochitest/first-frame-padding.gif b/system/image/test/mochitest/first-frame-padding.gif
index e6d7c4932..e6d7c4932 100644
--- a/image/test/mochitest/first-frame-padding.gif
+++ b/system/image/test/mochitest/first-frame-padding.gif
diff --git a/image/test/mochitest/green-background.html b/system/image/test/mochitest/green-background.html
index 6b4518e73..6b4518e73 100644
--- a/image/test/mochitest/green-background.html
+++ b/system/image/test/mochitest/green-background.html
diff --git a/image/test/mochitest/green.png b/system/image/test/mochitest/green.png
index 7df25f33b..7df25f33b 100644
--- a/image/test/mochitest/green.png
+++ b/system/image/test/mochitest/green.png
diff --git a/image/test/mochitest/grey.png b/system/image/test/mochitest/grey.png
index 5c82cdeb1..5c82cdeb1 100644
--- a/image/test/mochitest/grey.png
+++ b/system/image/test/mochitest/grey.png
diff --git a/image/test/mochitest/ico-bmp-opaque.ico b/system/image/test/mochitest/ico-bmp-opaque.ico
index 3cf3320ea..3cf3320ea 100644
--- a/image/test/mochitest/ico-bmp-opaque.ico
+++ b/system/image/test/mochitest/ico-bmp-opaque.ico
diff --git a/image/test/mochitest/ico-bmp-transparent.ico b/system/image/test/mochitest/ico-bmp-transparent.ico
index 151b7cb36..151b7cb36 100644
--- a/image/test/mochitest/ico-bmp-transparent.ico
+++ b/system/image/test/mochitest/ico-bmp-transparent.ico
diff --git a/image/test/mochitest/iframe.html b/system/image/test/mochitest/iframe.html
index 6d66557ef..6d66557ef 100644
--- a/image/test/mochitest/iframe.html
+++ b/system/image/test/mochitest/iframe.html
diff --git a/image/test/mochitest/imgutils.js b/system/image/test/mochitest/imgutils.js
index ab9c478df..ab9c478df 100644
--- a/image/test/mochitest/imgutils.js
+++ b/system/image/test/mochitest/imgutils.js
diff --git a/image/test/mochitest/invalid.jpg b/system/image/test/mochitest/invalid.jpg
index c677a81e2..c677a81e2 100644
--- a/image/test/mochitest/invalid.jpg
+++ b/system/image/test/mochitest/invalid.jpg
diff --git a/image/test/mochitest/keep.gif b/system/image/test/mochitest/keep.gif
index e967d6a6d..e967d6a6d 100644
--- a/image/test/mochitest/keep.gif
+++ b/system/image/test/mochitest/keep.gif
diff --git a/image/test/mochitest/keep.png b/system/image/test/mochitest/keep.png
index aa3ff7445..aa3ff7445 100644
--- a/image/test/mochitest/keep.png
+++ b/system/image/test/mochitest/keep.png
diff --git a/image/test/mochitest/lime-anim-100x100-2.svg b/system/image/test/mochitest/lime-anim-100x100-2.svg
index d19d3b0e7..d19d3b0e7 100644
--- a/image/test/mochitest/lime-anim-100x100-2.svg
+++ b/system/image/test/mochitest/lime-anim-100x100-2.svg
diff --git a/image/test/mochitest/lime-anim-100x100.svg b/system/image/test/mochitest/lime-anim-100x100.svg
index c6584047d..c6584047d 100644
--- a/image/test/mochitest/lime-anim-100x100.svg
+++ b/system/image/test/mochitest/lime-anim-100x100.svg
diff --git a/image/test/mochitest/lime-css-anim-100x100.svg b/system/image/test/mochitest/lime-css-anim-100x100.svg
index 3edbd3eaa..3edbd3eaa 100644
--- a/image/test/mochitest/lime-css-anim-100x100.svg
+++ b/system/image/test/mochitest/lime-css-anim-100x100.svg
diff --git a/image/test/mochitest/lime100x100.svg b/system/image/test/mochitest/lime100x100.svg
index 8bdec62c1..8bdec62c1 100644
--- a/image/test/mochitest/lime100x100.svg
+++ b/system/image/test/mochitest/lime100x100.svg
diff --git a/image/test/mochitest/mochitest.ini b/system/image/test/mochitest/mochitest.ini
index e65de9d9e..e65de9d9e 100644
--- a/image/test/mochitest/mochitest.ini
+++ b/system/image/test/mochitest/mochitest.ini
diff --git a/image/test/mochitest/opaque.bmp b/system/image/test/mochitest/opaque.bmp
index 63d3f1c05..63d3f1c05 100644
--- a/image/test/mochitest/opaque.bmp
+++ b/system/image/test/mochitest/opaque.bmp
diff --git a/image/test/mochitest/over.png b/system/image/test/mochitest/over.png
index 9e957182f..9e957182f 100644
--- a/image/test/mochitest/over.png
+++ b/system/image/test/mochitest/over.png
diff --git a/image/test/mochitest/purple.gif b/system/image/test/mochitest/purple.gif
index 79826af20..79826af20 100644
--- a/image/test/mochitest/purple.gif
+++ b/system/image/test/mochitest/purple.gif
diff --git a/image/test/mochitest/red.gif b/system/image/test/mochitest/red.gif
index d3c32bae2..d3c32bae2 100644
--- a/image/test/mochitest/red.gif
+++ b/system/image/test/mochitest/red.gif
diff --git a/image/test/mochitest/red.png b/system/image/test/mochitest/red.png
index aa9ce2526..aa9ce2526 100644
--- a/image/test/mochitest/red.png
+++ b/system/image/test/mochitest/red.png
diff --git a/image/test/mochitest/ref-iframe.html b/system/image/test/mochitest/ref-iframe.html
index 585772c8a..585772c8a 100644
--- a/image/test/mochitest/ref-iframe.html
+++ b/system/image/test/mochitest/ref-iframe.html
diff --git a/image/test/mochitest/restore-previous.gif b/system/image/test/mochitest/restore-previous.gif
index 15ba9ddc4..15ba9ddc4 100644
--- a/image/test/mochitest/restore-previous.gif
+++ b/system/image/test/mochitest/restore-previous.gif
diff --git a/image/test/mochitest/restore-previous.png b/system/image/test/mochitest/restore-previous.png
index 09dee6382..09dee6382 100644
--- a/image/test/mochitest/restore-previous.png
+++ b/system/image/test/mochitest/restore-previous.png
diff --git a/image/test/mochitest/rillybad.jpg b/system/image/test/mochitest/rillybad.jpg
index e2fb1d303..e2fb1d303 100644
--- a/image/test/mochitest/rillybad.jpg
+++ b/system/image/test/mochitest/rillybad.jpg
diff --git a/image/test/mochitest/schrep.png b/system/image/test/mochitest/schrep.png
index bcb406387..bcb406387 100644
--- a/image/test/mochitest/schrep.png
+++ b/system/image/test/mochitest/schrep.png
diff --git a/image/test/mochitest/shaver.png b/system/image/test/mochitest/shaver.png
index ab0b6c7b4..ab0b6c7b4 100644
--- a/image/test/mochitest/shaver.png
+++ b/system/image/test/mochitest/shaver.png
diff --git a/image/test/mochitest/short_header.gif b/system/image/test/mochitest/short_header.gif
index 70af95ac6..70af95ac6 100644
--- a/image/test/mochitest/short_header.gif
+++ b/system/image/test/mochitest/short_header.gif
diff --git a/image/test/mochitest/source.png b/system/image/test/mochitest/source.png
index df1c76dae..df1c76dae 100644
--- a/image/test/mochitest/source.png
+++ b/system/image/test/mochitest/source.png
diff --git a/image/test/mochitest/test_ImageContentLoaded.html b/system/image/test/mochitest/test_ImageContentLoaded.html
index 38d3238a1..38d3238a1 100644
--- a/image/test/mochitest/test_ImageContentLoaded.html
+++ b/system/image/test/mochitest/test_ImageContentLoaded.html
diff --git a/image/test/mochitest/test_animSVGImage.html b/system/image/test/mochitest/test_animSVGImage.html
index 9515472d5..9515472d5 100644
--- a/image/test/mochitest/test_animSVGImage.html
+++ b/system/image/test/mochitest/test_animSVGImage.html
diff --git a/image/test/mochitest/test_animSVGImage2.html b/system/image/test/mochitest/test_animSVGImage2.html
index 5f3bbfde8..5f3bbfde8 100644
--- a/image/test/mochitest/test_animSVGImage2.html
+++ b/system/image/test/mochitest/test_animSVGImage2.html
diff --git a/image/test/mochitest/test_animation.html b/system/image/test/mochitest/test_animation.html
index e144323fd..e144323fd 100644
--- a/image/test/mochitest/test_animation.html
+++ b/system/image/test/mochitest/test_animation.html
diff --git a/image/test/mochitest/test_animation2.html b/system/image/test/mochitest/test_animation2.html
index c53817a0a..c53817a0a 100644
--- a/image/test/mochitest/test_animation2.html
+++ b/system/image/test/mochitest/test_animation2.html
diff --git a/image/test/mochitest/test_animation_operators.html b/system/image/test/mochitest/test_animation_operators.html
index a03088b12..a03088b12 100644
--- a/image/test/mochitest/test_animation_operators.html
+++ b/system/image/test/mochitest/test_animation_operators.html
diff --git a/image/test/mochitest/test_background_image_anim.html b/system/image/test/mochitest/test_background_image_anim.html
index 957166e82..957166e82 100644
--- a/image/test/mochitest/test_background_image_anim.html
+++ b/system/image/test/mochitest/test_background_image_anim.html
diff --git a/image/test/mochitest/test_bug1132427.html b/system/image/test/mochitest/test_bug1132427.html
index ceb01179e..ceb01179e 100644
--- a/image/test/mochitest/test_bug1132427.html
+++ b/system/image/test/mochitest/test_bug1132427.html
diff --git a/image/test/mochitest/test_bug1180105.html b/system/image/test/mochitest/test_bug1180105.html
index 1691b621c..1691b621c 100644
--- a/image/test/mochitest/test_bug1180105.html
+++ b/system/image/test/mochitest/test_bug1180105.html
diff --git a/image/test/mochitest/test_bug1217571.html b/system/image/test/mochitest/test_bug1217571.html
index db24096e1..db24096e1 100644
--- a/image/test/mochitest/test_bug1217571.html
+++ b/system/image/test/mochitest/test_bug1217571.html
diff --git a/image/test/mochitest/test_bug399925.html b/system/image/test/mochitest/test_bug399925.html
index 1d9bdb14c..1d9bdb14c 100644
--- a/image/test/mochitest/test_bug399925.html
+++ b/system/image/test/mochitest/test_bug399925.html
diff --git a/image/test/mochitest/test_bug415761.html b/system/image/test/mochitest/test_bug415761.html
index 3799cd80c..3799cd80c 100644
--- a/image/test/mochitest/test_bug415761.html
+++ b/system/image/test/mochitest/test_bug415761.html
diff --git a/image/test/mochitest/test_bug435296.html b/system/image/test/mochitest/test_bug435296.html
index de24538dc..de24538dc 100644
--- a/image/test/mochitest/test_bug435296.html
+++ b/system/image/test/mochitest/test_bug435296.html
diff --git a/image/test/mochitest/test_bug466586.html b/system/image/test/mochitest/test_bug466586.html
index cf34bb783..cf34bb783 100644
--- a/image/test/mochitest/test_bug466586.html
+++ b/system/image/test/mochitest/test_bug466586.html
diff --git a/image/test/mochitest/test_bug468160.html b/system/image/test/mochitest/test_bug468160.html
index 322216cb2..322216cb2 100644
--- a/image/test/mochitest/test_bug468160.html
+++ b/system/image/test/mochitest/test_bug468160.html
diff --git a/image/test/mochitest/test_bug478398.html b/system/image/test/mochitest/test_bug478398.html
index a583f93a8..a583f93a8 100644
--- a/image/test/mochitest/test_bug478398.html
+++ b/system/image/test/mochitest/test_bug478398.html
diff --git a/image/test/mochitest/test_bug490949.html b/system/image/test/mochitest/test_bug490949.html
index 8bf3ba0c0..8bf3ba0c0 100644
--- a/image/test/mochitest/test_bug490949.html
+++ b/system/image/test/mochitest/test_bug490949.html
diff --git a/image/test/mochitest/test_bug496292.html b/system/image/test/mochitest/test_bug496292.html
index 299480106..299480106 100644
--- a/image/test/mochitest/test_bug496292.html
+++ b/system/image/test/mochitest/test_bug496292.html
diff --git a/image/test/mochitest/test_bug497665.html b/system/image/test/mochitest/test_bug497665.html
index 3a72c0912..3a72c0912 100644
--- a/image/test/mochitest/test_bug497665.html
+++ b/system/image/test/mochitest/test_bug497665.html
diff --git a/image/test/mochitest/test_bug552605-1.html b/system/image/test/mochitest/test_bug552605-1.html
index 19783711c..19783711c 100644
--- a/image/test/mochitest/test_bug552605-1.html
+++ b/system/image/test/mochitest/test_bug552605-1.html
diff --git a/image/test/mochitest/test_bug552605-2.html b/system/image/test/mochitest/test_bug552605-2.html
index 4ad1c61b2..4ad1c61b2 100644
--- a/image/test/mochitest/test_bug552605-2.html
+++ b/system/image/test/mochitest/test_bug552605-2.html
diff --git a/image/test/mochitest/test_bug553982.html b/system/image/test/mochitest/test_bug553982.html
index 01314ba00..01314ba00 100644
--- a/image/test/mochitest/test_bug553982.html
+++ b/system/image/test/mochitest/test_bug553982.html
diff --git a/image/test/mochitest/test_bug601470.html b/system/image/test/mochitest/test_bug601470.html
index a9e1cc788..a9e1cc788 100644
--- a/image/test/mochitest/test_bug601470.html
+++ b/system/image/test/mochitest/test_bug601470.html
diff --git a/image/test/mochitest/test_bug614392.html b/system/image/test/mochitest/test_bug614392.html
index 4cec54a05..4cec54a05 100644
--- a/image/test/mochitest/test_bug614392.html
+++ b/system/image/test/mochitest/test_bug614392.html
diff --git a/image/test/mochitest/test_bug657191.html b/system/image/test/mochitest/test_bug657191.html
index ccc4fd7bc..ccc4fd7bc 100644
--- a/image/test/mochitest/test_bug657191.html
+++ b/system/image/test/mochitest/test_bug657191.html
diff --git a/image/test/mochitest/test_bug671906.html b/system/image/test/mochitest/test_bug671906.html
index e3cd8d39f..e3cd8d39f 100644
--- a/image/test/mochitest/test_bug671906.html
+++ b/system/image/test/mochitest/test_bug671906.html
diff --git a/image/test/mochitest/test_bug733553.html b/system/image/test/mochitest/test_bug733553.html
index cd2982593..cd2982593 100644
--- a/image/test/mochitest/test_bug733553.html
+++ b/system/image/test/mochitest/test_bug733553.html
diff --git a/image/test/mochitest/test_bug767779.html b/system/image/test/mochitest/test_bug767779.html
index ba9c93d56..ba9c93d56 100644
--- a/image/test/mochitest/test_bug767779.html
+++ b/system/image/test/mochitest/test_bug767779.html
diff --git a/image/test/mochitest/test_bug865919.html b/system/image/test/mochitest/test_bug865919.html
index 6854c609a..6854c609a 100644
--- a/image/test/mochitest/test_bug865919.html
+++ b/system/image/test/mochitest/test_bug865919.html
diff --git a/image/test/mochitest/test_bug89419-1.html b/system/image/test/mochitest/test_bug89419-1.html
index 96140e66d..96140e66d 100644
--- a/image/test/mochitest/test_bug89419-1.html
+++ b/system/image/test/mochitest/test_bug89419-1.html
diff --git a/image/test/mochitest/test_bug89419-2.html b/system/image/test/mochitest/test_bug89419-2.html
index 9251c0253..9251c0253 100644
--- a/image/test/mochitest/test_bug89419-2.html
+++ b/system/image/test/mochitest/test_bug89419-2.html
diff --git a/image/test/mochitest/test_bullet_animation.html b/system/image/test/mochitest/test_bullet_animation.html
index bbc97cc85..bbc97cc85 100644
--- a/image/test/mochitest/test_bullet_animation.html
+++ b/system/image/test/mochitest/test_bullet_animation.html
diff --git a/image/test/mochitest/test_changeOfSource.html b/system/image/test/mochitest/test_changeOfSource.html
index be0993e56..be0993e56 100644
--- a/image/test/mochitest/test_changeOfSource.html
+++ b/system/image/test/mochitest/test_changeOfSource.html
diff --git a/image/test/mochitest/test_changeOfSource2.html b/system/image/test/mochitest/test_changeOfSource2.html
index 7f61b0f57..7f61b0f57 100644
--- a/image/test/mochitest/test_changeOfSource2.html
+++ b/system/image/test/mochitest/test_changeOfSource2.html
diff --git a/image/test/mochitest/test_drawDiscardedImage.html b/system/image/test/mochitest/test_drawDiscardedImage.html
index 7c99ba504..7c99ba504 100644
--- a/image/test/mochitest/test_drawDiscardedImage.html
+++ b/system/image/test/mochitest/test_drawDiscardedImage.html
diff --git a/image/test/mochitest/test_error_events.html b/system/image/test/mochitest/test_error_events.html
index ac1e0353b..ac1e0353b 100644
--- a/image/test/mochitest/test_error_events.html
+++ b/system/image/test/mochitest/test_error_events.html
diff --git a/image/test/mochitest/test_has_transparency.html b/system/image/test/mochitest/test_has_transparency.html
index ee42e655f..ee42e655f 100644
--- a/image/test/mochitest/test_has_transparency.html
+++ b/system/image/test/mochitest/test_has_transparency.html
diff --git a/image/test/mochitest/test_image_crossorigin_data_url.html b/system/image/test/mochitest/test_image_crossorigin_data_url.html
index 9facc00d4..9facc00d4 100644
--- a/image/test/mochitest/test_image_crossorigin_data_url.html
+++ b/system/image/test/mochitest/test_image_crossorigin_data_url.html
diff --git a/image/test/mochitest/test_net_failedtoprocess.html b/system/image/test/mochitest/test_net_failedtoprocess.html
index 37d179c78..37d179c78 100644
--- a/image/test/mochitest/test_net_failedtoprocess.html
+++ b/system/image/test/mochitest/test_net_failedtoprocess.html
diff --git a/image/test/mochitest/test_removal_ondecode.html b/system/image/test/mochitest/test_removal_ondecode.html
index fd594acf6..fd594acf6 100644
--- a/image/test/mochitest/test_removal_ondecode.html
+++ b/system/image/test/mochitest/test_removal_ondecode.html
diff --git a/image/test/mochitest/test_removal_onload.html b/system/image/test/mochitest/test_removal_onload.html
index fbfe62905..fbfe62905 100644
--- a/image/test/mochitest/test_removal_onload.html
+++ b/system/image/test/mochitest/test_removal_onload.html
diff --git a/image/test/mochitest/test_short_gif_header.html b/system/image/test/mochitest/test_short_gif_header.html
index 13276fb54..13276fb54 100644
--- a/image/test/mochitest/test_short_gif_header.html
+++ b/system/image/test/mochitest/test_short_gif_header.html
diff --git a/image/test/mochitest/test_staticClone.html b/system/image/test/mochitest/test_staticClone.html
index 0ceb0c0af..0ceb0c0af 100644
--- a/image/test/mochitest/test_staticClone.html
+++ b/system/image/test/mochitest/test_staticClone.html
diff --git a/image/test/mochitest/test_svg_animatedGIF.html b/system/image/test/mochitest/test_svg_animatedGIF.html
index aa9445e00..aa9445e00 100644
--- a/image/test/mochitest/test_svg_animatedGIF.html
+++ b/system/image/test/mochitest/test_svg_animatedGIF.html
diff --git a/image/test/mochitest/test_svg_filter_animation.html b/system/image/test/mochitest/test_svg_filter_animation.html
index 62e579068..62e579068 100644
--- a/image/test/mochitest/test_svg_filter_animation.html
+++ b/system/image/test/mochitest/test_svg_filter_animation.html
diff --git a/image/test/mochitest/test_synchronized_animation.html b/system/image/test/mochitest/test_synchronized_animation.html
index 01ddd481e..01ddd481e 100644
--- a/image/test/mochitest/test_synchronized_animation.html
+++ b/system/image/test/mochitest/test_synchronized_animation.html
diff --git a/image/test/mochitest/test_undisplayed_iframe.html b/system/image/test/mochitest/test_undisplayed_iframe.html
index adcdbb92d..adcdbb92d 100644
--- a/image/test/mochitest/test_undisplayed_iframe.html
+++ b/system/image/test/mochitest/test_undisplayed_iframe.html
diff --git a/image/test/mochitest/test_webcam.html b/system/image/test/mochitest/test_webcam.html
index 9f9764c24..9f9764c24 100644
--- a/image/test/mochitest/test_webcam.html
+++ b/system/image/test/mochitest/test_webcam.html
diff --git a/image/test/mochitest/test_xultree_animation.xhtml b/system/image/test/mochitest/test_xultree_animation.xhtml
index ad8ee3f4f..ad8ee3f4f 100644
--- a/image/test/mochitest/test_xultree_animation.xhtml
+++ b/system/image/test/mochitest/test_xultree_animation.xhtml
diff --git a/image/test/mochitest/transparent.gif b/system/image/test/mochitest/transparent.gif
index 48f5c7caf..48f5c7caf 100644
--- a/image/test/mochitest/transparent.gif
+++ b/system/image/test/mochitest/transparent.gif
diff --git a/image/test/mochitest/transparent.png b/system/image/test/mochitest/transparent.png
index fc8002053..fc8002053 100644
--- a/image/test/mochitest/transparent.png
+++ b/system/image/test/mochitest/transparent.png
diff --git a/image/test/mochitest/webcam-simulacrum.sjs b/system/image/test/mochitest/webcam-simulacrum.sjs
index 23872e675..23872e675 100644
--- a/image/test/mochitest/webcam-simulacrum.sjs
+++ b/system/image/test/mochitest/webcam-simulacrum.sjs
diff --git a/image/test/reftest/ImageDocument.css b/system/image/test/reftest/ImageDocument.css
index b44981098..b44981098 100644
--- a/image/test/reftest/ImageDocument.css
+++ b/system/image/test/reftest/ImageDocument.css
diff --git a/image/test/reftest/apng/bug411852-1-ref.png b/system/image/test/reftest/apng/bug411852-1-ref.png
index 04b862a1d..04b862a1d 100644
--- a/image/test/reftest/apng/bug411852-1-ref.png
+++ b/system/image/test/reftest/apng/bug411852-1-ref.png
diff --git a/image/test/reftest/apng/bug411852-1.png b/system/image/test/reftest/apng/bug411852-1.png
index 643f87e17..643f87e17 100644
--- a/image/test/reftest/apng/bug411852-1.png
+++ b/system/image/test/reftest/apng/bug411852-1.png
diff --git a/image/test/reftest/apng/bug546272-ref.png b/system/image/test/reftest/apng/bug546272-ref.png
index 85dfd8ccf..85dfd8ccf 100644
--- a/image/test/reftest/apng/bug546272-ref.png
+++ b/system/image/test/reftest/apng/bug546272-ref.png
diff --git a/image/test/reftest/apng/bug546272.png b/system/image/test/reftest/apng/bug546272.png
index 5232d7f8f..5232d7f8f 100644
--- a/image/test/reftest/apng/bug546272.png
+++ b/system/image/test/reftest/apng/bug546272.png
diff --git a/image/test/reftest/apng/delaytest.html b/system/image/test/reftest/apng/delaytest.html
index 4a0b935d9..4a0b935d9 100644
--- a/image/test/reftest/apng/delaytest.html
+++ b/system/image/test/reftest/apng/delaytest.html
diff --git a/image/test/reftest/apng/reftest-stylo.list b/system/image/test/reftest/apng/reftest-stylo.list
index 229de2161..229de2161 100644
--- a/image/test/reftest/apng/reftest-stylo.list
+++ b/system/image/test/reftest/apng/reftest-stylo.list
diff --git a/image/test/reftest/apng/reftest.list b/system/image/test/reftest/apng/reftest.list
index eb1c02462..eb1c02462 100644
--- a/image/test/reftest/apng/reftest.list
+++ b/system/image/test/reftest/apng/reftest.list
diff --git a/image/test/reftest/blob/blob-uri-with-ref-param-notref.html b/system/image/test/reftest/blob/blob-uri-with-ref-param-notref.html
index 3b62a3c13..3b62a3c13 100644
--- a/image/test/reftest/blob/blob-uri-with-ref-param-notref.html
+++ b/system/image/test/reftest/blob/blob-uri-with-ref-param-notref.html
diff --git a/image/test/reftest/blob/blob-uri-with-ref-param.html b/system/image/test/reftest/blob/blob-uri-with-ref-param.html
index 8f2e4e7cf..8f2e4e7cf 100644
--- a/image/test/reftest/blob/blob-uri-with-ref-param.html
+++ b/system/image/test/reftest/blob/blob-uri-with-ref-param.html
diff --git a/image/test/reftest/blob/image.png b/system/image/test/reftest/blob/image.png
index d7d87adce..d7d87adce 100644
--- a/image/test/reftest/blob/image.png
+++ b/system/image/test/reftest/blob/image.png
diff --git a/image/test/reftest/blob/reftest-stylo.list b/system/image/test/reftest/blob/reftest-stylo.list
index 06f01ef7f..06f01ef7f 100644
--- a/image/test/reftest/blob/reftest-stylo.list
+++ b/system/image/test/reftest/blob/reftest-stylo.list
diff --git a/image/test/reftest/blob/reftest.list b/system/image/test/reftest/blob/reftest.list
index e795ba9d3..e795ba9d3 100644
--- a/image/test/reftest/blob/reftest.list
+++ b/system/image/test/reftest/blob/reftest.list
diff --git a/image/test/reftest/bmp/1240629-1.bmp b/system/image/test/reftest/bmp/1240629-1.bmp
index 604d248e7..604d248e7 100644
--- a/image/test/reftest/bmp/1240629-1.bmp
+++ b/system/image/test/reftest/bmp/1240629-1.bmp
diff --git a/image/test/reftest/bmp/1240629-2.bmp b/system/image/test/reftest/bmp/1240629-2.bmp
index e4fe80d59..e4fe80d59 100644
--- a/image/test/reftest/bmp/1240629-2.bmp
+++ b/system/image/test/reftest/bmp/1240629-2.bmp
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-not-square-1bpp.bmp b/system/image/test/reftest/bmp/bmp-1bpp/bmp-not-square-1bpp.bmp
index 302e0c712..302e0c712 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-not-square-1bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-not-square-1bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-not-square-1bpp.png b/system/image/test/reftest/bmp/bmp-1bpp/bmp-not-square-1bpp.png
index f9318693d..f9318693d 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-not-square-1bpp.png
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-not-square-1bpp.png
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-15x15-1bpp.bmp b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-15x15-1bpp.bmp
index e769ff864..e769ff864 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-15x15-1bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-15x15-1bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-15x15-1bpp.png b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-15x15-1bpp.png
index 956c78ece..956c78ece 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-15x15-1bpp.png
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-15x15-1bpp.png
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-16x16-1bpp.bmp b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-16x16-1bpp.bmp
index ff012d98c..ff012d98c 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-16x16-1bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-16x16-1bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-16x16-1bpp.png b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-16x16-1bpp.png
index 90088351f..90088351f 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-16x16-1bpp.png
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-16x16-1bpp.png
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-17x17-1bpp.bmp b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-17x17-1bpp.bmp
index 86f56476e..86f56476e 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-17x17-1bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-17x17-1bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-17x17-1bpp.png b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-17x17-1bpp.png
index 9a294696c..9a294696c 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-17x17-1bpp.png
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-17x17-1bpp.png
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-1x1-1bpp.bmp b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-1x1-1bpp.bmp
index 0f98654d8..0f98654d8 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-1x1-1bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-1x1-1bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-1x1-1bpp.ico b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-1x1-1bpp.ico
index 5af8bef61..5af8bef61 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-1x1-1bpp.ico
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-1x1-1bpp.ico
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-1x1-1bpp.png b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-1x1-1bpp.png
index 7a07a124e..7a07a124e 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-1x1-1bpp.png
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-1x1-1bpp.png
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-2x2-1bpp.bmp b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-2x2-1bpp.bmp
index 5544c6437..5544c6437 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-2x2-1bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-2x2-1bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-2x2-1bpp.png b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-2x2-1bpp.png
index 3b09f8076..3b09f8076 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-2x2-1bpp.png
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-2x2-1bpp.png
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-31x31-1bpp.bmp b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-31x31-1bpp.bmp
index 8afcc56cc..8afcc56cc 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-31x31-1bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-31x31-1bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-31x31-1bpp.png b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-31x31-1bpp.png
index d1fe6ddee..d1fe6ddee 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-31x31-1bpp.png
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-31x31-1bpp.png
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-32x32-1bpp.bmp b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-32x32-1bpp.bmp
index 255e5526c..255e5526c 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-32x32-1bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-32x32-1bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-32x32-1bpp.png b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-32x32-1bpp.png
index 078d3dc5d..078d3dc5d 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-32x32-1bpp.png
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-32x32-1bpp.png
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-33x33-1bpp.bmp b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-33x33-1bpp.bmp
index 6d752a2e1..6d752a2e1 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-33x33-1bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-33x33-1bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-33x33-1bpp.png b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-33x33-1bpp.png
index e64e12b2a..e64e12b2a 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-33x33-1bpp.png
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-33x33-1bpp.png
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-3x3-1bpp.bmp b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-3x3-1bpp.bmp
index d4f885687..d4f885687 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-3x3-1bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-3x3-1bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-3x3-1bpp.png b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-3x3-1bpp.png
index b8519a874..b8519a874 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-3x3-1bpp.png
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-3x3-1bpp.png
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-4x4-1bpp.bmp b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-4x4-1bpp.bmp
index c0b9128fe..c0b9128fe 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-4x4-1bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-4x4-1bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-4x4-1bpp.png b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-4x4-1bpp.png
index 3977b5454..3977b5454 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-4x4-1bpp.png
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-4x4-1bpp.png
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-5x5-1bpp.bmp b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-5x5-1bpp.bmp
index c02b2288d..c02b2288d 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-5x5-1bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-5x5-1bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-5x5-1bpp.png b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-5x5-1bpp.png
index caa9246b6..caa9246b6 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-5x5-1bpp.png
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-5x5-1bpp.png
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-6x6-1bpp.bmp b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-6x6-1bpp.bmp
index 64415c6ec..64415c6ec 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-6x6-1bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-6x6-1bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-6x6-1bpp.png b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-6x6-1bpp.png
index 30e1b0249..30e1b0249 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-6x6-1bpp.png
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-6x6-1bpp.png
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-7x7-1bpp.bmp b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-7x7-1bpp.bmp
index d8e867a0d..d8e867a0d 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-7x7-1bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-7x7-1bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-7x7-1bpp.png b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-7x7-1bpp.png
index 9dbaae84c..9dbaae84c 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-7x7-1bpp.png
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-7x7-1bpp.png
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-8x8-1bpp.bmp b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-8x8-1bpp.bmp
index 207e84f80..207e84f80 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-8x8-1bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-8x8-1bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-8x8-1bpp.png b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-8x8-1bpp.png
index 220138840..220138840 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-8x8-1bpp.png
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-8x8-1bpp.png
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-9x9-1bpp.bmp b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-9x9-1bpp.bmp
index 871eb7c0f..871eb7c0f 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-9x9-1bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-9x9-1bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-1bpp/bmp-size-9x9-1bpp.png b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-9x9-1bpp.png
index 7fe1b548b..7fe1b548b 100644
--- a/image/test/reftest/bmp/bmp-1bpp/bmp-size-9x9-1bpp.png
+++ b/system/image/test/reftest/bmp/bmp-1bpp/bmp-size-9x9-1bpp.png
diff --git a/image/test/reftest/bmp/bmp-1bpp/os2bmp-size-32x32-1bpp.bmp b/system/image/test/reftest/bmp/bmp-1bpp/os2bmp-size-32x32-1bpp.bmp
index 32bfc5e8f..32bfc5e8f 100644
--- a/image/test/reftest/bmp/bmp-1bpp/os2bmp-size-32x32-1bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-1bpp/os2bmp-size-32x32-1bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-1bpp/reftest-stylo.list b/system/image/test/reftest/bmp/bmp-1bpp/reftest-stylo.list
index ff10dd811..ff10dd811 100644
--- a/image/test/reftest/bmp/bmp-1bpp/reftest-stylo.list
+++ b/system/image/test/reftest/bmp/bmp-1bpp/reftest-stylo.list
diff --git a/image/test/reftest/bmp/bmp-1bpp/reftest.list b/system/image/test/reftest/bmp/bmp-1bpp/reftest.list
index 15274c2bc..15274c2bc 100644
--- a/image/test/reftest/bmp/bmp-1bpp/reftest.list
+++ b/system/image/test/reftest/bmp/bmp-1bpp/reftest.list
diff --git a/image/test/reftest/bmp/bmp-1bpp/top-to-bottom-16x16-1bpp.bmp b/system/image/test/reftest/bmp/bmp-1bpp/top-to-bottom-16x16-1bpp.bmp
index 8633ef2aa..8633ef2aa 100644
--- a/image/test/reftest/bmp/bmp-1bpp/top-to-bottom-16x16-1bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-1bpp/top-to-bottom-16x16-1bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-not-square-24bpp.bmp b/system/image/test/reftest/bmp/bmp-24bpp/bmp-not-square-24bpp.bmp
index 9d1f4de2c..9d1f4de2c 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-not-square-24bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-not-square-24bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-not-square-24bpp.png b/system/image/test/reftest/bmp/bmp-24bpp/bmp-not-square-24bpp.png
index 9b0d16081..9b0d16081 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-not-square-24bpp.png
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-not-square-24bpp.png
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-15x15-24bpp.bmp b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-15x15-24bpp.bmp
index ba029510b..ba029510b 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-15x15-24bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-15x15-24bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-15x15-24bpp.png b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-15x15-24bpp.png
index e1287430d..e1287430d 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-15x15-24bpp.png
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-15x15-24bpp.png
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-16x16-24bpp.bmp b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-16x16-24bpp.bmp
index f35d70669..f35d70669 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-16x16-24bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-16x16-24bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-16x16-24bpp.png b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-16x16-24bpp.png
index c04869e72..c04869e72 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-16x16-24bpp.png
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-16x16-24bpp.png
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-17x17-24bpp.bmp b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-17x17-24bpp.bmp
index fc576c498..fc576c498 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-17x17-24bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-17x17-24bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-17x17-24bpp.png b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-17x17-24bpp.png
index 00fb8e4f3..00fb8e4f3 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-17x17-24bpp.png
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-17x17-24bpp.png
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-1x1-24bpp.bmp b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-1x1-24bpp.bmp
index db790d50c..db790d50c 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-1x1-24bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-1x1-24bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-1x1-24bpp.png b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-1x1-24bpp.png
index c05f5fef8..c05f5fef8 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-1x1-24bpp.png
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-1x1-24bpp.png
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-2x2-24bpp.bmp b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-2x2-24bpp.bmp
index 19bff3d01..19bff3d01 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-2x2-24bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-2x2-24bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-2x2-24bpp.png b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-2x2-24bpp.png
index e512d3f9b..e512d3f9b 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-2x2-24bpp.png
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-2x2-24bpp.png
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-31x31-24bpp.bmp b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-31x31-24bpp.bmp
index da11048cb..da11048cb 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-31x31-24bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-31x31-24bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-31x31-24bpp.png b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-31x31-24bpp.png
index e4a864251..e4a864251 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-31x31-24bpp.png
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-31x31-24bpp.png
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-32x32-24bpp.bmp b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-32x32-24bpp.bmp
index e1631e5fd..e1631e5fd 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-32x32-24bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-32x32-24bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-32x32-24bpp.png b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-32x32-24bpp.png
index 3a6fbe8ee..3a6fbe8ee 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-32x32-24bpp.png
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-32x32-24bpp.png
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-33x33-24bpp.bmp b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-33x33-24bpp.bmp
index d228cf063..d228cf063 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-33x33-24bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-33x33-24bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-33x33-24bpp.png b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-33x33-24bpp.png
index 72ef7eb63..72ef7eb63 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-33x33-24bpp.png
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-33x33-24bpp.png
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-3x3-24bpp.bmp b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-3x3-24bpp.bmp
index f353f9b6d..f353f9b6d 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-3x3-24bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-3x3-24bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-3x3-24bpp.png b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-3x3-24bpp.png
index cb42ec4f8..cb42ec4f8 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-3x3-24bpp.png
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-3x3-24bpp.png
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-4x4-24bpp.bmp b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-4x4-24bpp.bmp
index 2373435f4..2373435f4 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-4x4-24bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-4x4-24bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-4x4-24bpp.png b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-4x4-24bpp.png
index e6afafd89..e6afafd89 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-4x4-24bpp.png
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-4x4-24bpp.png
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-5x5-24bpp.bmp b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-5x5-24bpp.bmp
index a3016fc1a..a3016fc1a 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-5x5-24bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-5x5-24bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-5x5-24bpp.png b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-5x5-24bpp.png
index a844aff76..a844aff76 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-5x5-24bpp.png
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-5x5-24bpp.png
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-6x6-24bpp.bmp b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-6x6-24bpp.bmp
index cba1d62cc..cba1d62cc 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-6x6-24bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-6x6-24bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-6x6-24bpp.png b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-6x6-24bpp.png
index 415c2d9c6..415c2d9c6 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-6x6-24bpp.png
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-6x6-24bpp.png
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-7x7-24bpp.bmp b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-7x7-24bpp.bmp
index 87cd419b4..87cd419b4 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-7x7-24bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-7x7-24bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-7x7-24bpp.png b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-7x7-24bpp.png
index ab2f89274..ab2f89274 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-7x7-24bpp.png
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-7x7-24bpp.png
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-8x8-24bpp.bmp b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-8x8-24bpp.bmp
index b6f108a04..b6f108a04 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-8x8-24bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-8x8-24bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-8x8-24bpp.png b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-8x8-24bpp.png
index fe2ff40a1..fe2ff40a1 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-8x8-24bpp.png
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-8x8-24bpp.png
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-9x9-24bpp.bmp b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-9x9-24bpp.bmp
index 8140b1905..8140b1905 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-9x9-24bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-9x9-24bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-24bpp/bmp-size-9x9-24bpp.png b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-9x9-24bpp.png
index 18ab4b25d..18ab4b25d 100644
--- a/image/test/reftest/bmp/bmp-24bpp/bmp-size-9x9-24bpp.png
+++ b/system/image/test/reftest/bmp/bmp-24bpp/bmp-size-9x9-24bpp.png
diff --git a/image/test/reftest/bmp/bmp-24bpp/os2bmp-size-32x32-24bpp.bmp b/system/image/test/reftest/bmp/bmp-24bpp/os2bmp-size-32x32-24bpp.bmp
index b75ae62ca..b75ae62ca 100644
--- a/image/test/reftest/bmp/bmp-24bpp/os2bmp-size-32x32-24bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-24bpp/os2bmp-size-32x32-24bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-24bpp/reftest-stylo.list b/system/image/test/reftest/bmp/bmp-24bpp/reftest-stylo.list
index 29040bfc5..29040bfc5 100644
--- a/image/test/reftest/bmp/bmp-24bpp/reftest-stylo.list
+++ b/system/image/test/reftest/bmp/bmp-24bpp/reftest-stylo.list
diff --git a/image/test/reftest/bmp/bmp-24bpp/reftest.list b/system/image/test/reftest/bmp/bmp-24bpp/reftest.list
index 83ec17563..83ec17563 100644
--- a/image/test/reftest/bmp/bmp-24bpp/reftest.list
+++ b/system/image/test/reftest/bmp/bmp-24bpp/reftest.list
diff --git a/image/test/reftest/bmp/bmp-24bpp/top-to-bottom-16x16-24bpp.bmp b/system/image/test/reftest/bmp/bmp-24bpp/top-to-bottom-16x16-24bpp.bmp
index bd18f85d4..bd18f85d4 100644
--- a/image/test/reftest/bmp/bmp-24bpp/top-to-bottom-16x16-24bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-24bpp/top-to-bottom-16x16-24bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-not-square-4bpp.bmp b/system/image/test/reftest/bmp/bmp-4bpp/bmp-not-square-4bpp.bmp
index f63dd81bd..f63dd81bd 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-not-square-4bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-not-square-4bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-not-square-4bpp.png b/system/image/test/reftest/bmp/bmp-4bpp/bmp-not-square-4bpp.png
index 7c713c557..7c713c557 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-not-square-4bpp.png
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-not-square-4bpp.png
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-15x15-4bpp.bmp b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-15x15-4bpp.bmp
index 8b586dbfd..8b586dbfd 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-15x15-4bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-15x15-4bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-15x15-4bpp.png b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-15x15-4bpp.png
index 5d4a3f953..5d4a3f953 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-15x15-4bpp.png
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-15x15-4bpp.png
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-16x16-4bpp.bmp b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-16x16-4bpp.bmp
index eae432e65..eae432e65 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-16x16-4bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-16x16-4bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-16x16-4bpp.png b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-16x16-4bpp.png
index d45d63f53..d45d63f53 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-16x16-4bpp.png
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-16x16-4bpp.png
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-17x17-4bpp.bmp b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-17x17-4bpp.bmp
index 5880c6111..5880c6111 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-17x17-4bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-17x17-4bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-17x17-4bpp.png b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-17x17-4bpp.png
index bf4890329..bf4890329 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-17x17-4bpp.png
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-17x17-4bpp.png
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-1x1-4bpp.bmp b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-1x1-4bpp.bmp
index 2ba68a391..2ba68a391 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-1x1-4bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-1x1-4bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-1x1-4bpp.png b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-1x1-4bpp.png
index d41dd645b..d41dd645b 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-1x1-4bpp.png
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-1x1-4bpp.png
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-2x2-4bpp.bmp b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-2x2-4bpp.bmp
index 6c6383aa8..6c6383aa8 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-2x2-4bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-2x2-4bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-2x2-4bpp.png b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-2x2-4bpp.png
index b2d605041..b2d605041 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-2x2-4bpp.png
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-2x2-4bpp.png
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-31x31-4bpp.bmp b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-31x31-4bpp.bmp
index ac440a6d8..ac440a6d8 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-31x31-4bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-31x31-4bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-31x31-4bpp.png b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-31x31-4bpp.png
index cb12a3448..cb12a3448 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-31x31-4bpp.png
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-31x31-4bpp.png
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-32x32-4bpp.bmp b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-32x32-4bpp.bmp
index e4383c473..e4383c473 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-32x32-4bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-32x32-4bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-32x32-4bpp.png b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-32x32-4bpp.png
index 58d867d12..58d867d12 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-32x32-4bpp.png
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-32x32-4bpp.png
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-33x33-4bpp.bmp b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-33x33-4bpp.bmp
index 04b2c1d1f..04b2c1d1f 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-33x33-4bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-33x33-4bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-33x33-4bpp.png b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-33x33-4bpp.png
index 064fde198..064fde198 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-33x33-4bpp.png
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-33x33-4bpp.png
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-3x3-4bpp.bmp b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-3x3-4bpp.bmp
index 179dbcfa5..179dbcfa5 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-3x3-4bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-3x3-4bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-3x3-4bpp.png b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-3x3-4bpp.png
index e34114d5c..e34114d5c 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-3x3-4bpp.png
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-3x3-4bpp.png
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-4x4-4bpp.bmp b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-4x4-4bpp.bmp
index 0f57e102e..0f57e102e 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-4x4-4bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-4x4-4bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-4x4-4bpp.png b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-4x4-4bpp.png
index 3efa55562..3efa55562 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-4x4-4bpp.png
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-4x4-4bpp.png
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-5x5-4bpp.bmp b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-5x5-4bpp.bmp
index a4efe6660..a4efe6660 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-5x5-4bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-5x5-4bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-5x5-4bpp.png b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-5x5-4bpp.png
index 02ebf57a5..02ebf57a5 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-5x5-4bpp.png
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-5x5-4bpp.png
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-6x6-4bpp.bmp b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-6x6-4bpp.bmp
index f4e1a2918..f4e1a2918 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-6x6-4bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-6x6-4bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-6x6-4bpp.png b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-6x6-4bpp.png
index 1f5769d09..1f5769d09 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-6x6-4bpp.png
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-6x6-4bpp.png
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-7x7-4bpp.bmp b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-7x7-4bpp.bmp
index e7ee1cf20..e7ee1cf20 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-7x7-4bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-7x7-4bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-7x7-4bpp.png b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-7x7-4bpp.png
index 59a1b98b5..59a1b98b5 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-7x7-4bpp.png
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-7x7-4bpp.png
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-8x8-4bpp.bmp b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-8x8-4bpp.bmp
index aa6959baf..aa6959baf 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-8x8-4bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-8x8-4bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-8x8-4bpp.png b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-8x8-4bpp.png
index cf44f5967..cf44f5967 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-8x8-4bpp.png
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-8x8-4bpp.png
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-9x9-4bpp.bmp b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-9x9-4bpp.bmp
index 65ec12a37..65ec12a37 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-9x9-4bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-9x9-4bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-4bpp/bmp-size-9x9-4bpp.png b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-9x9-4bpp.png
index 2e0736413..2e0736413 100644
--- a/image/test/reftest/bmp/bmp-4bpp/bmp-size-9x9-4bpp.png
+++ b/system/image/test/reftest/bmp/bmp-4bpp/bmp-size-9x9-4bpp.png
diff --git a/image/test/reftest/bmp/bmp-4bpp/os2bmp-size-32x32-4bpp.bmp b/system/image/test/reftest/bmp/bmp-4bpp/os2bmp-size-32x32-4bpp.bmp
index 08fc30d5f..08fc30d5f 100644
--- a/image/test/reftest/bmp/bmp-4bpp/os2bmp-size-32x32-4bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-4bpp/os2bmp-size-32x32-4bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-4bpp/reftest-stylo.list b/system/image/test/reftest/bmp/bmp-4bpp/reftest-stylo.list
index 229f1c0d6..229f1c0d6 100644
--- a/image/test/reftest/bmp/bmp-4bpp/reftest-stylo.list
+++ b/system/image/test/reftest/bmp/bmp-4bpp/reftest-stylo.list
diff --git a/image/test/reftest/bmp/bmp-4bpp/reftest.list b/system/image/test/reftest/bmp/bmp-4bpp/reftest.list
index 4a1785e86..4a1785e86 100644
--- a/image/test/reftest/bmp/bmp-4bpp/reftest.list
+++ b/system/image/test/reftest/bmp/bmp-4bpp/reftest.list
diff --git a/image/test/reftest/bmp/bmp-4bpp/rle4-delta-320x240.bmp b/system/image/test/reftest/bmp/bmp-4bpp/rle4-delta-320x240.bmp
index 78a092787..78a092787 100644
--- a/image/test/reftest/bmp/bmp-4bpp/rle4-delta-320x240.bmp
+++ b/system/image/test/reftest/bmp/bmp-4bpp/rle4-delta-320x240.bmp
diff --git a/image/test/reftest/bmp/bmp-4bpp/rle4-delta-320x240.png b/system/image/test/reftest/bmp/bmp-4bpp/rle4-delta-320x240.png
index f9a3ceae2..f9a3ceae2 100644
--- a/image/test/reftest/bmp/bmp-4bpp/rle4-delta-320x240.png
+++ b/system/image/test/reftest/bmp/bmp-4bpp/rle4-delta-320x240.png
diff --git a/image/test/reftest/bmp/bmp-4bpp/top-to-bottom-16x16-4bpp.bmp b/system/image/test/reftest/bmp/bmp-4bpp/top-to-bottom-16x16-4bpp.bmp
index c77696b32..c77696b32 100644
--- a/image/test/reftest/bmp/bmp-4bpp/top-to-bottom-16x16-4bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-4bpp/top-to-bottom-16x16-4bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-not-square-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/bmp-not-square-8bpp.bmp
index d7a99164c..d7a99164c 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-not-square-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-not-square-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-not-square-8bpp.png b/system/image/test/reftest/bmp/bmp-8bpp/bmp-not-square-8bpp.png
index be45f19d5..be45f19d5 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-not-square-8bpp.png
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-not-square-8bpp.png
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-15x15-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-15x15-8bpp.bmp
index 8dac8ec86..8dac8ec86 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-15x15-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-15x15-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-15x15-8bpp.png b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-15x15-8bpp.png
index ce0055305..ce0055305 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-15x15-8bpp.png
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-15x15-8bpp.png
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-16x16-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-16x16-8bpp.bmp
index bb60249ac..bb60249ac 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-16x16-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-16x16-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-16x16-8bpp.png b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-16x16-8bpp.png
index 6a2394618..6a2394618 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-16x16-8bpp.png
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-16x16-8bpp.png
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-17x17-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-17x17-8bpp.bmp
index b81788851..b81788851 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-17x17-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-17x17-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-17x17-8bpp.png b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-17x17-8bpp.png
index 494cd96cd..494cd96cd 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-17x17-8bpp.png
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-17x17-8bpp.png
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-1x1-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-1x1-8bpp.bmp
index 9f3ef5136..9f3ef5136 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-1x1-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-1x1-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-1x1-8bpp.png b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-1x1-8bpp.png
index a7553a73f..a7553a73f 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-1x1-8bpp.png
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-1x1-8bpp.png
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-2x2-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-2x2-8bpp.bmp
index 63d3f1c05..63d3f1c05 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-2x2-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-2x2-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-2x2-8bpp.png b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-2x2-8bpp.png
index 17257e992..17257e992 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-2x2-8bpp.png
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-2x2-8bpp.png
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-31x31-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-31x31-8bpp.bmp
index e4fd01fe0..e4fd01fe0 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-31x31-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-31x31-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-31x31-8bpp.png b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-31x31-8bpp.png
index d43ac8390..d43ac8390 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-31x31-8bpp.png
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-31x31-8bpp.png
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-32x32-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-32x32-8bpp.bmp
index d2f800d67..d2f800d67 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-32x32-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-32x32-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-32x32-8bpp.png b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-32x32-8bpp.png
index 03642849a..03642849a 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-32x32-8bpp.png
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-32x32-8bpp.png
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-33x33-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-33x33-8bpp.bmp
index 19b0744db..19b0744db 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-33x33-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-33x33-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-33x33-8bpp.png b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-33x33-8bpp.png
index 078b56df0..078b56df0 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-33x33-8bpp.png
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-33x33-8bpp.png
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-3x3-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-3x3-8bpp.bmp
index 9f15f3583..9f15f3583 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-3x3-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-3x3-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-3x3-8bpp.png b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-3x3-8bpp.png
index ba34b2601..ba34b2601 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-3x3-8bpp.png
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-3x3-8bpp.png
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-4x4-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-4x4-8bpp.bmp
index 1ad7a8de1..1ad7a8de1 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-4x4-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-4x4-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-4x4-8bpp.png b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-4x4-8bpp.png
index ecf9e5e79..ecf9e5e79 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-4x4-8bpp.png
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-4x4-8bpp.png
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-5x5-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-5x5-8bpp.bmp
index 6eb759d06..6eb759d06 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-5x5-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-5x5-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-5x5-8bpp.png b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-5x5-8bpp.png
index 1a440a16b..1a440a16b 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-5x5-8bpp.png
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-5x5-8bpp.png
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-6x6-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-6x6-8bpp.bmp
index a1e0e2415..a1e0e2415 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-6x6-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-6x6-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-6x6-8bpp.png b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-6x6-8bpp.png
index e0ac1a8f6..e0ac1a8f6 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-6x6-8bpp.png
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-6x6-8bpp.png
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-7x7-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-7x7-8bpp.bmp
index 25c59d735..25c59d735 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-7x7-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-7x7-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-7x7-8bpp.png b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-7x7-8bpp.png
index 51c764265..51c764265 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-7x7-8bpp.png
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-7x7-8bpp.png
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-8x8-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-8x8-8bpp.bmp
index ff5b7681c..ff5b7681c 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-8x8-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-8x8-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-8x8-8bpp.png b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-8x8-8bpp.png
index 77dc7782e..77dc7782e 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-8x8-8bpp.png
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-8x8-8bpp.png
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-9x9-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-9x9-8bpp.bmp
index 006961628..006961628 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-9x9-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-9x9-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/bmp-size-9x9-8bpp.png b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-9x9-8bpp.png
index 93914c3e1..93914c3e1 100644
--- a/image/test/reftest/bmp/bmp-8bpp/bmp-size-9x9-8bpp.png
+++ b/system/image/test/reftest/bmp/bmp-8bpp/bmp-size-9x9-8bpp.png
diff --git a/image/test/reftest/bmp/bmp-8bpp/os2-bmp-size-32x32-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/os2-bmp-size-32x32-8bpp.bmp
index b6df221e1..b6df221e1 100644
--- a/image/test/reftest/bmp/bmp-8bpp/os2-bmp-size-32x32-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/os2-bmp-size-32x32-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/reftest-stylo.list b/system/image/test/reftest/bmp/bmp-8bpp/reftest-stylo.list
index 237517976..237517976 100644
--- a/image/test/reftest/bmp/bmp-8bpp/reftest-stylo.list
+++ b/system/image/test/reftest/bmp/bmp-8bpp/reftest-stylo.list
diff --git a/image/test/reftest/bmp/bmp-8bpp/reftest.list b/system/image/test/reftest/bmp/bmp-8bpp/reftest.list
index c1f264143..c1f264143 100644
--- a/image/test/reftest/bmp/bmp-8bpp/reftest.list
+++ b/system/image/test/reftest/bmp/bmp-8bpp/reftest.list
diff --git a/image/test/reftest/bmp/bmp-8bpp/rle-bmp-not-square-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/rle-bmp-not-square-8bpp.bmp
index 8687aab6c..8687aab6c 100644
--- a/image/test/reftest/bmp/bmp-8bpp/rle-bmp-not-square-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/rle-bmp-not-square-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/rle-bmp-size-32x32-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/rle-bmp-size-32x32-8bpp.bmp
index bd793b6b6..bd793b6b6 100644
--- a/image/test/reftest/bmp/bmp-8bpp/rle-bmp-size-32x32-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/rle-bmp-size-32x32-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/top-to-bottom-16x16-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/top-to-bottom-16x16-8bpp.bmp
index bb60249ac..bb60249ac 100644
--- a/image/test/reftest/bmp/bmp-8bpp/top-to-bottom-16x16-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/top-to-bottom-16x16-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-8bpp/top-to-bottom-rle-bmp-size-32x32-8bpp.bmp b/system/image/test/reftest/bmp/bmp-8bpp/top-to-bottom-rle-bmp-size-32x32-8bpp.bmp
index 396672ea1..396672ea1 100644
--- a/image/test/reftest/bmp/bmp-8bpp/top-to-bottom-rle-bmp-size-32x32-8bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-8bpp/top-to-bottom-rle-bmp-size-32x32-8bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-corrupted/invalid-bpp.bmp b/system/image/test/reftest/bmp/bmp-corrupted/invalid-bpp.bmp
index c00dd3fa4..c00dd3fa4 100644
--- a/image/test/reftest/bmp/bmp-corrupted/invalid-bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-corrupted/invalid-bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-corrupted/invalid-compression-BITFIELDS.bmp b/system/image/test/reftest/bmp/bmp-corrupted/invalid-compression-BITFIELDS.bmp
index 92a722526..92a722526 100644
--- a/image/test/reftest/bmp/bmp-corrupted/invalid-compression-BITFIELDS.bmp
+++ b/system/image/test/reftest/bmp/bmp-corrupted/invalid-compression-BITFIELDS.bmp
diff --git a/image/test/reftest/bmp/bmp-corrupted/invalid-compression-RLE4.bmp b/system/image/test/reftest/bmp/bmp-corrupted/invalid-compression-RLE4.bmp
index d73c89411..d73c89411 100644
--- a/image/test/reftest/bmp/bmp-corrupted/invalid-compression-RLE4.bmp
+++ b/system/image/test/reftest/bmp/bmp-corrupted/invalid-compression-RLE4.bmp
diff --git a/image/test/reftest/bmp/bmp-corrupted/invalid-compression-RLE8.bmp b/system/image/test/reftest/bmp/bmp-corrupted/invalid-compression-RLE8.bmp
index 5a8806454..5a8806454 100644
--- a/image/test/reftest/bmp/bmp-corrupted/invalid-compression-RLE8.bmp
+++ b/system/image/test/reftest/bmp/bmp-corrupted/invalid-compression-RLE8.bmp
diff --git a/image/test/reftest/bmp/bmp-corrupted/invalid-compression.bmp b/system/image/test/reftest/bmp/bmp-corrupted/invalid-compression.bmp
index aa3134e56..aa3134e56 100644
--- a/image/test/reftest/bmp/bmp-corrupted/invalid-compression.bmp
+++ b/system/image/test/reftest/bmp/bmp-corrupted/invalid-compression.bmp
diff --git a/image/test/reftest/bmp/bmp-corrupted/invalid-signature.bmp b/system/image/test/reftest/bmp/bmp-corrupted/invalid-signature.bmp
index 6eebb5718..6eebb5718 100644
--- a/image/test/reftest/bmp/bmp-corrupted/invalid-signature.bmp
+++ b/system/image/test/reftest/bmp/bmp-corrupted/invalid-signature.bmp
diff --git a/image/test/reftest/bmp/bmp-corrupted/invalid-truncated-metadata.bmp b/system/image/test/reftest/bmp/bmp-corrupted/invalid-truncated-metadata.bmp
index 228c5c999..228c5c999 100644
--- a/image/test/reftest/bmp/bmp-corrupted/invalid-truncated-metadata.bmp
+++ b/system/image/test/reftest/bmp/bmp-corrupted/invalid-truncated-metadata.bmp
diff --git a/image/test/reftest/bmp/bmp-corrupted/os2-invalid-bpp.bmp b/system/image/test/reftest/bmp/bmp-corrupted/os2-invalid-bpp.bmp
index af4678a28..af4678a28 100644
--- a/image/test/reftest/bmp/bmp-corrupted/os2-invalid-bpp.bmp
+++ b/system/image/test/reftest/bmp/bmp-corrupted/os2-invalid-bpp.bmp
diff --git a/image/test/reftest/bmp/bmp-corrupted/reftest-stylo.list b/system/image/test/reftest/bmp/bmp-corrupted/reftest-stylo.list
index bb776a7af..bb776a7af 100644
--- a/image/test/reftest/bmp/bmp-corrupted/reftest-stylo.list
+++ b/system/image/test/reftest/bmp/bmp-corrupted/reftest-stylo.list
diff --git a/image/test/reftest/bmp/bmp-corrupted/reftest.list b/system/image/test/reftest/bmp/bmp-corrupted/reftest.list
index be73e2cf3..be73e2cf3 100644
--- a/image/test/reftest/bmp/bmp-corrupted/reftest.list
+++ b/system/image/test/reftest/bmp/bmp-corrupted/reftest.list
diff --git a/image/test/reftest/bmp/bmp-corrupted/wrapper.html b/system/image/test/reftest/bmp/bmp-corrupted/wrapper.html
index 22b74c8fc..22b74c8fc 100644
--- a/image/test/reftest/bmp/bmp-corrupted/wrapper.html
+++ b/system/image/test/reftest/bmp/bmp-corrupted/wrapper.html
diff --git a/image/test/reftest/bmp/bmpsuite/COPYING.txt b/system/image/test/reftest/bmp/bmpsuite/COPYING.txt
index 10926e87f..10926e87f 100644
--- a/image/test/reftest/bmp/bmpsuite/COPYING.txt
+++ b/system/image/test/reftest/bmp/bmpsuite/COPYING.txt
diff --git a/image/test/reftest/bmp/bmpsuite/README.mozilla b/system/image/test/reftest/bmp/bmpsuite/README.mozilla
index 87d185e89..87d185e89 100644
--- a/image/test/reftest/bmp/bmpsuite/README.mozilla
+++ b/system/image/test/reftest/bmp/bmpsuite/README.mozilla
diff --git a/image/test/reftest/bmp/bmpsuite/b/badbitcount.bmp b/system/image/test/reftest/bmp/bmpsuite/b/badbitcount.bmp
index d4fa4e8b8..d4fa4e8b8 100644
--- a/image/test/reftest/bmp/bmpsuite/b/badbitcount.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/b/badbitcount.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/b/badbitssize.bmp b/system/image/test/reftest/bmp/bmpsuite/b/badbitssize.bmp
index 0a99a605a..0a99a605a 100644
--- a/image/test/reftest/bmp/bmpsuite/b/badbitssize.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/b/badbitssize.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/b/baddens1.bmp b/system/image/test/reftest/bmp/bmpsuite/b/baddens1.bmp
index a6150a6fe..a6150a6fe 100644
--- a/image/test/reftest/bmp/bmpsuite/b/baddens1.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/b/baddens1.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/b/baddens2.bmp b/system/image/test/reftest/bmp/bmpsuite/b/baddens2.bmp
index f2c1dfb66..f2c1dfb66 100644
--- a/image/test/reftest/bmp/bmpsuite/b/baddens2.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/b/baddens2.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/b/badfilesize.bmp b/system/image/test/reftest/bmp/bmpsuite/b/badfilesize.bmp
index da52cb51d..da52cb51d 100644
--- a/image/test/reftest/bmp/bmpsuite/b/badfilesize.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/b/badfilesize.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/b/badheadersize.bmp b/system/image/test/reftest/bmp/bmpsuite/b/badheadersize.bmp
index 2a4083a6f..2a4083a6f 100644
--- a/image/test/reftest/bmp/bmpsuite/b/badheadersize.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/b/badheadersize.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/b/badpalettesize.bmp b/system/image/test/reftest/bmp/bmpsuite/b/badpalettesize.bmp
index 7d9d1b745..7d9d1b745 100644
--- a/image/test/reftest/bmp/bmpsuite/b/badpalettesize.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/b/badpalettesize.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/b/badplanes.bmp b/system/image/test/reftest/bmp/bmpsuite/b/badplanes.bmp
index 92d2855b6..92d2855b6 100644
--- a/image/test/reftest/bmp/bmpsuite/b/badplanes.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/b/badplanes.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/b/badrle.bmp b/system/image/test/reftest/bmp/bmpsuite/b/badrle.bmp
index cbf8fdc2e..cbf8fdc2e 100644
--- a/image/test/reftest/bmp/bmpsuite/b/badrle.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/b/badrle.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/b/badrle.png b/system/image/test/reftest/bmp/bmpsuite/b/badrle.png
index 1764ef9f9..1764ef9f9 100644
--- a/image/test/reftest/bmp/bmpsuite/b/badrle.png
+++ b/system/image/test/reftest/bmp/bmpsuite/b/badrle.png
diff --git a/image/test/reftest/bmp/bmpsuite/b/badwidth.bmp b/system/image/test/reftest/bmp/bmpsuite/b/badwidth.bmp
index 9fca005dc..9fca005dc 100644
--- a/image/test/reftest/bmp/bmpsuite/b/badwidth.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/b/badwidth.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/b/pal1.png b/system/image/test/reftest/bmp/bmpsuite/b/pal1.png
index 89a433ed7..89a433ed7 100644
--- a/image/test/reftest/bmp/bmpsuite/b/pal1.png
+++ b/system/image/test/reftest/bmp/bmpsuite/b/pal1.png
diff --git a/image/test/reftest/bmp/bmpsuite/b/pal8.png b/system/image/test/reftest/bmp/bmpsuite/b/pal8.png
index 2bfd3e650..2bfd3e650 100644
--- a/image/test/reftest/bmp/bmpsuite/b/pal8.png
+++ b/system/image/test/reftest/bmp/bmpsuite/b/pal8.png
diff --git a/image/test/reftest/bmp/bmpsuite/b/pal8badindex.bmp b/system/image/test/reftest/bmp/bmpsuite/b/pal8badindex.bmp
index efe16c05c..efe16c05c 100644
--- a/image/test/reftest/bmp/bmpsuite/b/pal8badindex.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/b/pal8badindex.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/b/pal8badindex.png b/system/image/test/reftest/bmp/bmpsuite/b/pal8badindex.png
index 0efb392b9..0efb392b9 100644
--- a/image/test/reftest/bmp/bmpsuite/b/pal8badindex.png
+++ b/system/image/test/reftest/bmp/bmpsuite/b/pal8badindex.png
diff --git a/image/test/reftest/bmp/bmpsuite/b/reallybig.bmp b/system/image/test/reftest/bmp/bmpsuite/b/reallybig.bmp
index 101e0b494..101e0b494 100644
--- a/image/test/reftest/bmp/bmpsuite/b/reallybig.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/b/reallybig.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/b/reftest-stylo.list b/system/image/test/reftest/bmp/bmpsuite/b/reftest-stylo.list
index 244d80cb4..244d80cb4 100644
--- a/image/test/reftest/bmp/bmpsuite/b/reftest-stylo.list
+++ b/system/image/test/reftest/bmp/bmpsuite/b/reftest-stylo.list
diff --git a/image/test/reftest/bmp/bmpsuite/b/reftest.list b/system/image/test/reftest/bmp/bmpsuite/b/reftest.list
index 2d8ef5c75..2d8ef5c75 100644
--- a/image/test/reftest/bmp/bmpsuite/b/reftest.list
+++ b/system/image/test/reftest/bmp/bmpsuite/b/reftest.list
diff --git a/image/test/reftest/bmp/bmpsuite/b/rletopdown.bmp b/system/image/test/reftest/bmp/bmpsuite/b/rletopdown.bmp
index 21a909fda..21a909fda 100644
--- a/image/test/reftest/bmp/bmpsuite/b/rletopdown.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/b/rletopdown.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/b/shortfile.bmp b/system/image/test/reftest/bmp/bmpsuite/b/shortfile.bmp
index 73960797b..73960797b 100644
--- a/image/test/reftest/bmp/bmpsuite/b/shortfile.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/b/shortfile.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/b/shortfile.png b/system/image/test/reftest/bmp/bmpsuite/b/shortfile.png
index 0ec21d929..0ec21d929 100644
--- a/image/test/reftest/bmp/bmpsuite/b/shortfile.png
+++ b/system/image/test/reftest/bmp/bmpsuite/b/shortfile.png
diff --git a/image/test/reftest/bmp/bmpsuite/b/wrapper.html b/system/image/test/reftest/bmp/bmpsuite/b/wrapper.html
index 22b74c8fc..22b74c8fc 100644
--- a/image/test/reftest/bmp/bmpsuite/b/wrapper.html
+++ b/system/image/test/reftest/bmp/bmpsuite/b/wrapper.html
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal1.bmp b/system/image/test/reftest/bmp/bmpsuite/g/pal1.bmp
index 4776f8277..4776f8277 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal1.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal1.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal1.png b/system/image/test/reftest/bmp/bmpsuite/g/pal1.png
index 89a433ed7..89a433ed7 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal1.png
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal1.png
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal1bg.bmp b/system/image/test/reftest/bmp/bmpsuite/g/pal1bg.bmp
index 466d0ba72..466d0ba72 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal1bg.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal1bg.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal1bg.png b/system/image/test/reftest/bmp/bmpsuite/g/pal1bg.png
index 20c4bb838..20c4bb838 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal1bg.png
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal1bg.png
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal1wb.bmp b/system/image/test/reftest/bmp/bmpsuite/g/pal1wb.bmp
index 56cb93203..56cb93203 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal1wb.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal1wb.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal4.bmp b/system/image/test/reftest/bmp/bmpsuite/g/pal4.bmp
index 7fd36303c..7fd36303c 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal4.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal4.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal4.png b/system/image/test/reftest/bmp/bmpsuite/g/pal4.png
index 188bb0499..188bb0499 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal4.png
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal4.png
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal4rle.bmp b/system/image/test/reftest/bmp/bmpsuite/g/pal4rle.bmp
index a5672aebd..a5672aebd 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal4rle.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal4rle.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal8-0.bmp b/system/image/test/reftest/bmp/bmpsuite/g/pal8-0.bmp
index ab8815a36..ab8815a36 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal8-0.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal8-0.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal8.bmp b/system/image/test/reftest/bmp/bmpsuite/g/pal8.bmp
index 96b2f8668..96b2f8668 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal8.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal8.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal8.png b/system/image/test/reftest/bmp/bmpsuite/g/pal8.png
index 2bfd3e650..2bfd3e650 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal8.png
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal8.png
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal8nonsquare-e.png b/system/image/test/reftest/bmp/bmpsuite/g/pal8nonsquare-e.png
index 646665f2d..646665f2d 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal8nonsquare-e.png
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal8nonsquare-e.png
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal8nonsquare.bmp b/system/image/test/reftest/bmp/bmpsuite/g/pal8nonsquare.bmp
index 0aa8de04c..0aa8de04c 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal8nonsquare.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal8nonsquare.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal8nonsquare.png b/system/image/test/reftest/bmp/bmpsuite/g/pal8nonsquare.png
index 9648cb682..9648cb682 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal8nonsquare.png
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal8nonsquare.png
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal8os2.bmp b/system/image/test/reftest/bmp/bmpsuite/g/pal8os2.bmp
index 14901b388..14901b388 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal8os2.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal8os2.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal8rle.bmp b/system/image/test/reftest/bmp/bmpsuite/g/pal8rle.bmp
index d43101490..d43101490 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal8rle.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal8rle.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal8topdown.bmp b/system/image/test/reftest/bmp/bmpsuite/g/pal8topdown.bmp
index 4b2f8e019..4b2f8e019 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal8topdown.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal8topdown.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal8v4.bmp b/system/image/test/reftest/bmp/bmpsuite/g/pal8v4.bmp
index 7064be315..7064be315 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal8v4.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal8v4.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal8v5.bmp b/system/image/test/reftest/bmp/bmpsuite/g/pal8v5.bmp
index c54647a31..c54647a31 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal8v5.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal8v5.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal8w124.bmp b/system/image/test/reftest/bmp/bmpsuite/g/pal8w124.bmp
index b7cc2d8bf..b7cc2d8bf 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal8w124.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal8w124.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal8w124.png b/system/image/test/reftest/bmp/bmpsuite/g/pal8w124.png
index f80236df6..f80236df6 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal8w124.png
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal8w124.png
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal8w125.bmp b/system/image/test/reftest/bmp/bmpsuite/g/pal8w125.bmp
index 06efed744..06efed744 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal8w125.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal8w125.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal8w125.png b/system/image/test/reftest/bmp/bmpsuite/g/pal8w125.png
index 2a45116b9..2a45116b9 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal8w125.png
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal8w125.png
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal8w126.bmp b/system/image/test/reftest/bmp/bmpsuite/g/pal8w126.bmp
index 112aa9fe6..112aa9fe6 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal8w126.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal8w126.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/pal8w126.png b/system/image/test/reftest/bmp/bmpsuite/g/pal8w126.png
index a41eab93d..a41eab93d 100644
--- a/image/test/reftest/bmp/bmpsuite/g/pal8w126.png
+++ b/system/image/test/reftest/bmp/bmpsuite/g/pal8w126.png
diff --git a/image/test/reftest/bmp/bmpsuite/g/reftest-stylo.list b/system/image/test/reftest/bmp/bmpsuite/g/reftest-stylo.list
index ba8a53b4f..ba8a53b4f 100644
--- a/image/test/reftest/bmp/bmpsuite/g/reftest-stylo.list
+++ b/system/image/test/reftest/bmp/bmpsuite/g/reftest-stylo.list
diff --git a/image/test/reftest/bmp/bmpsuite/g/reftest.list b/system/image/test/reftest/bmp/bmpsuite/g/reftest.list
index 9715b1ac8..9715b1ac8 100644
--- a/image/test/reftest/bmp/bmpsuite/g/reftest.list
+++ b/system/image/test/reftest/bmp/bmpsuite/g/reftest.list
diff --git a/image/test/reftest/bmp/bmpsuite/g/rgb16-565.bmp b/system/image/test/reftest/bmp/bmpsuite/g/rgb16-565.bmp
index c03a27975..c03a27975 100644
--- a/image/test/reftest/bmp/bmpsuite/g/rgb16-565.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/rgb16-565.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/rgb16-565.png b/system/image/test/reftest/bmp/bmpsuite/g/rgb16-565.png
index 04a3121d2..04a3121d2 100644
--- a/image/test/reftest/bmp/bmpsuite/g/rgb16-565.png
+++ b/system/image/test/reftest/bmp/bmpsuite/g/rgb16-565.png
diff --git a/image/test/reftest/bmp/bmpsuite/g/rgb16-565pal.bmp b/system/image/test/reftest/bmp/bmpsuite/g/rgb16-565pal.bmp
index e7632e344..e7632e344 100644
--- a/image/test/reftest/bmp/bmpsuite/g/rgb16-565pal.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/rgb16-565pal.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/rgb16.bmp b/system/image/test/reftest/bmp/bmpsuite/g/rgb16.bmp
index 6bfe47af4..6bfe47af4 100644
--- a/image/test/reftest/bmp/bmpsuite/g/rgb16.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/rgb16.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/rgb16.png b/system/image/test/reftest/bmp/bmpsuite/g/rgb16.png
index d9545840a..d9545840a 100644
--- a/image/test/reftest/bmp/bmpsuite/g/rgb16.png
+++ b/system/image/test/reftest/bmp/bmpsuite/g/rgb16.png
diff --git a/image/test/reftest/bmp/bmpsuite/g/rgb24.bmp b/system/image/test/reftest/bmp/bmpsuite/g/rgb24.bmp
index 40f8bb094..40f8bb094 100644
--- a/image/test/reftest/bmp/bmpsuite/g/rgb24.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/rgb24.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/rgb24.png b/system/image/test/reftest/bmp/bmpsuite/g/rgb24.png
index 86a9c945b..86a9c945b 100644
--- a/image/test/reftest/bmp/bmpsuite/g/rgb24.png
+++ b/system/image/test/reftest/bmp/bmpsuite/g/rgb24.png
diff --git a/image/test/reftest/bmp/bmpsuite/g/rgb24pal.bmp b/system/image/test/reftest/bmp/bmpsuite/g/rgb24pal.bmp
index 102e971dd..102e971dd 100644
--- a/image/test/reftest/bmp/bmpsuite/g/rgb24pal.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/rgb24pal.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/rgb32.bmp b/system/image/test/reftest/bmp/bmpsuite/g/rgb32.bmp
index 5d57eaaea..5d57eaaea 100644
--- a/image/test/reftest/bmp/bmpsuite/g/rgb32.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/rgb32.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/g/rgb32bf.bmp b/system/image/test/reftest/bmp/bmpsuite/g/rgb32bf.bmp
index 20fa9a132..20fa9a132 100644
--- a/image/test/reftest/bmp/bmpsuite/g/rgb32bf.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/g/rgb32bf.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/pal1p1.bmp b/system/image/test/reftest/bmp/bmpsuite/q/pal1p1.bmp
index b68321c4c..b68321c4c 100644
--- a/image/test/reftest/bmp/bmpsuite/q/pal1p1.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/pal1p1.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/pal1p1.png b/system/image/test/reftest/bmp/bmpsuite/q/pal1p1.png
index 92fc0f945..92fc0f945 100644
--- a/image/test/reftest/bmp/bmpsuite/q/pal1p1.png
+++ b/system/image/test/reftest/bmp/bmpsuite/q/pal1p1.png
diff --git a/image/test/reftest/bmp/bmpsuite/q/pal2.bmp b/system/image/test/reftest/bmp/bmpsuite/q/pal2.bmp
index 983e9fa92..983e9fa92 100644
--- a/image/test/reftest/bmp/bmpsuite/q/pal2.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/pal2.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/pal4rletrns.bmp b/system/image/test/reftest/bmp/bmpsuite/q/pal4rletrns.bmp
index 58994e92b..58994e92b 100644
--- a/image/test/reftest/bmp/bmpsuite/q/pal4rletrns.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/pal4rletrns.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/pal4rletrns.png b/system/image/test/reftest/bmp/bmpsuite/q/pal4rletrns.png
index 9b0c04436..9b0c04436 100644
--- a/image/test/reftest/bmp/bmpsuite/q/pal4rletrns.png
+++ b/system/image/test/reftest/bmp/bmpsuite/q/pal4rletrns.png
diff --git a/image/test/reftest/bmp/bmpsuite/q/pal8.png b/system/image/test/reftest/bmp/bmpsuite/q/pal8.png
index 2bfd3e650..2bfd3e650 100644
--- a/image/test/reftest/bmp/bmpsuite/q/pal8.png
+++ b/system/image/test/reftest/bmp/bmpsuite/q/pal8.png
diff --git a/image/test/reftest/bmp/bmpsuite/q/pal8offs.bmp b/system/image/test/reftest/bmp/bmpsuite/q/pal8offs.bmp
index 8673e9740..8673e9740 100644
--- a/image/test/reftest/bmp/bmpsuite/q/pal8offs.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/pal8offs.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/pal8os2sp.bmp b/system/image/test/reftest/bmp/bmpsuite/q/pal8os2sp.bmp
index e532c8986..e532c8986 100644
--- a/image/test/reftest/bmp/bmpsuite/q/pal8os2sp.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/pal8os2sp.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/pal8os2v2-16.bmp b/system/image/test/reftest/bmp/bmpsuite/q/pal8os2v2-16.bmp
index 95a1d2345..95a1d2345 100644
--- a/image/test/reftest/bmp/bmpsuite/q/pal8os2v2-16.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/pal8os2v2-16.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/pal8os2v2.bmp b/system/image/test/reftest/bmp/bmpsuite/q/pal8os2v2.bmp
index 1324a40d0..1324a40d0 100644
--- a/image/test/reftest/bmp/bmpsuite/q/pal8os2v2.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/pal8os2v2.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/pal8oversizepal.bmp b/system/image/test/reftest/bmp/bmpsuite/q/pal8oversizepal.bmp
index 93b8187ca..93b8187ca 100644
--- a/image/test/reftest/bmp/bmpsuite/q/pal8oversizepal.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/pal8oversizepal.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/pal8rletrns.bmp b/system/image/test/reftest/bmp/bmpsuite/q/pal8rletrns.bmp
index a2af88d87..a2af88d87 100644
--- a/image/test/reftest/bmp/bmpsuite/q/pal8rletrns.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/pal8rletrns.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/pal8rletrns.png b/system/image/test/reftest/bmp/bmpsuite/q/pal8rletrns.png
index 2d8e957f1..2d8e957f1 100644
--- a/image/test/reftest/bmp/bmpsuite/q/pal8rletrns.png
+++ b/system/image/test/reftest/bmp/bmpsuite/q/pal8rletrns.png
diff --git a/image/test/reftest/bmp/bmpsuite/q/reftest-stylo.list b/system/image/test/reftest/bmp/bmpsuite/q/reftest-stylo.list
index 63c55b671..63c55b671 100644
--- a/image/test/reftest/bmp/bmpsuite/q/reftest-stylo.list
+++ b/system/image/test/reftest/bmp/bmpsuite/q/reftest-stylo.list
diff --git a/image/test/reftest/bmp/bmpsuite/q/reftest.list b/system/image/test/reftest/bmp/bmpsuite/q/reftest.list
index 80da580cc..80da580cc 100644
--- a/image/test/reftest/bmp/bmpsuite/q/reftest.list
+++ b/system/image/test/reftest/bmp/bmpsuite/q/reftest.list
diff --git a/image/test/reftest/bmp/bmpsuite/q/rgb16-231.bmp b/system/image/test/reftest/bmp/bmpsuite/q/rgb16-231.bmp
index 6300f69f0..6300f69f0 100644
--- a/image/test/reftest/bmp/bmpsuite/q/rgb16-231.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/rgb16-231.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/rgb16-231.png b/system/image/test/reftest/bmp/bmpsuite/q/rgb16-231.png
index 76efe526e..76efe526e 100644
--- a/image/test/reftest/bmp/bmpsuite/q/rgb16-231.png
+++ b/system/image/test/reftest/bmp/bmpsuite/q/rgb16-231.png
diff --git a/image/test/reftest/bmp/bmpsuite/q/rgb24.png b/system/image/test/reftest/bmp/bmpsuite/q/rgb24.png
index 86a9c945b..86a9c945b 100644
--- a/image/test/reftest/bmp/bmpsuite/q/rgb24.png
+++ b/system/image/test/reftest/bmp/bmpsuite/q/rgb24.png
diff --git a/image/test/reftest/bmp/bmpsuite/q/rgb24jpeg.bmp b/system/image/test/reftest/bmp/bmpsuite/q/rgb24jpeg.bmp
index 87d73d75b..87d73d75b 100644
--- a/image/test/reftest/bmp/bmpsuite/q/rgb24jpeg.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/rgb24jpeg.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/rgb24largepal.bmp b/system/image/test/reftest/bmp/bmpsuite/q/rgb24largepal.bmp
index d5e418c2d..d5e418c2d 100644
--- a/image/test/reftest/bmp/bmpsuite/q/rgb24largepal.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/rgb24largepal.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/rgb24lprof.bmp b/system/image/test/reftest/bmp/bmpsuite/q/rgb24lprof.bmp
index b868b88f2..b868b88f2 100644
--- a/image/test/reftest/bmp/bmpsuite/q/rgb24lprof.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/rgb24lprof.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/rgb24png.bmp b/system/image/test/reftest/bmp/bmpsuite/q/rgb24png.bmp
index e87ec7add..e87ec7add 100644
--- a/image/test/reftest/bmp/bmpsuite/q/rgb24png.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/rgb24png.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/rgb24prof.bmp b/system/image/test/reftest/bmp/bmpsuite/q/rgb24prof.bmp
index 627e676ea..627e676ea 100644
--- a/image/test/reftest/bmp/bmpsuite/q/rgb24prof.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/rgb24prof.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/rgb32-111110.bmp b/system/image/test/reftest/bmp/bmpsuite/q/rgb32-111110.bmp
index ec07d89b5..ec07d89b5 100644
--- a/image/test/reftest/bmp/bmpsuite/q/rgb32-111110.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/rgb32-111110.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/rgb32fakealpha.bmp b/system/image/test/reftest/bmp/bmpsuite/q/rgb32fakealpha.bmp
index cb544da5b..cb544da5b 100644
--- a/image/test/reftest/bmp/bmpsuite/q/rgb32fakealpha.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/rgb32fakealpha.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/rgba16-4444.bmp b/system/image/test/reftest/bmp/bmpsuite/q/rgba16-4444.bmp
index 051ff2358..051ff2358 100644
--- a/image/test/reftest/bmp/bmpsuite/q/rgba16-4444.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/rgba16-4444.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/rgba16-4444.png b/system/image/test/reftest/bmp/bmpsuite/q/rgba16-4444.png
index bfeda6fae..bfeda6fae 100644
--- a/image/test/reftest/bmp/bmpsuite/q/rgba16-4444.png
+++ b/system/image/test/reftest/bmp/bmpsuite/q/rgba16-4444.png
diff --git a/image/test/reftest/bmp/bmpsuite/q/rgba32.bmp b/system/image/test/reftest/bmp/bmpsuite/q/rgba32.bmp
index 829c7c7e3..829c7c7e3 100644
--- a/image/test/reftest/bmp/bmpsuite/q/rgba32.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/rgba32.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/rgba32.png b/system/image/test/reftest/bmp/bmpsuite/q/rgba32.png
index 25e542a65..25e542a65 100644
--- a/image/test/reftest/bmp/bmpsuite/q/rgba32.png
+++ b/system/image/test/reftest/bmp/bmpsuite/q/rgba32.png
diff --git a/image/test/reftest/bmp/bmpsuite/q/rgba32abf.bmp b/system/image/test/reftest/bmp/bmpsuite/q/rgba32abf.bmp
index d9bb0189c..d9bb0189c 100644
--- a/image/test/reftest/bmp/bmpsuite/q/rgba32abf.bmp
+++ b/system/image/test/reftest/bmp/bmpsuite/q/rgba32abf.bmp
diff --git a/image/test/reftest/bmp/bmpsuite/q/wrapper.html b/system/image/test/reftest/bmp/bmpsuite/q/wrapper.html
index 22b74c8fc..22b74c8fc 100644
--- a/image/test/reftest/bmp/bmpsuite/q/wrapper.html
+++ b/system/image/test/reftest/bmp/bmpsuite/q/wrapper.html
diff --git a/image/test/reftest/bmp/bmpsuite/reftest-stylo.list b/system/image/test/reftest/bmp/bmpsuite/reftest-stylo.list
index 5ec496272..5ec496272 100644
--- a/image/test/reftest/bmp/bmpsuite/reftest-stylo.list
+++ b/system/image/test/reftest/bmp/bmpsuite/reftest-stylo.list
diff --git a/image/test/reftest/bmp/bmpsuite/reftest.list b/system/image/test/reftest/bmp/bmpsuite/reftest.list
index 8f48430f9..8f48430f9 100644
--- a/image/test/reftest/bmp/bmpsuite/reftest.list
+++ b/system/image/test/reftest/bmp/bmpsuite/reftest.list
diff --git a/image/test/reftest/bmp/reftest-stylo.list b/system/image/test/reftest/bmp/reftest-stylo.list
index 80aa0ab32..80aa0ab32 100644
--- a/image/test/reftest/bmp/reftest-stylo.list
+++ b/system/image/test/reftest/bmp/reftest-stylo.list
diff --git a/image/test/reftest/bmp/reftest.list b/system/image/test/reftest/bmp/reftest.list
index 87183e6b2..87183e6b2 100644
--- a/image/test/reftest/bmp/reftest.list
+++ b/system/image/test/reftest/bmp/reftest.list
diff --git a/image/test/reftest/color-management/color-curv.png b/system/image/test/reftest/color-management/color-curv.png
index 994e3a38a..994e3a38a 100644
--- a/image/test/reftest/color-management/color-curv.png
+++ b/system/image/test/reftest/color-management/color-curv.png
diff --git a/image/test/reftest/color-management/color-lin.png b/system/image/test/reftest/color-management/color-lin.png
index 0ee276fca..0ee276fca 100644
--- a/image/test/reftest/color-management/color-lin.png
+++ b/system/image/test/reftest/color-management/color-lin.png
diff --git a/image/test/reftest/color-management/color-table.png b/system/image/test/reftest/color-management/color-table.png
index 355b3a2ba..355b3a2ba 100644
--- a/image/test/reftest/color-management/color-table.png
+++ b/system/image/test/reftest/color-management/color-table.png
diff --git a/image/test/reftest/color-management/invalid-chrm-ref.png b/system/image/test/reftest/color-management/invalid-chrm-ref.png
index 85f83f783..85f83f783 100644
--- a/image/test/reftest/color-management/invalid-chrm-ref.png
+++ b/system/image/test/reftest/color-management/invalid-chrm-ref.png
diff --git a/image/test/reftest/color-management/invalid-chrm.png b/system/image/test/reftest/color-management/invalid-chrm.png
index 33dc9e9ce..33dc9e9ce 100644
--- a/image/test/reftest/color-management/invalid-chrm.png
+++ b/system/image/test/reftest/color-management/invalid-chrm.png
diff --git a/image/test/reftest/color-management/invalid-whitepoint.png b/system/image/test/reftest/color-management/invalid-whitepoint.png
index 383a0a035..383a0a035 100644
--- a/image/test/reftest/color-management/invalid-whitepoint.png
+++ b/system/image/test/reftest/color-management/invalid-whitepoint.png
diff --git a/image/test/reftest/color-management/reftest-stylo.list b/system/image/test/reftest/color-management/reftest-stylo.list
index 64f503fe6..64f503fe6 100644
--- a/image/test/reftest/color-management/reftest-stylo.list
+++ b/system/image/test/reftest/color-management/reftest-stylo.list
diff --git a/image/test/reftest/color-management/reftest.list b/system/image/test/reftest/color-management/reftest.list
index ee6e16adb..ee6e16adb 100644
--- a/image/test/reftest/color-management/reftest.list
+++ b/system/image/test/reftest/color-management/reftest.list
diff --git a/image/test/reftest/color-management/trc-type-ref.html b/system/image/test/reftest/color-management/trc-type-ref.html
index 5140e6e6a..5140e6e6a 100644
--- a/image/test/reftest/color-management/trc-type-ref.html
+++ b/system/image/test/reftest/color-management/trc-type-ref.html
diff --git a/image/test/reftest/color-management/trc-type.html b/system/image/test/reftest/color-management/trc-type.html
index f13052bbf..f13052bbf 100644
--- a/image/test/reftest/color-management/trc-type.html
+++ b/system/image/test/reftest/color-management/trc-type.html
diff --git a/image/test/reftest/colordepth.html b/system/image/test/reftest/colordepth.html
index 15d2c9f95..15d2c9f95 100644
--- a/image/test/reftest/colordepth.html
+++ b/system/image/test/reftest/colordepth.html
diff --git a/image/test/reftest/downscaling/black-border-bottom.png b/system/image/test/reftest/downscaling/black-border-bottom.png
index efa7ce2dc..efa7ce2dc 100644
--- a/image/test/reftest/downscaling/black-border-bottom.png
+++ b/system/image/test/reftest/downscaling/black-border-bottom.png
diff --git a/image/test/reftest/downscaling/black-border-left.png b/system/image/test/reftest/downscaling/black-border-left.png
index 11bc67e98..11bc67e98 100644
--- a/image/test/reftest/downscaling/black-border-left.png
+++ b/system/image/test/reftest/downscaling/black-border-left.png
diff --git a/image/test/reftest/downscaling/black-border-rect.svg b/system/image/test/reftest/downscaling/black-border-rect.svg
index 0fa01a0a6..0fa01a0a6 100644
--- a/image/test/reftest/downscaling/black-border-rect.svg
+++ b/system/image/test/reftest/downscaling/black-border-rect.svg
diff --git a/image/test/reftest/downscaling/black-border-right.png b/system/image/test/reftest/downscaling/black-border-right.png
index 081c52d5b..081c52d5b 100644
--- a/image/test/reftest/downscaling/black-border-right.png
+++ b/system/image/test/reftest/downscaling/black-border-right.png
diff --git a/image/test/reftest/downscaling/black-border-top.png b/system/image/test/reftest/downscaling/black-border-top.png
index fc6e69e02..fc6e69e02 100644
--- a/image/test/reftest/downscaling/black-border-top.png
+++ b/system/image/test/reftest/downscaling/black-border-top.png
diff --git a/image/test/reftest/downscaling/bmp-size-16x16-24bpp.png b/system/image/test/reftest/downscaling/bmp-size-16x16-24bpp.png
index c04869e72..c04869e72 100644
--- a/image/test/reftest/downscaling/bmp-size-16x16-24bpp.png
+++ b/system/image/test/reftest/downscaling/bmp-size-16x16-24bpp.png
diff --git a/image/test/reftest/downscaling/downscale-1-bigimage.png b/system/image/test/reftest/downscaling/downscale-1-bigimage.png
index 5e018590c..5e018590c 100644
--- a/image/test/reftest/downscaling/downscale-1-bigimage.png
+++ b/system/image/test/reftest/downscaling/downscale-1-bigimage.png
diff --git a/image/test/reftest/downscaling/downscale-1-ref.html b/system/image/test/reftest/downscaling/downscale-1-ref.html
index 63ec56ef7..63ec56ef7 100644
--- a/image/test/reftest/downscaling/downscale-1-ref.html
+++ b/system/image/test/reftest/downscaling/downscale-1-ref.html
diff --git a/image/test/reftest/downscaling/downscale-1-smallimage.png b/system/image/test/reftest/downscaling/downscale-1-smallimage.png
index 588e6b78d..588e6b78d 100644
--- a/image/test/reftest/downscaling/downscale-1-smallimage.png
+++ b/system/image/test/reftest/downscaling/downscale-1-smallimage.png
diff --git a/image/test/reftest/downscaling/downscale-1.html b/system/image/test/reftest/downscaling/downscale-1.html
index a9629ef85..a9629ef85 100644
--- a/image/test/reftest/downscaling/downscale-1.html
+++ b/system/image/test/reftest/downscaling/downscale-1.html
diff --git a/image/test/reftest/downscaling/downscale-16px.html b/system/image/test/reftest/downscaling/downscale-16px.html
index 06d6db2bf..06d6db2bf 100644
--- a/image/test/reftest/downscaling/downscale-16px.html
+++ b/system/image/test/reftest/downscaling/downscale-16px.html
diff --git a/image/test/reftest/downscaling/downscale-2a.html b/system/image/test/reftest/downscaling/downscale-2a.html
index fac11ccee..fac11ccee 100644
--- a/image/test/reftest/downscaling/downscale-2a.html
+++ b/system/image/test/reftest/downscaling/downscale-2a.html
diff --git a/image/test/reftest/downscaling/downscale-2b.html b/system/image/test/reftest/downscaling/downscale-2b.html
index af7ecbff3..af7ecbff3 100644
--- a/image/test/reftest/downscaling/downscale-2b.html
+++ b/system/image/test/reftest/downscaling/downscale-2b.html
diff --git a/image/test/reftest/downscaling/downscale-2c.html b/system/image/test/reftest/downscaling/downscale-2c.html
index 18f70456b..18f70456b 100644
--- a/image/test/reftest/downscaling/downscale-2c.html
+++ b/system/image/test/reftest/downscaling/downscale-2c.html
diff --git a/image/test/reftest/downscaling/downscale-2d.html b/system/image/test/reftest/downscaling/downscale-2d.html
index 8d9547b73..8d9547b73 100644
--- a/image/test/reftest/downscaling/downscale-2d.html
+++ b/system/image/test/reftest/downscaling/downscale-2d.html
diff --git a/image/test/reftest/downscaling/downscale-2e.html b/system/image/test/reftest/downscaling/downscale-2e.html
index c3d0d771f..c3d0d771f 100644
--- a/image/test/reftest/downscaling/downscale-2e.html
+++ b/system/image/test/reftest/downscaling/downscale-2e.html
diff --git a/image/test/reftest/downscaling/downscale-2f.html b/system/image/test/reftest/downscaling/downscale-2f.html
index 42cfad1f5..42cfad1f5 100644
--- a/image/test/reftest/downscaling/downscale-2f.html
+++ b/system/image/test/reftest/downscaling/downscale-2f.html
diff --git a/image/test/reftest/downscaling/downscale-32px-ref.html b/system/image/test/reftest/downscaling/downscale-32px-ref.html
index 1caf3c73b..1caf3c73b 100644
--- a/image/test/reftest/downscaling/downscale-32px-ref.html
+++ b/system/image/test/reftest/downscaling/downscale-32px-ref.html
diff --git a/image/test/reftest/downscaling/downscale-32px.html b/system/image/test/reftest/downscaling/downscale-32px.html
index f5fce324d..f5fce324d 100644
--- a/image/test/reftest/downscaling/downscale-32px.html
+++ b/system/image/test/reftest/downscaling/downscale-32px.html
diff --git a/image/test/reftest/downscaling/downscale-8px.html b/system/image/test/reftest/downscaling/downscale-8px.html
index fdc632e53..fdc632e53 100644
--- a/image/test/reftest/downscaling/downscale-8px.html
+++ b/system/image/test/reftest/downscaling/downscale-8px.html
diff --git a/image/test/reftest/downscaling/downscale-moz-icon-1-ref.html b/system/image/test/reftest/downscaling/downscale-moz-icon-1-ref.html
index ade5e2192..ade5e2192 100644
--- a/image/test/reftest/downscaling/downscale-moz-icon-1-ref.html
+++ b/system/image/test/reftest/downscaling/downscale-moz-icon-1-ref.html
diff --git a/image/test/reftest/downscaling/downscale-moz-icon-1.html b/system/image/test/reftest/downscaling/downscale-moz-icon-1.html
index ba3795127..ba3795127 100644
--- a/image/test/reftest/downscaling/downscale-moz-icon-1.html
+++ b/system/image/test/reftest/downscaling/downscale-moz-icon-1.html
diff --git a/image/test/reftest/downscaling/downscale-png.html b/system/image/test/reftest/downscaling/downscale-png.html
index 4752b2155..4752b2155 100644
--- a/image/test/reftest/downscaling/downscale-png.html
+++ b/system/image/test/reftest/downscaling/downscale-png.html
diff --git a/image/test/reftest/downscaling/downscale-svg-1-ref.html b/system/image/test/reftest/downscaling/downscale-svg-1-ref.html
index 8935619eb..8935619eb 100644
--- a/image/test/reftest/downscaling/downscale-svg-1-ref.html
+++ b/system/image/test/reftest/downscaling/downscale-svg-1-ref.html
diff --git a/image/test/reftest/downscaling/downscale-svg-1a.html b/system/image/test/reftest/downscaling/downscale-svg-1a.html
index 2263cc998..2263cc998 100644
--- a/image/test/reftest/downscaling/downscale-svg-1a.html
+++ b/system/image/test/reftest/downscaling/downscale-svg-1a.html
diff --git a/image/test/reftest/downscaling/downscale-svg-1b.html b/system/image/test/reftest/downscaling/downscale-svg-1b.html
index 9db239c7c..9db239c7c 100644
--- a/image/test/reftest/downscaling/downscale-svg-1b.html
+++ b/system/image/test/reftest/downscaling/downscale-svg-1b.html
diff --git a/image/test/reftest/downscaling/downscale-svg-1c.html b/system/image/test/reftest/downscaling/downscale-svg-1c.html
index f8babf026..f8babf026 100644
--- a/image/test/reftest/downscaling/downscale-svg-1c.html
+++ b/system/image/test/reftest/downscaling/downscale-svg-1c.html
diff --git a/image/test/reftest/downscaling/downscale-svg-1d.html b/system/image/test/reftest/downscaling/downscale-svg-1d.html
index 9a56a51de..9a56a51de 100644
--- a/image/test/reftest/downscaling/downscale-svg-1d.html
+++ b/system/image/test/reftest/downscaling/downscale-svg-1d.html
diff --git a/image/test/reftest/downscaling/downscale-svg-1e.html b/system/image/test/reftest/downscaling/downscale-svg-1e.html
index 732ac22c9..732ac22c9 100644
--- a/image/test/reftest/downscaling/downscale-svg-1e.html
+++ b/system/image/test/reftest/downscaling/downscale-svg-1e.html
diff --git a/image/test/reftest/downscaling/downscale-svg-1f.html b/system/image/test/reftest/downscaling/downscale-svg-1f.html
index 0124682c7..0124682c7 100644
--- a/image/test/reftest/downscaling/downscale-svg-1f.html
+++ b/system/image/test/reftest/downscaling/downscale-svg-1f.html
diff --git a/image/test/reftest/downscaling/ff-0RGB.ico b/system/image/test/reftest/downscaling/ff-0RGB.ico
index 56116b9f6..56116b9f6 100644
--- a/image/test/reftest/downscaling/ff-0RGB.ico
+++ b/system/image/test/reftest/downscaling/ff-0RGB.ico
diff --git a/image/test/reftest/downscaling/ff-0RGB.png b/system/image/test/reftest/downscaling/ff-0RGB.png
index 749ffcdfb..749ffcdfb 100644
--- a/image/test/reftest/downscaling/ff-0RGB.png
+++ b/system/image/test/reftest/downscaling/ff-0RGB.png
diff --git a/image/test/reftest/downscaling/ff-ARGB.ico b/system/image/test/reftest/downscaling/ff-ARGB.ico
index 4681dc649..4681dc649 100644
--- a/image/test/reftest/downscaling/ff-ARGB.ico
+++ b/system/image/test/reftest/downscaling/ff-ARGB.ico
diff --git a/image/test/reftest/downscaling/ff-ARGB.png b/system/image/test/reftest/downscaling/ff-ARGB.png
index 74ea0e2f3..74ea0e2f3 100644
--- a/image/test/reftest/downscaling/ff-ARGB.png
+++ b/system/image/test/reftest/downscaling/ff-ARGB.png
diff --git a/image/test/reftest/downscaling/lime-red-256px-bmp-in.ico b/system/image/test/reftest/downscaling/lime-red-256px-bmp-in.ico
index b372cba4a..b372cba4a 100644
--- a/image/test/reftest/downscaling/lime-red-256px-bmp-in.ico
+++ b/system/image/test/reftest/downscaling/lime-red-256px-bmp-in.ico
diff --git a/image/test/reftest/downscaling/lime-red-256px-png-in.ico b/system/image/test/reftest/downscaling/lime-red-256px-png-in.ico
index e8578d293..e8578d293 100644
--- a/image/test/reftest/downscaling/lime-red-256px-png-in.ico
+++ b/system/image/test/reftest/downscaling/lime-red-256px-png-in.ico
diff --git a/image/test/reftest/downscaling/lime-red-256px.bmp b/system/image/test/reftest/downscaling/lime-red-256px.bmp
index 3dc808970..3dc808970 100644
--- a/image/test/reftest/downscaling/lime-red-256px.bmp
+++ b/system/image/test/reftest/downscaling/lime-red-256px.bmp
diff --git a/image/test/reftest/downscaling/lime-red-256px.gif b/system/image/test/reftest/downscaling/lime-red-256px.gif
index f9f669aa4..f9f669aa4 100644
--- a/image/test/reftest/downscaling/lime-red-256px.gif
+++ b/system/image/test/reftest/downscaling/lime-red-256px.gif
diff --git a/image/test/reftest/downscaling/lime-red-256px.jpg b/system/image/test/reftest/downscaling/lime-red-256px.jpg
index ac8efdf36..ac8efdf36 100644
--- a/image/test/reftest/downscaling/lime-red-256px.jpg
+++ b/system/image/test/reftest/downscaling/lime-red-256px.jpg
diff --git a/image/test/reftest/downscaling/lime-red-256px.png b/system/image/test/reftest/downscaling/lime-red-256px.png
index 2be2e05a5..2be2e05a5 100644
--- a/image/test/reftest/downscaling/lime-red-256px.png
+++ b/system/image/test/reftest/downscaling/lime-red-256px.png
diff --git a/image/test/reftest/downscaling/lime-red-256px.svg b/system/image/test/reftest/downscaling/lime-red-256px.svg
index 530ae6d6d..530ae6d6d 100644
--- a/image/test/reftest/downscaling/lime-red-256px.svg
+++ b/system/image/test/reftest/downscaling/lime-red-256px.svg
diff --git a/image/test/reftest/downscaling/lime-red-32px.png b/system/image/test/reftest/downscaling/lime-red-32px.png
index bfa2e7b73..bfa2e7b73 100644
--- a/image/test/reftest/downscaling/lime-red-32px.png
+++ b/system/image/test/reftest/downscaling/lime-red-32px.png
diff --git a/image/test/reftest/downscaling/png-interlaced.png b/system/image/test/reftest/downscaling/png-interlaced.png
index a938d0bd6..a938d0bd6 100644
--- a/image/test/reftest/downscaling/png-interlaced.png
+++ b/system/image/test/reftest/downscaling/png-interlaced.png
diff --git a/image/test/reftest/downscaling/png-normal.png b/system/image/test/reftest/downscaling/png-normal.png
index c2780fdd9..c2780fdd9 100644
--- a/image/test/reftest/downscaling/png-normal.png
+++ b/system/image/test/reftest/downscaling/png-normal.png
diff --git a/image/test/reftest/downscaling/reftest-stylo.list b/system/image/test/reftest/downscaling/reftest-stylo.list
index 6feb9080b..6feb9080b 100644
--- a/image/test/reftest/downscaling/reftest-stylo.list
+++ b/system/image/test/reftest/downscaling/reftest-stylo.list
diff --git a/image/test/reftest/downscaling/reftest.list b/system/image/test/reftest/downscaling/reftest.list
index 300edd81b..300edd81b 100644
--- a/image/test/reftest/downscaling/reftest.list
+++ b/system/image/test/reftest/downscaling/reftest.list
diff --git a/image/test/reftest/downscaling/top-to-bottom-16x16-24bpp.bmp b/system/image/test/reftest/downscaling/top-to-bottom-16x16-24bpp.bmp
index bd18f85d4..bd18f85d4 100644
--- a/image/test/reftest/downscaling/top-to-bottom-16x16-24bpp.bmp
+++ b/system/image/test/reftest/downscaling/top-to-bottom-16x16-24bpp.bmp
diff --git a/image/test/reftest/encoders-lossless/ImageDocument.css b/system/image/test/reftest/encoders-lossless/ImageDocument.css
index 9a41b4c16..9a41b4c16 100644
--- a/image/test/reftest/encoders-lossless/ImageDocument.css
+++ b/system/image/test/reftest/encoders-lossless/ImageDocument.css
diff --git a/image/test/reftest/encoders-lossless/encoder.html b/system/image/test/reftest/encoders-lossless/encoder.html
index 6e07995ae..6e07995ae 100644
--- a/image/test/reftest/encoders-lossless/encoder.html
+++ b/system/image/test/reftest/encoders-lossless/encoder.html
diff --git a/image/test/reftest/encoders-lossless/reftest-stylo.list b/system/image/test/reftest/encoders-lossless/reftest-stylo.list
index a2b36bcc4..a2b36bcc4 100644
--- a/image/test/reftest/encoders-lossless/reftest-stylo.list
+++ b/system/image/test/reftest/encoders-lossless/reftest-stylo.list
diff --git a/image/test/reftest/encoders-lossless/reftest.list b/system/image/test/reftest/encoders-lossless/reftest.list
index 6cd96d0de..6cd96d0de 100644
--- a/image/test/reftest/encoders-lossless/reftest.list
+++ b/system/image/test/reftest/encoders-lossless/reftest.list
diff --git a/image/test/reftest/encoders-lossless/size-15x15.png b/system/image/test/reftest/encoders-lossless/size-15x15.png
index e1287430d..e1287430d 100644
--- a/image/test/reftest/encoders-lossless/size-15x15.png
+++ b/system/image/test/reftest/encoders-lossless/size-15x15.png
diff --git a/image/test/reftest/encoders-lossless/size-16x16.png b/system/image/test/reftest/encoders-lossless/size-16x16.png
index c04869e72..c04869e72 100644
--- a/image/test/reftest/encoders-lossless/size-16x16.png
+++ b/system/image/test/reftest/encoders-lossless/size-16x16.png
diff --git a/image/test/reftest/encoders-lossless/size-17x17.png b/system/image/test/reftest/encoders-lossless/size-17x17.png
index 00fb8e4f3..00fb8e4f3 100644
--- a/image/test/reftest/encoders-lossless/size-17x17.png
+++ b/system/image/test/reftest/encoders-lossless/size-17x17.png
diff --git a/image/test/reftest/encoders-lossless/size-1x1.png b/system/image/test/reftest/encoders-lossless/size-1x1.png
index c05f5fef8..c05f5fef8 100644
--- a/image/test/reftest/encoders-lossless/size-1x1.png
+++ b/system/image/test/reftest/encoders-lossless/size-1x1.png
diff --git a/image/test/reftest/encoders-lossless/size-256x256.png b/system/image/test/reftest/encoders-lossless/size-256x256.png
index 84bfada76..84bfada76 100644
--- a/image/test/reftest/encoders-lossless/size-256x256.png
+++ b/system/image/test/reftest/encoders-lossless/size-256x256.png
diff --git a/image/test/reftest/encoders-lossless/size-2x2.png b/system/image/test/reftest/encoders-lossless/size-2x2.png
index e512d3f9b..e512d3f9b 100644
--- a/image/test/reftest/encoders-lossless/size-2x2.png
+++ b/system/image/test/reftest/encoders-lossless/size-2x2.png
diff --git a/image/test/reftest/encoders-lossless/size-31x31.png b/system/image/test/reftest/encoders-lossless/size-31x31.png
index e4a864251..e4a864251 100644
--- a/image/test/reftest/encoders-lossless/size-31x31.png
+++ b/system/image/test/reftest/encoders-lossless/size-31x31.png
diff --git a/image/test/reftest/encoders-lossless/size-32x32.png b/system/image/test/reftest/encoders-lossless/size-32x32.png
index 3a6fbe8ee..3a6fbe8ee 100644
--- a/image/test/reftest/encoders-lossless/size-32x32.png
+++ b/system/image/test/reftest/encoders-lossless/size-32x32.png
diff --git a/image/test/reftest/encoders-lossless/size-33x33.png b/system/image/test/reftest/encoders-lossless/size-33x33.png
index 72ef7eb63..72ef7eb63 100644
--- a/image/test/reftest/encoders-lossless/size-33x33.png
+++ b/system/image/test/reftest/encoders-lossless/size-33x33.png
diff --git a/image/test/reftest/encoders-lossless/size-3x3.png b/system/image/test/reftest/encoders-lossless/size-3x3.png
index cb42ec4f8..cb42ec4f8 100644
--- a/image/test/reftest/encoders-lossless/size-3x3.png
+++ b/system/image/test/reftest/encoders-lossless/size-3x3.png
diff --git a/image/test/reftest/encoders-lossless/size-4x4.png b/system/image/test/reftest/encoders-lossless/size-4x4.png
index e6afafd89..e6afafd89 100644
--- a/image/test/reftest/encoders-lossless/size-4x4.png
+++ b/system/image/test/reftest/encoders-lossless/size-4x4.png
diff --git a/image/test/reftest/encoders-lossless/size-5x5.png b/system/image/test/reftest/encoders-lossless/size-5x5.png
index a844aff76..a844aff76 100644
--- a/image/test/reftest/encoders-lossless/size-5x5.png
+++ b/system/image/test/reftest/encoders-lossless/size-5x5.png
diff --git a/image/test/reftest/encoders-lossless/size-6x6.png b/system/image/test/reftest/encoders-lossless/size-6x6.png
index 415c2d9c6..415c2d9c6 100644
--- a/image/test/reftest/encoders-lossless/size-6x6.png
+++ b/system/image/test/reftest/encoders-lossless/size-6x6.png
diff --git a/image/test/reftest/encoders-lossless/size-7x7.png b/system/image/test/reftest/encoders-lossless/size-7x7.png
index ab2f89274..ab2f89274 100644
--- a/image/test/reftest/encoders-lossless/size-7x7.png
+++ b/system/image/test/reftest/encoders-lossless/size-7x7.png
diff --git a/image/test/reftest/encoders-lossless/size-8x8.png b/system/image/test/reftest/encoders-lossless/size-8x8.png
index fe2ff40a1..fe2ff40a1 100644
--- a/image/test/reftest/encoders-lossless/size-8x8.png
+++ b/system/image/test/reftest/encoders-lossless/size-8x8.png
diff --git a/image/test/reftest/encoders-lossless/size-9x9.png b/system/image/test/reftest/encoders-lossless/size-9x9.png
index 18ab4b25d..18ab4b25d 100644
--- a/image/test/reftest/encoders-lossless/size-9x9.png
+++ b/system/image/test/reftest/encoders-lossless/size-9x9.png
diff --git a/image/test/reftest/encoders-lossless/test.png b/system/image/test/reftest/encoders-lossless/test.png
index 3a6fbe8ee..3a6fbe8ee 100644
--- a/image/test/reftest/encoders-lossless/test.png
+++ b/system/image/test/reftest/encoders-lossless/test.png
diff --git a/image/test/reftest/generic/accept-image-catchall-ref.html b/system/image/test/reftest/generic/accept-image-catchall-ref.html
index 32daa9f5d..32daa9f5d 100644
--- a/image/test/reftest/generic/accept-image-catchall-ref.html
+++ b/system/image/test/reftest/generic/accept-image-catchall-ref.html
diff --git a/image/test/reftest/generic/accept-image-catchall.html b/system/image/test/reftest/generic/accept-image-catchall.html
index bcacd9fd8..bcacd9fd8 100644
--- a/image/test/reftest/generic/accept-image-catchall.html
+++ b/system/image/test/reftest/generic/accept-image-catchall.html
diff --git a/image/test/reftest/generic/check-header.sjs b/system/image/test/reftest/generic/check-header.sjs
index 9e905bc1c..9e905bc1c 100644
--- a/image/test/reftest/generic/check-header.sjs
+++ b/system/image/test/reftest/generic/check-header.sjs
diff --git a/image/test/reftest/generic/green.png b/system/image/test/reftest/generic/green.png
index 4718c00e6..4718c00e6 100644
--- a/image/test/reftest/generic/green.png
+++ b/system/image/test/reftest/generic/green.png
diff --git a/image/test/reftest/generic/reftest-stylo.list b/system/image/test/reftest/generic/reftest-stylo.list
index 1c0cbd6d9..1c0cbd6d9 100644
--- a/image/test/reftest/generic/reftest-stylo.list
+++ b/system/image/test/reftest/generic/reftest-stylo.list
diff --git a/image/test/reftest/generic/reftest.list b/system/image/test/reftest/generic/reftest.list
index c8d850ccb..c8d850ccb 100644
--- a/image/test/reftest/generic/reftest.list
+++ b/system/image/test/reftest/generic/reftest.list
diff --git a/image/test/reftest/gif/1bit-255-trans.gif b/system/image/test/reftest/gif/1bit-255-trans.gif
index 60273ba81..60273ba81 100644
--- a/image/test/reftest/gif/1bit-255-trans.gif
+++ b/system/image/test/reftest/gif/1bit-255-trans.gif
diff --git a/image/test/reftest/gif/1bit-255-trans.png b/system/image/test/reftest/gif/1bit-255-trans.png
index 611480ac4..611480ac4 100644
--- a/image/test/reftest/gif/1bit-255-trans.png
+++ b/system/image/test/reftest/gif/1bit-255-trans.png
diff --git a/image/test/reftest/gif/ImageDocument.css b/system/image/test/reftest/gif/ImageDocument.css
index b44981098..b44981098 100644
--- a/image/test/reftest/gif/ImageDocument.css
+++ b/system/image/test/reftest/gif/ImageDocument.css
diff --git a/image/test/reftest/gif/animation1a.gif b/system/image/test/reftest/gif/animation1a.gif
index d32827654..d32827654 100644
--- a/image/test/reftest/gif/animation1a.gif
+++ b/system/image/test/reftest/gif/animation1a.gif
diff --git a/image/test/reftest/gif/animation2a-finalframe.gif b/system/image/test/reftest/gif/animation2a-finalframe.gif
index 8d9c4aaf7..8d9c4aaf7 100644
--- a/image/test/reftest/gif/animation2a-finalframe.gif
+++ b/system/image/test/reftest/gif/animation2a-finalframe.gif
diff --git a/image/test/reftest/gif/animation2a.gif b/system/image/test/reftest/gif/animation2a.gif
index 07abf8d98..07abf8d98 100644
--- a/image/test/reftest/gif/animation2a.gif
+++ b/system/image/test/reftest/gif/animation2a.gif
diff --git a/image/test/reftest/gif/blue.gif b/system/image/test/reftest/gif/blue.gif
index f9dbeeea8..f9dbeeea8 100644
--- a/image/test/reftest/gif/blue.gif
+++ b/system/image/test/reftest/gif/blue.gif
diff --git a/image/test/reftest/gif/comment.gif b/system/image/test/reftest/gif/comment.gif
index 255cceb41..255cceb41 100644
--- a/image/test/reftest/gif/comment.gif
+++ b/system/image/test/reftest/gif/comment.gif
diff --git a/image/test/reftest/gif/comment.png b/system/image/test/reftest/gif/comment.png
index 89394ba18..89394ba18 100644
--- a/image/test/reftest/gif/comment.png
+++ b/system/image/test/reftest/gif/comment.png
diff --git a/image/test/reftest/gif/delaytest.html b/system/image/test/reftest/gif/delaytest.html
index a6fc80f3e..a6fc80f3e 100644
--- a/image/test/reftest/gif/delaytest.html
+++ b/system/image/test/reftest/gif/delaytest.html
diff --git a/image/test/reftest/gif/in-colormap-trans.gif b/system/image/test/reftest/gif/in-colormap-trans.gif
index 48f5c7caf..48f5c7caf 100644
--- a/image/test/reftest/gif/in-colormap-trans.gif
+++ b/system/image/test/reftest/gif/in-colormap-trans.gif
diff --git a/image/test/reftest/gif/in-colormap-trans.png b/system/image/test/reftest/gif/in-colormap-trans.png
index 08761dfe4..08761dfe4 100644
--- a/image/test/reftest/gif/in-colormap-trans.png
+++ b/system/image/test/reftest/gif/in-colormap-trans.png
diff --git a/image/test/reftest/gif/one-color-offset-ref.gif b/system/image/test/reftest/gif/one-color-offset-ref.gif
index 14a59ff47..14a59ff47 100644
--- a/image/test/reftest/gif/one-color-offset-ref.gif
+++ b/system/image/test/reftest/gif/one-color-offset-ref.gif
diff --git a/image/test/reftest/gif/one-color-offset.gif b/system/image/test/reftest/gif/one-color-offset.gif
index e6d7c4932..e6d7c4932 100644
--- a/image/test/reftest/gif/one-color-offset.gif
+++ b/system/image/test/reftest/gif/one-color-offset.gif
diff --git a/image/test/reftest/gif/out-of-colormap-trans.gif b/system/image/test/reftest/gif/out-of-colormap-trans.gif
index 17e747c9b..17e747c9b 100644
--- a/image/test/reftest/gif/out-of-colormap-trans.gif
+++ b/system/image/test/reftest/gif/out-of-colormap-trans.gif
diff --git a/image/test/reftest/gif/out-of-colormap-trans.png b/system/image/test/reftest/gif/out-of-colormap-trans.png
index 8d3eb581a..8d3eb581a 100644
--- a/image/test/reftest/gif/out-of-colormap-trans.png
+++ b/system/image/test/reftest/gif/out-of-colormap-trans.png
diff --git a/image/test/reftest/gif/red.gif b/system/image/test/reftest/gif/red.gif
index d3c32bae2..d3c32bae2 100644
--- a/image/test/reftest/gif/red.gif
+++ b/system/image/test/reftest/gif/red.gif
diff --git a/image/test/reftest/gif/reftest-stylo.list b/system/image/test/reftest/gif/reftest-stylo.list
index 5567ca61d..5567ca61d 100644
--- a/image/test/reftest/gif/reftest-stylo.list
+++ b/system/image/test/reftest/gif/reftest-stylo.list
diff --git a/image/test/reftest/gif/reftest.list b/system/image/test/reftest/gif/reftest.list
index 75a0252b6..75a0252b6 100644
--- a/image/test/reftest/gif/reftest.list
+++ b/system/image/test/reftest/gif/reftest.list
diff --git a/image/test/reftest/gif/small-background-size-2-ref.gif b/system/image/test/reftest/gif/small-background-size-2-ref.gif
index b513c41aa..b513c41aa 100644
--- a/image/test/reftest/gif/small-background-size-2-ref.gif
+++ b/system/image/test/reftest/gif/small-background-size-2-ref.gif
diff --git a/image/test/reftest/gif/small-background-size-2.gif b/system/image/test/reftest/gif/small-background-size-2.gif
index a5e214767..a5e214767 100644
--- a/image/test/reftest/gif/small-background-size-2.gif
+++ b/system/image/test/reftest/gif/small-background-size-2.gif
diff --git a/image/test/reftest/gif/small-background-size-ref.gif b/system/image/test/reftest/gif/small-background-size-ref.gif
index 1b656ce43..1b656ce43 100644
--- a/image/test/reftest/gif/small-background-size-ref.gif
+++ b/system/image/test/reftest/gif/small-background-size-ref.gif
diff --git a/image/test/reftest/gif/small-background-size.gif b/system/image/test/reftest/gif/small-background-size.gif
index 8185eb71e..8185eb71e 100644
--- a/image/test/reftest/gif/small-background-size.gif
+++ b/system/image/test/reftest/gif/small-background-size.gif
diff --git a/image/test/reftest/gif/test_bug641198.html b/system/image/test/reftest/gif/test_bug641198.html
index 46bdb0d47..46bdb0d47 100644
--- a/image/test/reftest/gif/test_bug641198.html
+++ b/system/image/test/reftest/gif/test_bug641198.html
diff --git a/image/test/reftest/gif/tile-transform-ref.html b/system/image/test/reftest/gif/tile-transform-ref.html
index 5dac1a5bd..5dac1a5bd 100644
--- a/image/test/reftest/gif/tile-transform-ref.html
+++ b/system/image/test/reftest/gif/tile-transform-ref.html
diff --git a/image/test/reftest/gif/tile-transform.html b/system/image/test/reftest/gif/tile-transform.html
index 541ae6bbc..541ae6bbc 100644
--- a/image/test/reftest/gif/tile-transform.html
+++ b/system/image/test/reftest/gif/tile-transform.html
diff --git a/image/test/reftest/gif/tiletest-ref.png b/system/image/test/reftest/gif/tiletest-ref.png
index b493899cc..b493899cc 100644
--- a/image/test/reftest/gif/tiletest-ref.png
+++ b/system/image/test/reftest/gif/tiletest-ref.png
diff --git a/image/test/reftest/gif/tiletest.gif b/system/image/test/reftest/gif/tiletest.gif
index 7a04c9654..7a04c9654 100644
--- a/image/test/reftest/gif/tiletest.gif
+++ b/system/image/test/reftest/gif/tiletest.gif
diff --git a/image/test/reftest/gif/transparent-animation-finalframe.gif b/system/image/test/reftest/gif/transparent-animation-finalframe.gif
index a55f92a81..a55f92a81 100644
--- a/image/test/reftest/gif/transparent-animation-finalframe.gif
+++ b/system/image/test/reftest/gif/transparent-animation-finalframe.gif
diff --git a/image/test/reftest/gif/transparent-animation.gif b/system/image/test/reftest/gif/transparent-animation.gif
index b2895487b..b2895487b 100644
--- a/image/test/reftest/gif/transparent-animation.gif
+++ b/system/image/test/reftest/gif/transparent-animation.gif
diff --git a/image/test/reftest/gif/truncated-framerect-interlaced-ref.gif b/system/image/test/reftest/gif/truncated-framerect-interlaced-ref.gif
index ca9bf2fa7..ca9bf2fa7 100644
--- a/image/test/reftest/gif/truncated-framerect-interlaced-ref.gif
+++ b/system/image/test/reftest/gif/truncated-framerect-interlaced-ref.gif
diff --git a/image/test/reftest/gif/truncated-framerect-interlaced.gif b/system/image/test/reftest/gif/truncated-framerect-interlaced.gif
index 59709898b..59709898b 100644
--- a/image/test/reftest/gif/truncated-framerect-interlaced.gif
+++ b/system/image/test/reftest/gif/truncated-framerect-interlaced.gif
diff --git a/image/test/reftest/gif/truncated-framerect-ref.gif b/system/image/test/reftest/gif/truncated-framerect-ref.gif
index ab79a455b..ab79a455b 100644
--- a/image/test/reftest/gif/truncated-framerect-ref.gif
+++ b/system/image/test/reftest/gif/truncated-framerect-ref.gif
diff --git a/image/test/reftest/gif/truncated-framerect-ref.html b/system/image/test/reftest/gif/truncated-framerect-ref.html
index ef48b8a19..ef48b8a19 100644
--- a/image/test/reftest/gif/truncated-framerect-ref.html
+++ b/system/image/test/reftest/gif/truncated-framerect-ref.html
diff --git a/image/test/reftest/gif/truncated-framerect.gif b/system/image/test/reftest/gif/truncated-framerect.gif
index 8febb2a74..8febb2a74 100644
--- a/image/test/reftest/gif/truncated-framerect.gif
+++ b/system/image/test/reftest/gif/truncated-framerect.gif
diff --git a/image/test/reftest/gif/truncated-framerect.html b/system/image/test/reftest/gif/truncated-framerect.html
index c1c5df653..c1c5df653 100644
--- a/image/test/reftest/gif/truncated-framerect.html
+++ b/system/image/test/reftest/gif/truncated-framerect.html
diff --git a/image/test/reftest/ico/cur/pointer.cur b/system/image/test/reftest/ico/cur/pointer.cur
index 025ebaed1..025ebaed1 100644
--- a/image/test/reftest/ico/cur/pointer.cur
+++ b/system/image/test/reftest/ico/cur/pointer.cur
diff --git a/image/test/reftest/ico/cur/pointer.png b/system/image/test/reftest/ico/cur/pointer.png
index 84ad8f3fb..84ad8f3fb 100644
--- a/image/test/reftest/ico/cur/pointer.png
+++ b/system/image/test/reftest/ico/cur/pointer.png
diff --git a/image/test/reftest/ico/cur/reftest-stylo.list b/system/image/test/reftest/ico/cur/reftest-stylo.list
index b59c26dc5..b59c26dc5 100644
--- a/image/test/reftest/ico/cur/reftest-stylo.list
+++ b/system/image/test/reftest/ico/cur/reftest-stylo.list
diff --git a/image/test/reftest/ico/cur/reftest.list b/system/image/test/reftest/ico/cur/reftest.list
index 635136506..635136506 100644
--- a/image/test/reftest/ico/cur/reftest.list
+++ b/system/image/test/reftest/ico/cur/reftest.list
diff --git a/image/test/reftest/ico/cur/wrapper.html b/system/image/test/reftest/ico/cur/wrapper.html
index 45b516775..45b516775 100644
--- a/image/test/reftest/ico/cur/wrapper.html
+++ b/system/image/test/reftest/ico/cur/wrapper.html
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-not-square-transparent-1bpp.ico b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-not-square-transparent-1bpp.ico
index 0f51d504a..0f51d504a 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-not-square-transparent-1bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-not-square-transparent-1bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-not-square-transparent-1bpp.png b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-not-square-transparent-1bpp.png
index 152b30d71..152b30d71 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-not-square-transparent-1bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-not-square-transparent-1bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-partial-transparent-1bpp.ico b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-partial-transparent-1bpp.ico
index def2a4ece..def2a4ece 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-partial-transparent-1bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-partial-transparent-1bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-partial-transparent-1bpp.png b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-partial-transparent-1bpp.png
index 064a68bb2..064a68bb2 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-partial-transparent-1bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-partial-transparent-1bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-15x15-1bpp.ico b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-15x15-1bpp.ico
index b68cf0ef0..b68cf0ef0 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-15x15-1bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-15x15-1bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-15x15-1bpp.png b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-15x15-1bpp.png
index 956c78ece..956c78ece 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-15x15-1bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-15x15-1bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-16x16-1bpp.ico b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-16x16-1bpp.ico
index d96a4a0e1..d96a4a0e1 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-16x16-1bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-16x16-1bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-16x16-1bpp.png b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-16x16-1bpp.png
index 90088351f..90088351f 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-16x16-1bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-16x16-1bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-17x17-1bpp.ico b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-17x17-1bpp.ico
index 4f10ad13c..4f10ad13c 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-17x17-1bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-17x17-1bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-17x17-1bpp.png b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-17x17-1bpp.png
index 9a294696c..9a294696c 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-17x17-1bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-17x17-1bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-1x1-1bpp.ico b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-1x1-1bpp.ico
index 5af8bef61..5af8bef61 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-1x1-1bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-1x1-1bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-1x1-1bpp.png b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-1x1-1bpp.png
index 7a07a124e..7a07a124e 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-1x1-1bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-1x1-1bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-256x256-1bpp.ico b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-256x256-1bpp.ico
index 63d95e3b7..63d95e3b7 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-256x256-1bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-256x256-1bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-256x256-1bpp.png b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-256x256-1bpp.png
index 0a23d8c8e..0a23d8c8e 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-256x256-1bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-256x256-1bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-2x2-1bpp.ico b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-2x2-1bpp.ico
index 09c140f1b..09c140f1b 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-2x2-1bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-2x2-1bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-2x2-1bpp.png b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-2x2-1bpp.png
index 3b09f8076..3b09f8076 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-2x2-1bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-2x2-1bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-31x31-1bpp.ico b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-31x31-1bpp.ico
index bbfc3165a..bbfc3165a 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-31x31-1bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-31x31-1bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-31x31-1bpp.png b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-31x31-1bpp.png
index d1fe6ddee..d1fe6ddee 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-31x31-1bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-31x31-1bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-32x32-1bpp.ico b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-32x32-1bpp.ico
index 279ecb835..279ecb835 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-32x32-1bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-32x32-1bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-32x32-1bpp.png b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-32x32-1bpp.png
index 078d3dc5d..078d3dc5d 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-32x32-1bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-32x32-1bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-33x33-1bpp.ico b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-33x33-1bpp.ico
index fa1862c1c..fa1862c1c 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-33x33-1bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-33x33-1bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-33x33-1bpp.png b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-33x33-1bpp.png
index e64e12b2a..e64e12b2a 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-33x33-1bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-33x33-1bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-3x3-1bpp.ico b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-3x3-1bpp.ico
index 733b1f12b..733b1f12b 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-3x3-1bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-3x3-1bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-3x3-1bpp.png b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-3x3-1bpp.png
index b8519a874..b8519a874 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-3x3-1bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-3x3-1bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-4x4-1bpp.ico b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-4x4-1bpp.ico
index ba3097cec..ba3097cec 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-4x4-1bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-4x4-1bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-4x4-1bpp.png b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-4x4-1bpp.png
index 3977b5454..3977b5454 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-4x4-1bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-4x4-1bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-5x5-1bpp.ico b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-5x5-1bpp.ico
index 52e32df27..52e32df27 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-5x5-1bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-5x5-1bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-5x5-1bpp.png b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-5x5-1bpp.png
index caa9246b6..caa9246b6 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-5x5-1bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-5x5-1bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-6x6-1bpp.ico b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-6x6-1bpp.ico
index c29651400..c29651400 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-6x6-1bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-6x6-1bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-6x6-1bpp.png b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-6x6-1bpp.png
index 30e1b0249..30e1b0249 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-6x6-1bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-6x6-1bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-7x7-1bpp.ico b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-7x7-1bpp.ico
index 8ce9915c4..8ce9915c4 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-7x7-1bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-7x7-1bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-7x7-1bpp.png b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-7x7-1bpp.png
index 9dbaae84c..9dbaae84c 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-7x7-1bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-7x7-1bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-8x8-1bpp.ico b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-8x8-1bpp.ico
index 485dff028..485dff028 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-8x8-1bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-8x8-1bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-8x8-1bpp.png b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-8x8-1bpp.png
index 220138840..220138840 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-8x8-1bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-8x8-1bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-9x9-1bpp.ico b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-9x9-1bpp.ico
index 38f34ec50..38f34ec50 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-9x9-1bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-9x9-1bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-9x9-1bpp.png b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-9x9-1bpp.png
index 7fe1b548b..7fe1b548b 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-9x9-1bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-size-9x9-1bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-transparent-1bpp.ico b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-transparent-1bpp.ico
index 8e361306c..8e361306c 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-transparent-1bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-transparent-1bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-transparent-1bpp.png b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-transparent-1bpp.png
index 062152e3b..062152e3b 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/ico-transparent-1bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/ico-transparent-1bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/reftest-stylo.list b/system/image/test/reftest/ico/ico-bmp-1bpp/reftest-stylo.list
index 43a597e78..43a597e78 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/reftest-stylo.list
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/reftest-stylo.list
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/reftest.list b/system/image/test/reftest/ico/ico-bmp-1bpp/reftest.list
index 1b9ca1348..1b9ca1348 100644
--- a/image/test/reftest/ico/ico-bmp-1bpp/reftest.list
+++ b/system/image/test/reftest/ico/ico-bmp-1bpp/reftest.list
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-not-square-transparent-24bpp.ico b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-not-square-transparent-24bpp.ico
index 16d6584ef..16d6584ef 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-not-square-transparent-24bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-not-square-transparent-24bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-not-square-transparent-24bpp.png b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-not-square-transparent-24bpp.png
index a881048b9..a881048b9 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-not-square-transparent-24bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-not-square-transparent-24bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-partial-transparent-24bpp.ico b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-partial-transparent-24bpp.ico
index ab0dc4bce..ab0dc4bce 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-partial-transparent-24bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-partial-transparent-24bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-partial-transparent-24bpp.png b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-partial-transparent-24bpp.png
index 0363210c7..0363210c7 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-partial-transparent-24bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-partial-transparent-24bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-15x15-24bpp.ico b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-15x15-24bpp.ico
index 8721b0d16..8721b0d16 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-15x15-24bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-15x15-24bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-15x15-24bpp.png b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-15x15-24bpp.png
index e1287430d..e1287430d 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-15x15-24bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-15x15-24bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-16x16-24bpp.ico b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-16x16-24bpp.ico
index 04e473618..04e473618 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-16x16-24bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-16x16-24bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-16x16-24bpp.png b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-16x16-24bpp.png
index c04869e72..c04869e72 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-16x16-24bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-16x16-24bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-17x17-24bpp.ico b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-17x17-24bpp.ico
index 308ccb7a6..308ccb7a6 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-17x17-24bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-17x17-24bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-17x17-24bpp.png b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-17x17-24bpp.png
index 00fb8e4f3..00fb8e4f3 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-17x17-24bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-17x17-24bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-1x1-24bpp.ico b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-1x1-24bpp.ico
index e2bf90c09..e2bf90c09 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-1x1-24bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-1x1-24bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-1x1-24bpp.png b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-1x1-24bpp.png
index c05f5fef8..c05f5fef8 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-1x1-24bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-1x1-24bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-256x256-24bpp.ico b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-256x256-24bpp.ico
index c3977400a..c3977400a 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-256x256-24bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-256x256-24bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-256x256-24bpp.png b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-256x256-24bpp.png
index 84bfada76..84bfada76 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-256x256-24bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-256x256-24bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-2x2-24bpp.ico b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-2x2-24bpp.ico
index dba180a07..dba180a07 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-2x2-24bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-2x2-24bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-2x2-24bpp.png b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-2x2-24bpp.png
index e512d3f9b..e512d3f9b 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-2x2-24bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-2x2-24bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-31x31-24bpp.ico b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-31x31-24bpp.ico
index aa67502f6..aa67502f6 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-31x31-24bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-31x31-24bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-31x31-24bpp.png b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-31x31-24bpp.png
index e4a864251..e4a864251 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-31x31-24bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-31x31-24bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-32x32-24bpp.ico b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-32x32-24bpp.ico
index a85b871c5..a85b871c5 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-32x32-24bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-32x32-24bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-32x32-24bpp.png b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-32x32-24bpp.png
index 3a6fbe8ee..3a6fbe8ee 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-32x32-24bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-32x32-24bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-33x33-24bpp.ico b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-33x33-24bpp.ico
index a5c49374d..a5c49374d 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-33x33-24bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-33x33-24bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-33x33-24bpp.png b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-33x33-24bpp.png
index 72ef7eb63..72ef7eb63 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-33x33-24bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-33x33-24bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-3x3-24bpp.ico b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-3x3-24bpp.ico
index 8a0b9433f..8a0b9433f 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-3x3-24bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-3x3-24bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-3x3-24bpp.png b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-3x3-24bpp.png
index cb42ec4f8..cb42ec4f8 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-3x3-24bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-3x3-24bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-4x4-24bpp.ico b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-4x4-24bpp.ico
index feb3f11e1..feb3f11e1 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-4x4-24bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-4x4-24bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-4x4-24bpp.png b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-4x4-24bpp.png
index e6afafd89..e6afafd89 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-4x4-24bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-4x4-24bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-5x5-24bpp.ico b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-5x5-24bpp.ico
index d607ca572..d607ca572 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-5x5-24bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-5x5-24bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-5x5-24bpp.png b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-5x5-24bpp.png
index a844aff76..a844aff76 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-5x5-24bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-5x5-24bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-6x6-24bpp.ico b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-6x6-24bpp.ico
index 62a231602..62a231602 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-6x6-24bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-6x6-24bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-6x6-24bpp.png b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-6x6-24bpp.png
index 415c2d9c6..415c2d9c6 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-6x6-24bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-6x6-24bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-7x7-24bpp.ico b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-7x7-24bpp.ico
index d884ecfd7..d884ecfd7 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-7x7-24bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-7x7-24bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-7x7-24bpp.png b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-7x7-24bpp.png
index ab2f89274..ab2f89274 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-7x7-24bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-7x7-24bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-8x8-24bpp.ico b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-8x8-24bpp.ico
index 782ae220d..782ae220d 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-8x8-24bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-8x8-24bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-8x8-24bpp.png b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-8x8-24bpp.png
index fe2ff40a1..fe2ff40a1 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-8x8-24bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-8x8-24bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-9x9-24bpp.ico b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-9x9-24bpp.ico
index 97992643b..97992643b 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-9x9-24bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-9x9-24bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-9x9-24bpp.png b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-9x9-24bpp.png
index 18ab4b25d..18ab4b25d 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-9x9-24bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-size-9x9-24bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-transparent-24bpp.ico b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-transparent-24bpp.ico
index 8e361306c..8e361306c 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-transparent-24bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-transparent-24bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-transparent-24bpp.png b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-transparent-24bpp.png
index 062152e3b..062152e3b 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/ico-transparent-24bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/ico-transparent-24bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/reftest-stylo.list b/system/image/test/reftest/ico/ico-bmp-24bpp/reftest-stylo.list
index 54d8521dc..54d8521dc 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/reftest-stylo.list
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/reftest-stylo.list
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/reftest.list b/system/image/test/reftest/ico/ico-bmp-24bpp/reftest.list
index 877293660..877293660 100644
--- a/image/test/reftest/ico/ico-bmp-24bpp/reftest.list
+++ b/system/image/test/reftest/ico/ico-bmp-24bpp/reftest.list
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-not-square-transparent-32bpp.ico b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-not-square-transparent-32bpp.ico
index dd0299c41..dd0299c41 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-not-square-transparent-32bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-not-square-transparent-32bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-not-square-transparent-32bpp.png b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-not-square-transparent-32bpp.png
index befc66555..befc66555 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-not-square-transparent-32bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-not-square-transparent-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-partial-transparent-32bpp.ico b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-partial-transparent-32bpp.ico
index 8ad62f7d0..8ad62f7d0 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-partial-transparent-32bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-partial-transparent-32bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-partial-transparent-32bpp.png b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-partial-transparent-32bpp.png
index 226ad6494..226ad6494 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-partial-transparent-32bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-partial-transparent-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-15x15-32bpp.ico b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-15x15-32bpp.ico
index 1f1b6b51c..1f1b6b51c 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-15x15-32bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-15x15-32bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-15x15-32bpp.png b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-15x15-32bpp.png
index e1287430d..e1287430d 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-15x15-32bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-15x15-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-16x16-32bpp.ico b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-16x16-32bpp.ico
index 7a8f01529..7a8f01529 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-16x16-32bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-16x16-32bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-16x16-32bpp.png b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-16x16-32bpp.png
index c04869e72..c04869e72 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-16x16-32bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-16x16-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-17x17-32bpp.ico b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-17x17-32bpp.ico
index b92860be4..b92860be4 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-17x17-32bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-17x17-32bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-17x17-32bpp.png b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-17x17-32bpp.png
index 00fb8e4f3..00fb8e4f3 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-17x17-32bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-17x17-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-1x1-32bpp.ico b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-1x1-32bpp.ico
index 5ad60c575..5ad60c575 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-1x1-32bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-1x1-32bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-1x1-32bpp.png b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-1x1-32bpp.png
index c05f5fef8..c05f5fef8 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-1x1-32bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-1x1-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-256x256-32bpp.ico b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-256x256-32bpp.ico
index f8b530ef0..f8b530ef0 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-256x256-32bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-256x256-32bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-256x256-32bpp.png b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-256x256-32bpp.png
index 84bfada76..84bfada76 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-256x256-32bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-256x256-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-2x2-32bpp.ico b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-2x2-32bpp.ico
index e5b2bf7e7..e5b2bf7e7 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-2x2-32bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-2x2-32bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-2x2-32bpp.png b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-2x2-32bpp.png
index e512d3f9b..e512d3f9b 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-2x2-32bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-2x2-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-31x31-32bpp.ico b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-31x31-32bpp.ico
index ddcbde85f..ddcbde85f 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-31x31-32bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-31x31-32bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-31x31-32bpp.png b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-31x31-32bpp.png
index e4a864251..e4a864251 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-31x31-32bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-31x31-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-32x32-32bpp.ico b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-32x32-32bpp.ico
index a89c01648..a89c01648 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-32x32-32bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-32x32-32bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-32x32-32bpp.png b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-32x32-32bpp.png
index 3a6fbe8ee..3a6fbe8ee 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-32x32-32bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-32x32-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-33x33-32bpp.ico b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-33x33-32bpp.ico
index cda9133f8..cda9133f8 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-33x33-32bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-33x33-32bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-33x33-32bpp.png b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-33x33-32bpp.png
index 72ef7eb63..72ef7eb63 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-33x33-32bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-33x33-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-3x3-32bpp.ico b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-3x3-32bpp.ico
index 3894ccf21..3894ccf21 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-3x3-32bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-3x3-32bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-3x3-32bpp.png b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-3x3-32bpp.png
index cb42ec4f8..cb42ec4f8 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-3x3-32bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-3x3-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-4x4-32bpp.ico b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-4x4-32bpp.ico
index 828494c66..828494c66 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-4x4-32bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-4x4-32bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-4x4-32bpp.png b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-4x4-32bpp.png
index e6afafd89..e6afafd89 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-4x4-32bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-4x4-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-5x5-32bpp.ico b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-5x5-32bpp.ico
index 4f0a2bcc7..4f0a2bcc7 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-5x5-32bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-5x5-32bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-5x5-32bpp.png b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-5x5-32bpp.png
index a844aff76..a844aff76 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-5x5-32bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-5x5-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-6x6-32bpp.ico b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-6x6-32bpp.ico
index 5524769e6..5524769e6 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-6x6-32bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-6x6-32bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-6x6-32bpp.png b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-6x6-32bpp.png
index 415c2d9c6..415c2d9c6 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-6x6-32bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-6x6-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-7x7-32bpp.ico b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-7x7-32bpp.ico
index 6aeebb898..6aeebb898 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-7x7-32bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-7x7-32bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-7x7-32bpp.png b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-7x7-32bpp.png
index ab2f89274..ab2f89274 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-7x7-32bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-7x7-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-8x8-32bpp.ico b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-8x8-32bpp.ico
index 824c744a2..824c744a2 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-8x8-32bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-8x8-32bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-8x8-32bpp.png b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-8x8-32bpp.png
index fe2ff40a1..fe2ff40a1 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-8x8-32bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-8x8-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-9x9-32bpp.ico b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-9x9-32bpp.ico
index cf1f6e9c8..cf1f6e9c8 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-9x9-32bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-9x9-32bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-9x9-32bpp.png b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-9x9-32bpp.png
index 18ab4b25d..18ab4b25d 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-9x9-32bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-size-9x9-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-transparent-32bpp.ico b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-transparent-32bpp.ico
index 151b7cb36..151b7cb36 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-transparent-32bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-transparent-32bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-transparent-32bpp.png b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-transparent-32bpp.png
index 062152e3b..062152e3b 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/ico-transparent-32bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/ico-transparent-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/reftest-stylo.list b/system/image/test/reftest/ico/ico-bmp-32bpp/reftest-stylo.list
index 3ee7e7b00..3ee7e7b00 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/reftest-stylo.list
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/reftest-stylo.list
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/reftest.list b/system/image/test/reftest/ico/ico-bmp-32bpp/reftest.list
index e05355a2b..e05355a2b 100644
--- a/image/test/reftest/ico/ico-bmp-32bpp/reftest.list
+++ b/system/image/test/reftest/ico/ico-bmp-32bpp/reftest.list
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-not-square-transparent-4bpp.ico b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-not-square-transparent-4bpp.ico
index d502d2ef6..d502d2ef6 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-not-square-transparent-4bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-not-square-transparent-4bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-not-square-transparent-4bpp.png b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-not-square-transparent-4bpp.png
index 3e556ad29..3e556ad29 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-not-square-transparent-4bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-not-square-transparent-4bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-partial-transparent-4bpp.ico b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-partial-transparent-4bpp.ico
index 7bd3b8a69..7bd3b8a69 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-partial-transparent-4bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-partial-transparent-4bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-partial-transparent-4bpp.png b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-partial-transparent-4bpp.png
index 9ff0ce41f..9ff0ce41f 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-partial-transparent-4bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-partial-transparent-4bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-15x15-4bpp.ico b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-15x15-4bpp.ico
index de5c49e2a..de5c49e2a 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-15x15-4bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-15x15-4bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-15x15-4bpp.png b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-15x15-4bpp.png
index 5d4a3f953..5d4a3f953 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-15x15-4bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-15x15-4bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-16x16-4bpp.ico b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-16x16-4bpp.ico
index b856b3f37..b856b3f37 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-16x16-4bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-16x16-4bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-16x16-4bpp.png b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-16x16-4bpp.png
index d45d63f53..d45d63f53 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-16x16-4bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-16x16-4bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-17x17-4bpp.ico b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-17x17-4bpp.ico
index 44e055d2f..44e055d2f 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-17x17-4bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-17x17-4bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-17x17-4bpp.png b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-17x17-4bpp.png
index bf4890329..bf4890329 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-17x17-4bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-17x17-4bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-1x1-4bpp.ico b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-1x1-4bpp.ico
index fd46c328d..fd46c328d 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-1x1-4bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-1x1-4bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-1x1-4bpp.png b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-1x1-4bpp.png
index d41dd645b..d41dd645b 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-1x1-4bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-1x1-4bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-256x256-4bpp.ico b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-256x256-4bpp.ico
index 6d28edaa8..6d28edaa8 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-256x256-4bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-256x256-4bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-256x256-4bpp.png b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-256x256-4bpp.png
index 3acdef830..3acdef830 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-256x256-4bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-256x256-4bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-2x2-4bpp.ico b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-2x2-4bpp.ico
index 7dc4afde6..7dc4afde6 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-2x2-4bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-2x2-4bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-2x2-4bpp.png b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-2x2-4bpp.png
index b2d605041..b2d605041 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-2x2-4bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-2x2-4bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-31x31-4bpp.ico b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-31x31-4bpp.ico
index 0471332d6..0471332d6 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-31x31-4bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-31x31-4bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-31x31-4bpp.png b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-31x31-4bpp.png
index cb12a3448..cb12a3448 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-31x31-4bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-31x31-4bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-32x32-4bpp.ico b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-32x32-4bpp.ico
index ef005dc5b..ef005dc5b 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-32x32-4bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-32x32-4bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-32x32-4bpp.png b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-32x32-4bpp.png
index 58d867d12..58d867d12 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-32x32-4bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-32x32-4bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-33x33-4bpp.ico b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-33x33-4bpp.ico
index 4c71963a4..4c71963a4 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-33x33-4bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-33x33-4bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-33x33-4bpp.png b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-33x33-4bpp.png
index 064fde198..064fde198 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-33x33-4bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-33x33-4bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-3x3-4bpp.ico b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-3x3-4bpp.ico
index aaa6350e9..aaa6350e9 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-3x3-4bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-3x3-4bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-3x3-4bpp.png b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-3x3-4bpp.png
index e34114d5c..e34114d5c 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-3x3-4bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-3x3-4bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-4x4-4bpp.ico b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-4x4-4bpp.ico
index 767bebed4..767bebed4 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-4x4-4bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-4x4-4bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-4x4-4bpp.png b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-4x4-4bpp.png
index 3efa55562..3efa55562 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-4x4-4bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-4x4-4bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-5x5-4bpp.ico b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-5x5-4bpp.ico
index 309b6fe5b..309b6fe5b 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-5x5-4bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-5x5-4bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-5x5-4bpp.png b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-5x5-4bpp.png
index 02ebf57a5..02ebf57a5 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-5x5-4bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-5x5-4bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-6x6-4bpp.ico b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-6x6-4bpp.ico
index 255fda6a8..255fda6a8 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-6x6-4bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-6x6-4bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-6x6-4bpp.png b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-6x6-4bpp.png
index 1f5769d09..1f5769d09 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-6x6-4bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-6x6-4bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-7x7-4bpp.ico b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-7x7-4bpp.ico
index 1a3963452..1a3963452 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-7x7-4bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-7x7-4bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-7x7-4bpp.png b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-7x7-4bpp.png
index 59a1b98b5..59a1b98b5 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-7x7-4bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-7x7-4bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-8x8-4bpp.ico b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-8x8-4bpp.ico
index 40bc9f893..40bc9f893 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-8x8-4bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-8x8-4bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-8x8-4bpp.png b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-8x8-4bpp.png
index cf44f5967..cf44f5967 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-8x8-4bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-8x8-4bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-9x9-4bpp.ico b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-9x9-4bpp.ico
index bda12f32b..bda12f32b 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-9x9-4bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-9x9-4bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-9x9-4bpp.png b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-9x9-4bpp.png
index 2e0736413..2e0736413 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-9x9-4bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-size-9x9-4bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-transparent-4bpp.ico b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-transparent-4bpp.ico
index 8e361306c..8e361306c 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-transparent-4bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-transparent-4bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-transparent-4bpp.png b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-transparent-4bpp.png
index 062152e3b..062152e3b 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/ico-transparent-4bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/ico-transparent-4bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/reftest-stylo.list b/system/image/test/reftest/ico/ico-bmp-4bpp/reftest-stylo.list
index 073755a4b..073755a4b 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/reftest-stylo.list
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/reftest-stylo.list
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/reftest.list b/system/image/test/reftest/ico/ico-bmp-4bpp/reftest.list
index 6caac4ac8..6caac4ac8 100644
--- a/image/test/reftest/ico/ico-bmp-4bpp/reftest.list
+++ b/system/image/test/reftest/ico/ico-bmp-4bpp/reftest.list
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-not-square-transparent-8bpp.ico b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-not-square-transparent-8bpp.ico
index d28b9a04e..d28b9a04e 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-not-square-transparent-8bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-not-square-transparent-8bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-not-square-transparent-8bpp.png b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-not-square-transparent-8bpp.png
index 36a4eb512..36a4eb512 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-not-square-transparent-8bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-not-square-transparent-8bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-partial-transparent-8bpp.ico b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-partial-transparent-8bpp.ico
index 9074caa40..9074caa40 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-partial-transparent-8bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-partial-transparent-8bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-partial-transparent-8bpp.png b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-partial-transparent-8bpp.png
index 6f990f257..6f990f257 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-partial-transparent-8bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-partial-transparent-8bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-15x15-8bpp.ico b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-15x15-8bpp.ico
index f3f3a1353..f3f3a1353 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-15x15-8bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-15x15-8bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-15x15-8bpp.png b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-15x15-8bpp.png
index e1287430d..e1287430d 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-15x15-8bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-15x15-8bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-16x16-8bpp.ico b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-16x16-8bpp.ico
index 24c20e23e..24c20e23e 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-16x16-8bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-16x16-8bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-16x16-8bpp.png b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-16x16-8bpp.png
index 2e66b2e5f..2e66b2e5f 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-16x16-8bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-16x16-8bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-17x17-8bpp.ico b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-17x17-8bpp.ico
index 7fa66b9b2..7fa66b9b2 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-17x17-8bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-17x17-8bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-17x17-8bpp.png b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-17x17-8bpp.png
index 4d11d7561..4d11d7561 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-17x17-8bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-17x17-8bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-1x1-8bpp.ico b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-1x1-8bpp.ico
index 3cf3320ea..3cf3320ea 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-1x1-8bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-1x1-8bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-1x1-8bpp.png b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-1x1-8bpp.png
index c05f5fef8..c05f5fef8 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-1x1-8bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-1x1-8bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-256x256-8bpp.ico b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-256x256-8bpp.ico
index 524b6f7c8..524b6f7c8 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-256x256-8bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-256x256-8bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-256x256-8bpp.png b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-256x256-8bpp.png
index f367468c9..f367468c9 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-256x256-8bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-256x256-8bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-2x2-8bpp.ico b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-2x2-8bpp.ico
index 95d8375a0..95d8375a0 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-2x2-8bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-2x2-8bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-2x2-8bpp.png b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-2x2-8bpp.png
index e512d3f9b..e512d3f9b 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-2x2-8bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-2x2-8bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-31x31-8bpp.ico b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-31x31-8bpp.ico
index 780675447..780675447 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-31x31-8bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-31x31-8bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-31x31-8bpp.png b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-31x31-8bpp.png
index 84bf61078..84bf61078 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-31x31-8bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-31x31-8bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-32x32-8bpp.ico b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-32x32-8bpp.ico
index d21cc5b96..d21cc5b96 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-32x32-8bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-32x32-8bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-32x32-8bpp.png b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-32x32-8bpp.png
index 349fd4df2..349fd4df2 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-32x32-8bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-32x32-8bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-33x33-8bpp.ico b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-33x33-8bpp.ico
index 1b419b263..1b419b263 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-33x33-8bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-33x33-8bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-33x33-8bpp.png b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-33x33-8bpp.png
index a4c100649..a4c100649 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-33x33-8bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-33x33-8bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-3x3-8bpp.ico b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-3x3-8bpp.ico
index 869f74fcd..869f74fcd 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-3x3-8bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-3x3-8bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-3x3-8bpp.png b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-3x3-8bpp.png
index cb42ec4f8..cb42ec4f8 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-3x3-8bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-3x3-8bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-4x4-8bpp.ico b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-4x4-8bpp.ico
index 396756372..396756372 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-4x4-8bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-4x4-8bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-4x4-8bpp.png b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-4x4-8bpp.png
index e6afafd89..e6afafd89 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-4x4-8bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-4x4-8bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-5x5-8bpp.ico b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-5x5-8bpp.ico
index 92814e366..92814e366 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-5x5-8bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-5x5-8bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-5x5-8bpp.png b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-5x5-8bpp.png
index a844aff76..a844aff76 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-5x5-8bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-5x5-8bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-6x6-8bpp.ico b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-6x6-8bpp.ico
index 1af478a8a..1af478a8a 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-6x6-8bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-6x6-8bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-6x6-8bpp.png b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-6x6-8bpp.png
index 415c2d9c6..415c2d9c6 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-6x6-8bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-6x6-8bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-7x7-8bpp.ico b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-7x7-8bpp.ico
index 1c70820eb..1c70820eb 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-7x7-8bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-7x7-8bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-7x7-8bpp.png b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-7x7-8bpp.png
index ab2f89274..ab2f89274 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-7x7-8bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-7x7-8bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-8x8-8bpp.ico b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-8x8-8bpp.ico
index 782ae220d..782ae220d 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-8x8-8bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-8x8-8bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-8x8-8bpp.png b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-8x8-8bpp.png
index fe2ff40a1..fe2ff40a1 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-8x8-8bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-8x8-8bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-9x9-8bpp.ico b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-9x9-8bpp.ico
index 6825372b4..6825372b4 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-9x9-8bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-9x9-8bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-9x9-8bpp.png b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-9x9-8bpp.png
index 18ab4b25d..18ab4b25d 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-9x9-8bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-size-9x9-8bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-transparent-8bpp.ico b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-transparent-8bpp.ico
index 8e361306c..8e361306c 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-transparent-8bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-transparent-8bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-transparent-8bpp.png b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-transparent-8bpp.png
index 062152e3b..062152e3b 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/ico-transparent-8bpp.png
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/ico-transparent-8bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/reftest-stylo.list b/system/image/test/reftest/ico/ico-bmp-8bpp/reftest-stylo.list
index c5269d3c8..c5269d3c8 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/reftest-stylo.list
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/reftest-stylo.list
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/reftest.list b/system/image/test/reftest/ico/ico-bmp-8bpp/reftest.list
index 5a6b54323..5a6b54323 100644
--- a/image/test/reftest/ico/ico-bmp-8bpp/reftest.list
+++ b/system/image/test/reftest/ico/ico-bmp-8bpp/reftest.list
diff --git a/image/test/reftest/ico/ico-bmp-corrupted/16x16.png b/system/image/test/reftest/ico/ico-bmp-corrupted/16x16.png
index c04869e72..c04869e72 100644
--- a/image/test/reftest/ico/ico-bmp-corrupted/16x16.png
+++ b/system/image/test/reftest/ico/ico-bmp-corrupted/16x16.png
diff --git a/image/test/reftest/ico/ico-bmp-corrupted/invalid-bpp.ico b/system/image/test/reftest/ico/ico-bmp-corrupted/invalid-bpp.ico
index 1189e4c04..1189e4c04 100644
--- a/image/test/reftest/ico/ico-bmp-corrupted/invalid-bpp.ico
+++ b/system/image/test/reftest/ico/ico-bmp-corrupted/invalid-bpp.ico
diff --git a/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression-RLE4.ico b/system/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression-RLE4.ico
index 8fd0a5d65..8fd0a5d65 100644
--- a/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression-RLE4.ico
+++ b/system/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression-RLE4.ico
diff --git a/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression-RLE8.ico b/system/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression-RLE8.ico
index 1f185ca62..1f185ca62 100644
--- a/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression-RLE8.ico
+++ b/system/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression-RLE8.ico
diff --git a/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression.ico b/system/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression.ico
index a49a783c5..a49a783c5 100644
--- a/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression.ico
+++ b/system/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression.ico
diff --git a/image/test/reftest/ico/ico-bmp-corrupted/reftest-stylo.list b/system/image/test/reftest/ico/ico-bmp-corrupted/reftest-stylo.list
index 1dd1a43ae..1dd1a43ae 100644
--- a/image/test/reftest/ico/ico-bmp-corrupted/reftest-stylo.list
+++ b/system/image/test/reftest/ico/ico-bmp-corrupted/reftest-stylo.list
diff --git a/image/test/reftest/ico/ico-bmp-corrupted/reftest.list b/system/image/test/reftest/ico/ico-bmp-corrupted/reftest.list
index 2467b1323..2467b1323 100644
--- a/image/test/reftest/ico/ico-bmp-corrupted/reftest.list
+++ b/system/image/test/reftest/ico/ico-bmp-corrupted/reftest.list
diff --git a/image/test/reftest/ico/ico-bmp-corrupted/wrapper.html b/system/image/test/reftest/ico/ico-bmp-corrupted/wrapper.html
index 56c1f79b3..56c1f79b3 100644
--- a/image/test/reftest/ico/ico-bmp-corrupted/wrapper.html
+++ b/system/image/test/reftest/ico/ico-bmp-corrupted/wrapper.html
diff --git a/image/test/reftest/ico/ico-mixed/mixed-bmp-png.ico b/system/image/test/reftest/ico/ico-mixed/mixed-bmp-png.ico
index 32e2c4995..32e2c4995 100644
--- a/image/test/reftest/ico/ico-mixed/mixed-bmp-png.ico
+++ b/system/image/test/reftest/ico/ico-mixed/mixed-bmp-png.ico
diff --git a/image/test/reftest/ico/ico-mixed/mixed-bmp-png.png b/system/image/test/reftest/ico/ico-mixed/mixed-bmp-png.png
index b6aee7409..b6aee7409 100644
--- a/image/test/reftest/ico/ico-mixed/mixed-bmp-png.png
+++ b/system/image/test/reftest/ico/ico-mixed/mixed-bmp-png.png
diff --git a/image/test/reftest/ico/ico-mixed/mixed-bmp-png32.png b/system/image/test/reftest/ico/ico-mixed/mixed-bmp-png32.png
index a05899127..a05899127 100644
--- a/image/test/reftest/ico/ico-mixed/mixed-bmp-png32.png
+++ b/system/image/test/reftest/ico/ico-mixed/mixed-bmp-png32.png
diff --git a/image/test/reftest/ico/ico-mixed/mixed-bmp-png48.png b/system/image/test/reftest/ico/ico-mixed/mixed-bmp-png48.png
index 61bea5c80..61bea5c80 100644
--- a/image/test/reftest/ico/ico-mixed/mixed-bmp-png48.png
+++ b/system/image/test/reftest/ico/ico-mixed/mixed-bmp-png48.png
diff --git a/image/test/reftest/ico/ico-mixed/reftest-stylo.list b/system/image/test/reftest/ico/ico-mixed/reftest-stylo.list
index a095c2481..a095c2481 100644
--- a/image/test/reftest/ico/ico-mixed/reftest-stylo.list
+++ b/system/image/test/reftest/ico/ico-mixed/reftest-stylo.list
diff --git a/image/test/reftest/ico/ico-mixed/reftest.list b/system/image/test/reftest/ico/ico-mixed/reftest.list
index 36134e40a..36134e40a 100644
--- a/image/test/reftest/ico/ico-mixed/reftest.list
+++ b/system/image/test/reftest/ico/ico-mixed/reftest.list
diff --git a/image/test/reftest/ico/ico-png/corrupted_x00n0g01.ico b/system/image/test/reftest/ico/ico-png/corrupted_x00n0g01.ico
index 18b97b0b7..18b97b0b7 100644
--- a/image/test/reftest/ico/ico-png/corrupted_x00n0g01.ico
+++ b/system/image/test/reftest/ico/ico-png/corrupted_x00n0g01.ico
diff --git a/image/test/reftest/ico/ico-png/corrupted_xxcrn0g04.ico b/system/image/test/reftest/ico/ico-png/corrupted_xxcrn0g04.ico
index 3fa5285c5..3fa5285c5 100644
--- a/image/test/reftest/ico/ico-png/corrupted_xxcrn0g04.ico
+++ b/system/image/test/reftest/ico/ico-png/corrupted_xxcrn0g04.ico
diff --git a/image/test/reftest/ico/ico-png/ico-size-15x15-png.ico b/system/image/test/reftest/ico/ico-png/ico-size-15x15-png.ico
index e67644a89..e67644a89 100644
--- a/image/test/reftest/ico/ico-png/ico-size-15x15-png.ico
+++ b/system/image/test/reftest/ico/ico-png/ico-size-15x15-png.ico
diff --git a/image/test/reftest/ico/ico-png/ico-size-15x15-png.png b/system/image/test/reftest/ico/ico-png/ico-size-15x15-png.png
index e1287430d..e1287430d 100644
--- a/image/test/reftest/ico/ico-png/ico-size-15x15-png.png
+++ b/system/image/test/reftest/ico/ico-png/ico-size-15x15-png.png
diff --git a/image/test/reftest/ico/ico-png/ico-size-16x16-png.ico b/system/image/test/reftest/ico/ico-png/ico-size-16x16-png.ico
index 442ab4dc8..442ab4dc8 100644
--- a/image/test/reftest/ico/ico-png/ico-size-16x16-png.ico
+++ b/system/image/test/reftest/ico/ico-png/ico-size-16x16-png.ico
diff --git a/image/test/reftest/ico/ico-png/ico-size-16x16-png.png b/system/image/test/reftest/ico/ico-png/ico-size-16x16-png.png
index c04869e72..c04869e72 100644
--- a/image/test/reftest/ico/ico-png/ico-size-16x16-png.png
+++ b/system/image/test/reftest/ico/ico-png/ico-size-16x16-png.png
diff --git a/image/test/reftest/ico/ico-png/ico-size-17x17-png.ico b/system/image/test/reftest/ico/ico-png/ico-size-17x17-png.ico
index f135385d7..f135385d7 100644
--- a/image/test/reftest/ico/ico-png/ico-size-17x17-png.ico
+++ b/system/image/test/reftest/ico/ico-png/ico-size-17x17-png.ico
diff --git a/image/test/reftest/ico/ico-png/ico-size-17x17-png.png b/system/image/test/reftest/ico/ico-png/ico-size-17x17-png.png
index 00fb8e4f3..00fb8e4f3 100644
--- a/image/test/reftest/ico/ico-png/ico-size-17x17-png.png
+++ b/system/image/test/reftest/ico/ico-png/ico-size-17x17-png.png
diff --git a/image/test/reftest/ico/ico-png/ico-size-1x1-png.ico b/system/image/test/reftest/ico/ico-png/ico-size-1x1-png.ico
index 8eb80c7db..8eb80c7db 100644
--- a/image/test/reftest/ico/ico-png/ico-size-1x1-png.ico
+++ b/system/image/test/reftest/ico/ico-png/ico-size-1x1-png.ico
diff --git a/image/test/reftest/ico/ico-png/ico-size-1x1-png.png b/system/image/test/reftest/ico/ico-png/ico-size-1x1-png.png
index c05f5fef8..c05f5fef8 100644
--- a/image/test/reftest/ico/ico-png/ico-size-1x1-png.png
+++ b/system/image/test/reftest/ico/ico-png/ico-size-1x1-png.png
diff --git a/image/test/reftest/ico/ico-png/ico-size-256x256-png.ico b/system/image/test/reftest/ico/ico-png/ico-size-256x256-png.ico
index ecb88edf3..ecb88edf3 100644
--- a/image/test/reftest/ico/ico-png/ico-size-256x256-png.ico
+++ b/system/image/test/reftest/ico/ico-png/ico-size-256x256-png.ico
diff --git a/image/test/reftest/ico/ico-png/ico-size-256x256-png.png b/system/image/test/reftest/ico/ico-png/ico-size-256x256-png.png
index 2d2f52d6c..2d2f52d6c 100644
--- a/image/test/reftest/ico/ico-png/ico-size-256x256-png.png
+++ b/system/image/test/reftest/ico/ico-png/ico-size-256x256-png.png
diff --git a/image/test/reftest/ico/ico-png/ico-size-2x2-png.ico b/system/image/test/reftest/ico/ico-png/ico-size-2x2-png.ico
index 5799953c9..5799953c9 100644
--- a/image/test/reftest/ico/ico-png/ico-size-2x2-png.ico
+++ b/system/image/test/reftest/ico/ico-png/ico-size-2x2-png.ico
diff --git a/image/test/reftest/ico/ico-png/ico-size-2x2-png.png b/system/image/test/reftest/ico/ico-png/ico-size-2x2-png.png
index e512d3f9b..e512d3f9b 100644
--- a/image/test/reftest/ico/ico-png/ico-size-2x2-png.png
+++ b/system/image/test/reftest/ico/ico-png/ico-size-2x2-png.png
diff --git a/image/test/reftest/ico/ico-png/ico-size-31x31-png.ico b/system/image/test/reftest/ico/ico-png/ico-size-31x31-png.ico
index 2e9fbd8f9..2e9fbd8f9 100644
--- a/image/test/reftest/ico/ico-png/ico-size-31x31-png.ico
+++ b/system/image/test/reftest/ico/ico-png/ico-size-31x31-png.ico
diff --git a/image/test/reftest/ico/ico-png/ico-size-31x31-png.png b/system/image/test/reftest/ico/ico-png/ico-size-31x31-png.png
index e4a864251..e4a864251 100644
--- a/image/test/reftest/ico/ico-png/ico-size-31x31-png.png
+++ b/system/image/test/reftest/ico/ico-png/ico-size-31x31-png.png
diff --git a/image/test/reftest/ico/ico-png/ico-size-32x32-png.ico b/system/image/test/reftest/ico/ico-png/ico-size-32x32-png.ico
index af97a8663..af97a8663 100644
--- a/image/test/reftest/ico/ico-png/ico-size-32x32-png.ico
+++ b/system/image/test/reftest/ico/ico-png/ico-size-32x32-png.ico
diff --git a/image/test/reftest/ico/ico-png/ico-size-32x32-png.png b/system/image/test/reftest/ico/ico-png/ico-size-32x32-png.png
index 3a6fbe8ee..3a6fbe8ee 100644
--- a/image/test/reftest/ico/ico-png/ico-size-32x32-png.png
+++ b/system/image/test/reftest/ico/ico-png/ico-size-32x32-png.png
diff --git a/image/test/reftest/ico/ico-png/ico-size-33x33-png.ico b/system/image/test/reftest/ico/ico-png/ico-size-33x33-png.ico
index 2509c8c1f..2509c8c1f 100644
--- a/image/test/reftest/ico/ico-png/ico-size-33x33-png.ico
+++ b/system/image/test/reftest/ico/ico-png/ico-size-33x33-png.ico
diff --git a/image/test/reftest/ico/ico-png/ico-size-33x33-png.png b/system/image/test/reftest/ico/ico-png/ico-size-33x33-png.png
index 72ef7eb63..72ef7eb63 100644
--- a/image/test/reftest/ico/ico-png/ico-size-33x33-png.png
+++ b/system/image/test/reftest/ico/ico-png/ico-size-33x33-png.png
diff --git a/image/test/reftest/ico/ico-png/ico-size-3x3-png.ico b/system/image/test/reftest/ico/ico-png/ico-size-3x3-png.ico
index d2cd649c8..d2cd649c8 100644
--- a/image/test/reftest/ico/ico-png/ico-size-3x3-png.ico
+++ b/system/image/test/reftest/ico/ico-png/ico-size-3x3-png.ico
diff --git a/image/test/reftest/ico/ico-png/ico-size-3x3-png.png b/system/image/test/reftest/ico/ico-png/ico-size-3x3-png.png
index cb42ec4f8..cb42ec4f8 100644
--- a/image/test/reftest/ico/ico-png/ico-size-3x3-png.png
+++ b/system/image/test/reftest/ico/ico-png/ico-size-3x3-png.png
diff --git a/image/test/reftest/ico/ico-png/ico-size-4x4-png.ico b/system/image/test/reftest/ico/ico-png/ico-size-4x4-png.ico
index 60180aad5..60180aad5 100644
--- a/image/test/reftest/ico/ico-png/ico-size-4x4-png.ico
+++ b/system/image/test/reftest/ico/ico-png/ico-size-4x4-png.ico
diff --git a/image/test/reftest/ico/ico-png/ico-size-4x4-png.png b/system/image/test/reftest/ico/ico-png/ico-size-4x4-png.png
index e6afafd89..e6afafd89 100644
--- a/image/test/reftest/ico/ico-png/ico-size-4x4-png.png
+++ b/system/image/test/reftest/ico/ico-png/ico-size-4x4-png.png
diff --git a/image/test/reftest/ico/ico-png/ico-size-5x5-png.ico b/system/image/test/reftest/ico/ico-png/ico-size-5x5-png.ico
index 089c0c885..089c0c885 100644
--- a/image/test/reftest/ico/ico-png/ico-size-5x5-png.ico
+++ b/system/image/test/reftest/ico/ico-png/ico-size-5x5-png.ico
diff --git a/image/test/reftest/ico/ico-png/ico-size-5x5-png.png b/system/image/test/reftest/ico/ico-png/ico-size-5x5-png.png
index a844aff76..a844aff76 100644
--- a/image/test/reftest/ico/ico-png/ico-size-5x5-png.png
+++ b/system/image/test/reftest/ico/ico-png/ico-size-5x5-png.png
diff --git a/image/test/reftest/ico/ico-png/ico-size-6x6-png.ico b/system/image/test/reftest/ico/ico-png/ico-size-6x6-png.ico
index 2ee75d25a..2ee75d25a 100644
--- a/image/test/reftest/ico/ico-png/ico-size-6x6-png.ico
+++ b/system/image/test/reftest/ico/ico-png/ico-size-6x6-png.ico
diff --git a/image/test/reftest/ico/ico-png/ico-size-6x6-png.png b/system/image/test/reftest/ico/ico-png/ico-size-6x6-png.png
index 415c2d9c6..415c2d9c6 100644
--- a/image/test/reftest/ico/ico-png/ico-size-6x6-png.png
+++ b/system/image/test/reftest/ico/ico-png/ico-size-6x6-png.png
diff --git a/image/test/reftest/ico/ico-png/ico-size-7x7-png.ico b/system/image/test/reftest/ico/ico-png/ico-size-7x7-png.ico
index ade9a3ecd..ade9a3ecd 100644
--- a/image/test/reftest/ico/ico-png/ico-size-7x7-png.ico
+++ b/system/image/test/reftest/ico/ico-png/ico-size-7x7-png.ico
diff --git a/image/test/reftest/ico/ico-png/ico-size-7x7-png.png b/system/image/test/reftest/ico/ico-png/ico-size-7x7-png.png
index ab2f89274..ab2f89274 100644
--- a/image/test/reftest/ico/ico-png/ico-size-7x7-png.png
+++ b/system/image/test/reftest/ico/ico-png/ico-size-7x7-png.png
diff --git a/image/test/reftest/ico/ico-png/ico-size-8x8-png.ico b/system/image/test/reftest/ico/ico-png/ico-size-8x8-png.ico
index a0a150bad..a0a150bad 100644
--- a/image/test/reftest/ico/ico-png/ico-size-8x8-png.ico
+++ b/system/image/test/reftest/ico/ico-png/ico-size-8x8-png.ico
diff --git a/image/test/reftest/ico/ico-png/ico-size-8x8-png.png b/system/image/test/reftest/ico/ico-png/ico-size-8x8-png.png
index fe2ff40a1..fe2ff40a1 100644
--- a/image/test/reftest/ico/ico-png/ico-size-8x8-png.png
+++ b/system/image/test/reftest/ico/ico-png/ico-size-8x8-png.png
diff --git a/image/test/reftest/ico/ico-png/ico-size-9x9-png.ico b/system/image/test/reftest/ico/ico-png/ico-size-9x9-png.ico
index a53357b44..a53357b44 100644
--- a/image/test/reftest/ico/ico-png/ico-size-9x9-png.ico
+++ b/system/image/test/reftest/ico/ico-png/ico-size-9x9-png.ico
diff --git a/image/test/reftest/ico/ico-png/ico-size-9x9-png.png b/system/image/test/reftest/ico/ico-png/ico-size-9x9-png.png
index 18ab4b25d..18ab4b25d 100644
--- a/image/test/reftest/ico/ico-png/ico-size-9x9-png.png
+++ b/system/image/test/reftest/ico/ico-png/ico-size-9x9-png.png
diff --git a/image/test/reftest/ico/ico-png/reftest-stylo.list b/system/image/test/reftest/ico/ico-png/reftest-stylo.list
index 1fd990c89..1fd990c89 100644
--- a/image/test/reftest/ico/ico-png/reftest-stylo.list
+++ b/system/image/test/reftest/ico/ico-png/reftest-stylo.list
diff --git a/image/test/reftest/ico/ico-png/reftest.list b/system/image/test/reftest/ico/ico-png/reftest.list
index 002d0e4f3..002d0e4f3 100644
--- a/image/test/reftest/ico/ico-png/reftest.list
+++ b/system/image/test/reftest/ico/ico-png/reftest.list
diff --git a/image/test/reftest/ico/ico-png/tmp.ico b/system/image/test/reftest/ico/ico-png/tmp.ico
index 5723a2e77..5723a2e77 100644
--- a/image/test/reftest/ico/ico-png/tmp.ico
+++ b/system/image/test/reftest/ico/ico-png/tmp.ico
diff --git a/image/test/reftest/ico/ico-png/transparent-png.ico b/system/image/test/reftest/ico/ico-png/transparent-png.ico
index cc8a4a31d..cc8a4a31d 100644
--- a/image/test/reftest/ico/ico-png/transparent-png.ico
+++ b/system/image/test/reftest/ico/ico-png/transparent-png.ico
diff --git a/image/test/reftest/ico/ico-png/transparent-png.png b/system/image/test/reftest/ico/ico-png/transparent-png.png
index 29e3a2435..29e3a2435 100644
--- a/image/test/reftest/ico/ico-png/transparent-png.png
+++ b/system/image/test/reftest/ico/ico-png/transparent-png.png
diff --git a/image/test/reftest/ico/ico-png/wrapper.html b/system/image/test/reftest/ico/ico-png/wrapper.html
index 45b516775..45b516775 100644
--- a/image/test/reftest/ico/ico-png/wrapper.html
+++ b/system/image/test/reftest/ico/ico-png/wrapper.html
diff --git a/image/test/reftest/ico/ico-png/x00n0g01.png b/system/image/test/reftest/ico/ico-png/x00n0g01.png
index db3a5fda7..db3a5fda7 100644
--- a/image/test/reftest/ico/ico-png/x00n0g01.png
+++ b/system/image/test/reftest/ico/ico-png/x00n0g01.png
diff --git a/image/test/reftest/ico/ico-png/xcrn0g04.png b/system/image/test/reftest/ico/ico-png/xcrn0g04.png
index 5bce9f3ad..5bce9f3ad 100644
--- a/image/test/reftest/ico/ico-png/xcrn0g04.png
+++ b/system/image/test/reftest/ico/ico-png/xcrn0g04.png
diff --git a/image/test/reftest/ico/reftest-stylo.list b/system/image/test/reftest/ico/reftest-stylo.list
index 52cb9bc6c..52cb9bc6c 100644
--- a/image/test/reftest/ico/reftest-stylo.list
+++ b/system/image/test/reftest/ico/reftest-stylo.list
diff --git a/image/test/reftest/ico/reftest.list b/system/image/test/reftest/ico/reftest.list
index 22ed9b4fe..22ed9b4fe 100644
--- a/image/test/reftest/ico/reftest.list
+++ b/system/image/test/reftest/ico/reftest.list
diff --git a/image/test/reftest/img2html.html b/system/image/test/reftest/img2html.html
index 57f45bbdd..57f45bbdd 100644
--- a/image/test/reftest/img2html.html
+++ b/system/image/test/reftest/img2html.html
diff --git a/image/test/reftest/jpeg/blue.jpg b/system/image/test/reftest/jpeg/blue.jpg
index b5fef5d26..b5fef5d26 100644
--- a/image/test/reftest/jpeg/blue.jpg
+++ b/system/image/test/reftest/jpeg/blue.jpg
diff --git a/image/test/reftest/jpeg/jpg-cmyk-1.jpg b/system/image/test/reftest/jpeg/jpg-cmyk-1.jpg
index ddb2c106f..ddb2c106f 100644
--- a/image/test/reftest/jpeg/jpg-cmyk-1.jpg
+++ b/system/image/test/reftest/jpeg/jpg-cmyk-1.jpg
diff --git a/image/test/reftest/jpeg/jpg-cmyk-1.png b/system/image/test/reftest/jpeg/jpg-cmyk-1.png
index 06915d5bc..06915d5bc 100644
--- a/image/test/reftest/jpeg/jpg-cmyk-1.png
+++ b/system/image/test/reftest/jpeg/jpg-cmyk-1.png
diff --git a/image/test/reftest/jpeg/jpg-cmyk-2.jpg b/system/image/test/reftest/jpeg/jpg-cmyk-2.jpg
index b955bde54..b955bde54 100644
--- a/image/test/reftest/jpeg/jpg-cmyk-2.jpg
+++ b/system/image/test/reftest/jpeg/jpg-cmyk-2.jpg
diff --git a/image/test/reftest/jpeg/jpg-cmyk-2.png b/system/image/test/reftest/jpeg/jpg-cmyk-2.png
index 9691e42b6..9691e42b6 100644
--- a/image/test/reftest/jpeg/jpg-cmyk-2.png
+++ b/system/image/test/reftest/jpeg/jpg-cmyk-2.png
diff --git a/image/test/reftest/jpeg/jpg-gray.jpg b/system/image/test/reftest/jpeg/jpg-gray.jpg
index af0413e3c..af0413e3c 100644
--- a/image/test/reftest/jpeg/jpg-gray.jpg
+++ b/system/image/test/reftest/jpeg/jpg-gray.jpg
diff --git a/image/test/reftest/jpeg/jpg-gray.png b/system/image/test/reftest/jpeg/jpg-gray.png
index c5aedc34d..c5aedc34d 100644
--- a/image/test/reftest/jpeg/jpg-gray.png
+++ b/system/image/test/reftest/jpeg/jpg-gray.png
diff --git a/image/test/reftest/jpeg/jpg-progressive.jpg b/system/image/test/reftest/jpeg/jpg-progressive.jpg
index db3cf59c2..db3cf59c2 100644
--- a/image/test/reftest/jpeg/jpg-progressive.jpg
+++ b/system/image/test/reftest/jpeg/jpg-progressive.jpg
diff --git a/image/test/reftest/jpeg/jpg-progressive.png b/system/image/test/reftest/jpeg/jpg-progressive.png
index 3a6fbe8ee..3a6fbe8ee 100644
--- a/image/test/reftest/jpeg/jpg-progressive.png
+++ b/system/image/test/reftest/jpeg/jpg-progressive.png
diff --git a/image/test/reftest/jpeg/jpg-size-15x15.jpg b/system/image/test/reftest/jpeg/jpg-size-15x15.jpg
index efe120a27..efe120a27 100644
--- a/image/test/reftest/jpeg/jpg-size-15x15.jpg
+++ b/system/image/test/reftest/jpeg/jpg-size-15x15.jpg
diff --git a/image/test/reftest/jpeg/jpg-size-15x15.png b/system/image/test/reftest/jpeg/jpg-size-15x15.png
index e1287430d..e1287430d 100644
--- a/image/test/reftest/jpeg/jpg-size-15x15.png
+++ b/system/image/test/reftest/jpeg/jpg-size-15x15.png
diff --git a/image/test/reftest/jpeg/jpg-size-16x16.jpg b/system/image/test/reftest/jpeg/jpg-size-16x16.jpg
index 148ec733f..148ec733f 100644
--- a/image/test/reftest/jpeg/jpg-size-16x16.jpg
+++ b/system/image/test/reftest/jpeg/jpg-size-16x16.jpg
diff --git a/image/test/reftest/jpeg/jpg-size-16x16.png b/system/image/test/reftest/jpeg/jpg-size-16x16.png
index c04869e72..c04869e72 100644
--- a/image/test/reftest/jpeg/jpg-size-16x16.png
+++ b/system/image/test/reftest/jpeg/jpg-size-16x16.png
diff --git a/image/test/reftest/jpeg/jpg-size-17x17.jpg b/system/image/test/reftest/jpeg/jpg-size-17x17.jpg
index b06bdb0d6..b06bdb0d6 100644
--- a/image/test/reftest/jpeg/jpg-size-17x17.jpg
+++ b/system/image/test/reftest/jpeg/jpg-size-17x17.jpg
diff --git a/image/test/reftest/jpeg/jpg-size-17x17.png b/system/image/test/reftest/jpeg/jpg-size-17x17.png
index 00fb8e4f3..00fb8e4f3 100644
--- a/image/test/reftest/jpeg/jpg-size-17x17.png
+++ b/system/image/test/reftest/jpeg/jpg-size-17x17.png
diff --git a/image/test/reftest/jpeg/jpg-size-1x1.jpg b/system/image/test/reftest/jpeg/jpg-size-1x1.jpg
index 73b68dfc0..73b68dfc0 100644
--- a/image/test/reftest/jpeg/jpg-size-1x1.jpg
+++ b/system/image/test/reftest/jpeg/jpg-size-1x1.jpg
diff --git a/image/test/reftest/jpeg/jpg-size-1x1.png b/system/image/test/reftest/jpeg/jpg-size-1x1.png
index c05f5fef8..c05f5fef8 100644
--- a/image/test/reftest/jpeg/jpg-size-1x1.png
+++ b/system/image/test/reftest/jpeg/jpg-size-1x1.png
diff --git a/image/test/reftest/jpeg/jpg-size-2x2.jpg b/system/image/test/reftest/jpeg/jpg-size-2x2.jpg
index bc50260ea..bc50260ea 100644
--- a/image/test/reftest/jpeg/jpg-size-2x2.jpg
+++ b/system/image/test/reftest/jpeg/jpg-size-2x2.jpg
diff --git a/image/test/reftest/jpeg/jpg-size-2x2.png b/system/image/test/reftest/jpeg/jpg-size-2x2.png
index e512d3f9b..e512d3f9b 100644
--- a/image/test/reftest/jpeg/jpg-size-2x2.png
+++ b/system/image/test/reftest/jpeg/jpg-size-2x2.png
diff --git a/image/test/reftest/jpeg/jpg-size-31x31.jpg b/system/image/test/reftest/jpeg/jpg-size-31x31.jpg
index 8fa0cc236..8fa0cc236 100644
--- a/image/test/reftest/jpeg/jpg-size-31x31.jpg
+++ b/system/image/test/reftest/jpeg/jpg-size-31x31.jpg
diff --git a/image/test/reftest/jpeg/jpg-size-31x31.png b/system/image/test/reftest/jpeg/jpg-size-31x31.png
index e4a864251..e4a864251 100644
--- a/image/test/reftest/jpeg/jpg-size-31x31.png
+++ b/system/image/test/reftest/jpeg/jpg-size-31x31.png
diff --git a/image/test/reftest/jpeg/jpg-size-32x32.jpg b/system/image/test/reftest/jpeg/jpg-size-32x32.jpg
index b11d62df6..b11d62df6 100644
--- a/image/test/reftest/jpeg/jpg-size-32x32.jpg
+++ b/system/image/test/reftest/jpeg/jpg-size-32x32.jpg
diff --git a/image/test/reftest/jpeg/jpg-size-32x32.png b/system/image/test/reftest/jpeg/jpg-size-32x32.png
index 3a6fbe8ee..3a6fbe8ee 100644
--- a/image/test/reftest/jpeg/jpg-size-32x32.png
+++ b/system/image/test/reftest/jpeg/jpg-size-32x32.png
diff --git a/image/test/reftest/jpeg/jpg-size-33x33.jpg b/system/image/test/reftest/jpeg/jpg-size-33x33.jpg
index 5ac1169b4..5ac1169b4 100644
--- a/image/test/reftest/jpeg/jpg-size-33x33.jpg
+++ b/system/image/test/reftest/jpeg/jpg-size-33x33.jpg
diff --git a/image/test/reftest/jpeg/jpg-size-33x33.png b/system/image/test/reftest/jpeg/jpg-size-33x33.png
index 72ef7eb63..72ef7eb63 100644
--- a/image/test/reftest/jpeg/jpg-size-33x33.png
+++ b/system/image/test/reftest/jpeg/jpg-size-33x33.png
diff --git a/image/test/reftest/jpeg/jpg-size-3x3.jpg b/system/image/test/reftest/jpeg/jpg-size-3x3.jpg
index cf370d8ec..cf370d8ec 100644
--- a/image/test/reftest/jpeg/jpg-size-3x3.jpg
+++ b/system/image/test/reftest/jpeg/jpg-size-3x3.jpg
diff --git a/image/test/reftest/jpeg/jpg-size-3x3.png b/system/image/test/reftest/jpeg/jpg-size-3x3.png
index cb42ec4f8..cb42ec4f8 100644
--- a/image/test/reftest/jpeg/jpg-size-3x3.png
+++ b/system/image/test/reftest/jpeg/jpg-size-3x3.png
diff --git a/image/test/reftest/jpeg/jpg-size-4x4.jpg b/system/image/test/reftest/jpeg/jpg-size-4x4.jpg
index 5adf760a1..5adf760a1 100644
--- a/image/test/reftest/jpeg/jpg-size-4x4.jpg
+++ b/system/image/test/reftest/jpeg/jpg-size-4x4.jpg
diff --git a/image/test/reftest/jpeg/jpg-size-4x4.png b/system/image/test/reftest/jpeg/jpg-size-4x4.png
index e6afafd89..e6afafd89 100644
--- a/image/test/reftest/jpeg/jpg-size-4x4.png
+++ b/system/image/test/reftest/jpeg/jpg-size-4x4.png
diff --git a/image/test/reftest/jpeg/jpg-size-5x5.jpg b/system/image/test/reftest/jpeg/jpg-size-5x5.jpg
index 4d5fd0501..4d5fd0501 100644
--- a/image/test/reftest/jpeg/jpg-size-5x5.jpg
+++ b/system/image/test/reftest/jpeg/jpg-size-5x5.jpg
diff --git a/image/test/reftest/jpeg/jpg-size-5x5.png b/system/image/test/reftest/jpeg/jpg-size-5x5.png
index a844aff76..a844aff76 100644
--- a/image/test/reftest/jpeg/jpg-size-5x5.png
+++ b/system/image/test/reftest/jpeg/jpg-size-5x5.png
diff --git a/image/test/reftest/jpeg/jpg-size-6x6.jpg b/system/image/test/reftest/jpeg/jpg-size-6x6.jpg
index 415c2d9c6..415c2d9c6 100644
--- a/image/test/reftest/jpeg/jpg-size-6x6.jpg
+++ b/system/image/test/reftest/jpeg/jpg-size-6x6.jpg
diff --git a/image/test/reftest/jpeg/jpg-size-6x6.png b/system/image/test/reftest/jpeg/jpg-size-6x6.png
index 415c2d9c6..415c2d9c6 100644
--- a/image/test/reftest/jpeg/jpg-size-6x6.png
+++ b/system/image/test/reftest/jpeg/jpg-size-6x6.png
diff --git a/image/test/reftest/jpeg/jpg-size-7x7.jpg b/system/image/test/reftest/jpeg/jpg-size-7x7.jpg
index 5495f7e43..5495f7e43 100644
--- a/image/test/reftest/jpeg/jpg-size-7x7.jpg
+++ b/system/image/test/reftest/jpeg/jpg-size-7x7.jpg
diff --git a/image/test/reftest/jpeg/jpg-size-7x7.png b/system/image/test/reftest/jpeg/jpg-size-7x7.png
index ab2f89274..ab2f89274 100644
--- a/image/test/reftest/jpeg/jpg-size-7x7.png
+++ b/system/image/test/reftest/jpeg/jpg-size-7x7.png
diff --git a/image/test/reftest/jpeg/jpg-size-8x8.jpg b/system/image/test/reftest/jpeg/jpg-size-8x8.jpg
index 84a5c8f42..84a5c8f42 100644
--- a/image/test/reftest/jpeg/jpg-size-8x8.jpg
+++ b/system/image/test/reftest/jpeg/jpg-size-8x8.jpg
diff --git a/image/test/reftest/jpeg/jpg-size-8x8.png b/system/image/test/reftest/jpeg/jpg-size-8x8.png
index fe2ff40a1..fe2ff40a1 100644
--- a/image/test/reftest/jpeg/jpg-size-8x8.png
+++ b/system/image/test/reftest/jpeg/jpg-size-8x8.png
diff --git a/image/test/reftest/jpeg/jpg-size-9x9.jpg b/system/image/test/reftest/jpeg/jpg-size-9x9.jpg
index d0a15e599..d0a15e599 100644
--- a/image/test/reftest/jpeg/jpg-size-9x9.jpg
+++ b/system/image/test/reftest/jpeg/jpg-size-9x9.jpg
diff --git a/image/test/reftest/jpeg/jpg-size-9x9.png b/system/image/test/reftest/jpeg/jpg-size-9x9.png
index 18ab4b25d..18ab4b25d 100644
--- a/image/test/reftest/jpeg/jpg-size-9x9.png
+++ b/system/image/test/reftest/jpeg/jpg-size-9x9.png
diff --git a/image/test/reftest/jpeg/jpg-srgb-icc.jpg b/system/image/test/reftest/jpeg/jpg-srgb-icc.jpg
index 3ebefac73..3ebefac73 100644
--- a/image/test/reftest/jpeg/jpg-srgb-icc.jpg
+++ b/system/image/test/reftest/jpeg/jpg-srgb-icc.jpg
diff --git a/image/test/reftest/jpeg/jpg-srgb-icc.png b/system/image/test/reftest/jpeg/jpg-srgb-icc.png
index 1d8efc687..1d8efc687 100644
--- a/image/test/reftest/jpeg/jpg-srgb-icc.png
+++ b/system/image/test/reftest/jpeg/jpg-srgb-icc.png
diff --git a/image/test/reftest/jpeg/red.jpg b/system/image/test/reftest/jpeg/red.jpg
index 8fca4b938..8fca4b938 100644
--- a/image/test/reftest/jpeg/red.jpg
+++ b/system/image/test/reftest/jpeg/red.jpg
diff --git a/image/test/reftest/jpeg/reftest-stylo.list b/system/image/test/reftest/jpeg/reftest-stylo.list
index a906cde8e..a906cde8e 100644
--- a/image/test/reftest/jpeg/reftest-stylo.list
+++ b/system/image/test/reftest/jpeg/reftest-stylo.list
diff --git a/image/test/reftest/jpeg/reftest.list b/system/image/test/reftest/jpeg/reftest.list
index 0eafb77e7..0eafb77e7 100644
--- a/image/test/reftest/jpeg/reftest.list
+++ b/system/image/test/reftest/jpeg/reftest.list
diff --git a/image/test/reftest/jpeg/webcam-simulacrum.mjpg b/system/image/test/reftest/jpeg/webcam-simulacrum.mjpg
index a593273c0..a593273c0 100644
--- a/image/test/reftest/jpeg/webcam-simulacrum.mjpg
+++ b/system/image/test/reftest/jpeg/webcam-simulacrum.mjpg
diff --git a/image/test/reftest/jpeg/webcam-simulacrum.mjpg^headers^ b/system/image/test/reftest/jpeg/webcam-simulacrum.mjpg^headers^
index f5e846508..f5e846508 100644
--- a/image/test/reftest/jpeg/webcam-simulacrum.mjpg^headers^
+++ b/system/image/test/reftest/jpeg/webcam-simulacrum.mjpg^headers^
diff --git a/image/test/reftest/pngsuite-ancillary/ccwn2c08.html b/system/image/test/reftest/pngsuite-ancillary/ccwn2c08.html
index dc4996e2b..dc4996e2b 100644
--- a/image/test/reftest/pngsuite-ancillary/ccwn2c08.html
+++ b/system/image/test/reftest/pngsuite-ancillary/ccwn2c08.html
diff --git a/image/test/reftest/pngsuite-ancillary/ccwn2c08.png b/system/image/test/reftest/pngsuite-ancillary/ccwn2c08.png
index 47c24817b..47c24817b 100644
--- a/image/test/reftest/pngsuite-ancillary/ccwn2c08.png
+++ b/system/image/test/reftest/pngsuite-ancillary/ccwn2c08.png
diff --git a/image/test/reftest/pngsuite-ancillary/ccwn3p08.html b/system/image/test/reftest/pngsuite-ancillary/ccwn3p08.html
index 52e636eaa..52e636eaa 100644
--- a/image/test/reftest/pngsuite-ancillary/ccwn3p08.html
+++ b/system/image/test/reftest/pngsuite-ancillary/ccwn3p08.html
diff --git a/image/test/reftest/pngsuite-ancillary/ccwn3p08.png b/system/image/test/reftest/pngsuite-ancillary/ccwn3p08.png
index 8bb2c1098..8bb2c1098 100644
--- a/image/test/reftest/pngsuite-ancillary/ccwn3p08.png
+++ b/system/image/test/reftest/pngsuite-ancillary/ccwn3p08.png
diff --git a/image/test/reftest/pngsuite-ancillary/cdfn2c08.html b/system/image/test/reftest/pngsuite-ancillary/cdfn2c08.html
index aaae670ec..aaae670ec 100644
--- a/image/test/reftest/pngsuite-ancillary/cdfn2c08.html
+++ b/system/image/test/reftest/pngsuite-ancillary/cdfn2c08.html
diff --git a/image/test/reftest/pngsuite-ancillary/cdfn2c08.png b/system/image/test/reftest/pngsuite-ancillary/cdfn2c08.png
index 559e5261e..559e5261e 100644
--- a/image/test/reftest/pngsuite-ancillary/cdfn2c08.png
+++ b/system/image/test/reftest/pngsuite-ancillary/cdfn2c08.png
diff --git a/image/test/reftest/pngsuite-ancillary/cdhn2c08.html b/system/image/test/reftest/pngsuite-ancillary/cdhn2c08.html
index d56ebf2e1..d56ebf2e1 100644
--- a/image/test/reftest/pngsuite-ancillary/cdhn2c08.html
+++ b/system/image/test/reftest/pngsuite-ancillary/cdhn2c08.html
diff --git a/image/test/reftest/pngsuite-ancillary/cdhn2c08.png b/system/image/test/reftest/pngsuite-ancillary/cdhn2c08.png
index 3e07e8ecb..3e07e8ecb 100644
--- a/image/test/reftest/pngsuite-ancillary/cdhn2c08.png
+++ b/system/image/test/reftest/pngsuite-ancillary/cdhn2c08.png
diff --git a/image/test/reftest/pngsuite-ancillary/cdsn2c08.html b/system/image/test/reftest/pngsuite-ancillary/cdsn2c08.html
index 3ba83a6f5..3ba83a6f5 100644
--- a/image/test/reftest/pngsuite-ancillary/cdsn2c08.html
+++ b/system/image/test/reftest/pngsuite-ancillary/cdsn2c08.html
diff --git a/image/test/reftest/pngsuite-ancillary/cdsn2c08.png b/system/image/test/reftest/pngsuite-ancillary/cdsn2c08.png
index 076c32cc0..076c32cc0 100644
--- a/image/test/reftest/pngsuite-ancillary/cdsn2c08.png
+++ b/system/image/test/reftest/pngsuite-ancillary/cdsn2c08.png
diff --git a/image/test/reftest/pngsuite-ancillary/cdun2c08.html b/system/image/test/reftest/pngsuite-ancillary/cdun2c08.html
index b78233718..b78233718 100644
--- a/image/test/reftest/pngsuite-ancillary/cdun2c08.html
+++ b/system/image/test/reftest/pngsuite-ancillary/cdun2c08.html
diff --git a/image/test/reftest/pngsuite-ancillary/cdun2c08.png b/system/image/test/reftest/pngsuite-ancillary/cdun2c08.png
index 846033be6..846033be6 100644
--- a/image/test/reftest/pngsuite-ancillary/cdun2c08.png
+++ b/system/image/test/reftest/pngsuite-ancillary/cdun2c08.png
diff --git a/image/test/reftest/pngsuite-ancillary/ch1n3p04.html b/system/image/test/reftest/pngsuite-ancillary/ch1n3p04.html
index dc2a121de..dc2a121de 100644
--- a/image/test/reftest/pngsuite-ancillary/ch1n3p04.html
+++ b/system/image/test/reftest/pngsuite-ancillary/ch1n3p04.html
diff --git a/image/test/reftest/pngsuite-ancillary/ch1n3p04.png b/system/image/test/reftest/pngsuite-ancillary/ch1n3p04.png
index 17cd12dfc..17cd12dfc 100644
--- a/image/test/reftest/pngsuite-ancillary/ch1n3p04.png
+++ b/system/image/test/reftest/pngsuite-ancillary/ch1n3p04.png
diff --git a/image/test/reftest/pngsuite-ancillary/ch2n3p08.html b/system/image/test/reftest/pngsuite-ancillary/ch2n3p08.html
index 78b72c61c..78b72c61c 100644
--- a/image/test/reftest/pngsuite-ancillary/ch2n3p08.html
+++ b/system/image/test/reftest/pngsuite-ancillary/ch2n3p08.html
diff --git a/image/test/reftest/pngsuite-ancillary/ch2n3p08.png b/system/image/test/reftest/pngsuite-ancillary/ch2n3p08.png
index 25c17987a..25c17987a 100644
--- a/image/test/reftest/pngsuite-ancillary/ch2n3p08.png
+++ b/system/image/test/reftest/pngsuite-ancillary/ch2n3p08.png
diff --git a/image/test/reftest/pngsuite-ancillary/cm0n0g04.html b/system/image/test/reftest/pngsuite-ancillary/cm0n0g04.html
index 25d3abca3..25d3abca3 100644
--- a/image/test/reftest/pngsuite-ancillary/cm0n0g04.html
+++ b/system/image/test/reftest/pngsuite-ancillary/cm0n0g04.html
diff --git a/image/test/reftest/pngsuite-ancillary/cm0n0g04.png b/system/image/test/reftest/pngsuite-ancillary/cm0n0g04.png
index 9fba5db3b..9fba5db3b 100644
--- a/image/test/reftest/pngsuite-ancillary/cm0n0g04.png
+++ b/system/image/test/reftest/pngsuite-ancillary/cm0n0g04.png
diff --git a/image/test/reftest/pngsuite-ancillary/cm7n0g04.html b/system/image/test/reftest/pngsuite-ancillary/cm7n0g04.html
index 25d3abca3..25d3abca3 100644
--- a/image/test/reftest/pngsuite-ancillary/cm7n0g04.html
+++ b/system/image/test/reftest/pngsuite-ancillary/cm7n0g04.html
diff --git a/image/test/reftest/pngsuite-ancillary/cm7n0g04.png b/system/image/test/reftest/pngsuite-ancillary/cm7n0g04.png
index f7dc46e68..f7dc46e68 100644
--- a/image/test/reftest/pngsuite-ancillary/cm7n0g04.png
+++ b/system/image/test/reftest/pngsuite-ancillary/cm7n0g04.png
diff --git a/image/test/reftest/pngsuite-ancillary/cm9n0g04.html b/system/image/test/reftest/pngsuite-ancillary/cm9n0g04.html
index 25d3abca3..25d3abca3 100644
--- a/image/test/reftest/pngsuite-ancillary/cm9n0g04.html
+++ b/system/image/test/reftest/pngsuite-ancillary/cm9n0g04.html
diff --git a/image/test/reftest/pngsuite-ancillary/cm9n0g04.png b/system/image/test/reftest/pngsuite-ancillary/cm9n0g04.png
index dd70911ad..dd70911ad 100644
--- a/image/test/reftest/pngsuite-ancillary/cm9n0g04.png
+++ b/system/image/test/reftest/pngsuite-ancillary/cm9n0g04.png
diff --git a/image/test/reftest/pngsuite-ancillary/cs3n2c16.html b/system/image/test/reftest/pngsuite-ancillary/cs3n2c16.html
index bc4ab1488..bc4ab1488 100644
--- a/image/test/reftest/pngsuite-ancillary/cs3n2c16.html
+++ b/system/image/test/reftest/pngsuite-ancillary/cs3n2c16.html
diff --git a/image/test/reftest/pngsuite-ancillary/cs3n2c16.png b/system/image/test/reftest/pngsuite-ancillary/cs3n2c16.png
index bf5fd20a2..bf5fd20a2 100644
--- a/image/test/reftest/pngsuite-ancillary/cs3n2c16.png
+++ b/system/image/test/reftest/pngsuite-ancillary/cs3n2c16.png
diff --git a/image/test/reftest/pngsuite-ancillary/cs3n3p08.html b/system/image/test/reftest/pngsuite-ancillary/cs3n3p08.html
index 21557a400..21557a400 100644
--- a/image/test/reftest/pngsuite-ancillary/cs3n3p08.html
+++ b/system/image/test/reftest/pngsuite-ancillary/cs3n3p08.html
diff --git a/image/test/reftest/pngsuite-ancillary/cs3n3p08.png b/system/image/test/reftest/pngsuite-ancillary/cs3n3p08.png
index f4a66237b..f4a66237b 100644
--- a/image/test/reftest/pngsuite-ancillary/cs3n3p08.png
+++ b/system/image/test/reftest/pngsuite-ancillary/cs3n3p08.png
diff --git a/image/test/reftest/pngsuite-ancillary/cs5n2c08.html b/system/image/test/reftest/pngsuite-ancillary/cs5n2c08.html
index d1642a1bf..d1642a1bf 100644
--- a/image/test/reftest/pngsuite-ancillary/cs5n2c08.html
+++ b/system/image/test/reftest/pngsuite-ancillary/cs5n2c08.html
diff --git a/image/test/reftest/pngsuite-ancillary/cs5n2c08.png b/system/image/test/reftest/pngsuite-ancillary/cs5n2c08.png
index 40f947c33..40f947c33 100644
--- a/image/test/reftest/pngsuite-ancillary/cs5n2c08.png
+++ b/system/image/test/reftest/pngsuite-ancillary/cs5n2c08.png
diff --git a/image/test/reftest/pngsuite-ancillary/cs5n3p08.html b/system/image/test/reftest/pngsuite-ancillary/cs5n3p08.html
index d1642a1bf..d1642a1bf 100644
--- a/image/test/reftest/pngsuite-ancillary/cs5n3p08.html
+++ b/system/image/test/reftest/pngsuite-ancillary/cs5n3p08.html
diff --git a/image/test/reftest/pngsuite-ancillary/cs5n3p08.png b/system/image/test/reftest/pngsuite-ancillary/cs5n3p08.png
index dfd6e6e6e..dfd6e6e6e 100644
--- a/image/test/reftest/pngsuite-ancillary/cs5n3p08.png
+++ b/system/image/test/reftest/pngsuite-ancillary/cs5n3p08.png
diff --git a/image/test/reftest/pngsuite-ancillary/cs8n2c08.html b/system/image/test/reftest/pngsuite-ancillary/cs8n2c08.html
index 549341e76..549341e76 100644
--- a/image/test/reftest/pngsuite-ancillary/cs8n2c08.html
+++ b/system/image/test/reftest/pngsuite-ancillary/cs8n2c08.html
diff --git a/image/test/reftest/pngsuite-ancillary/cs8n2c08.png b/system/image/test/reftest/pngsuite-ancillary/cs8n2c08.png
index 8e01d3294..8e01d3294 100644
--- a/image/test/reftest/pngsuite-ancillary/cs8n2c08.png
+++ b/system/image/test/reftest/pngsuite-ancillary/cs8n2c08.png
diff --git a/image/test/reftest/pngsuite-ancillary/cs8n3p08.html b/system/image/test/reftest/pngsuite-ancillary/cs8n3p08.html
index 549341e76..549341e76 100644
--- a/image/test/reftest/pngsuite-ancillary/cs8n3p08.html
+++ b/system/image/test/reftest/pngsuite-ancillary/cs8n3p08.html
diff --git a/image/test/reftest/pngsuite-ancillary/cs8n3p08.png b/system/image/test/reftest/pngsuite-ancillary/cs8n3p08.png
index a44066eb6..a44066eb6 100644
--- a/image/test/reftest/pngsuite-ancillary/cs8n3p08.png
+++ b/system/image/test/reftest/pngsuite-ancillary/cs8n3p08.png
diff --git a/image/test/reftest/pngsuite-ancillary/ct0n0g04.html b/system/image/test/reftest/pngsuite-ancillary/ct0n0g04.html
index 25d3abca3..25d3abca3 100644
--- a/image/test/reftest/pngsuite-ancillary/ct0n0g04.html
+++ b/system/image/test/reftest/pngsuite-ancillary/ct0n0g04.html
diff --git a/image/test/reftest/pngsuite-ancillary/ct0n0g04.png b/system/image/test/reftest/pngsuite-ancillary/ct0n0g04.png
index 40d1e062f..40d1e062f 100644
--- a/image/test/reftest/pngsuite-ancillary/ct0n0g04.png
+++ b/system/image/test/reftest/pngsuite-ancillary/ct0n0g04.png
diff --git a/image/test/reftest/pngsuite-ancillary/ct1n0g04.html b/system/image/test/reftest/pngsuite-ancillary/ct1n0g04.html
index 25d3abca3..25d3abca3 100644
--- a/image/test/reftest/pngsuite-ancillary/ct1n0g04.html
+++ b/system/image/test/reftest/pngsuite-ancillary/ct1n0g04.html
diff --git a/image/test/reftest/pngsuite-ancillary/ct1n0g04.png b/system/image/test/reftest/pngsuite-ancillary/ct1n0g04.png
index 3ba110aa7..3ba110aa7 100644
--- a/image/test/reftest/pngsuite-ancillary/ct1n0g04.png
+++ b/system/image/test/reftest/pngsuite-ancillary/ct1n0g04.png
diff --git a/image/test/reftest/pngsuite-ancillary/ctzn0g04.html b/system/image/test/reftest/pngsuite-ancillary/ctzn0g04.html
index 25d3abca3..25d3abca3 100644
--- a/image/test/reftest/pngsuite-ancillary/ctzn0g04.html
+++ b/system/image/test/reftest/pngsuite-ancillary/ctzn0g04.html
diff --git a/image/test/reftest/pngsuite-ancillary/ctzn0g04.png b/system/image/test/reftest/pngsuite-ancillary/ctzn0g04.png
index b4401c9cf..b4401c9cf 100644
--- a/image/test/reftest/pngsuite-ancillary/ctzn0g04.png
+++ b/system/image/test/reftest/pngsuite-ancillary/ctzn0g04.png
diff --git a/image/test/reftest/pngsuite-ancillary/qcms-asm-check.js b/system/image/test/reftest/pngsuite-ancillary/qcms-asm-check.js
index 32e4434aa..32e4434aa 100644
--- a/image/test/reftest/pngsuite-ancillary/qcms-asm-check.js
+++ b/system/image/test/reftest/pngsuite-ancillary/qcms-asm-check.js
diff --git a/image/test/reftest/pngsuite-ancillary/reftest-stylo.list b/system/image/test/reftest/pngsuite-ancillary/reftest-stylo.list
index 38b0d64e1..38b0d64e1 100644
--- a/image/test/reftest/pngsuite-ancillary/reftest-stylo.list
+++ b/system/image/test/reftest/pngsuite-ancillary/reftest-stylo.list
diff --git a/image/test/reftest/pngsuite-ancillary/reftest.list b/system/image/test/reftest/pngsuite-ancillary/reftest.list
index 7a8900b95..7a8900b95 100644
--- a/image/test/reftest/pngsuite-ancillary/reftest.list
+++ b/system/image/test/reftest/pngsuite-ancillary/reftest.list
diff --git a/image/test/reftest/pngsuite-background/bg__4a08.html b/system/image/test/reftest/pngsuite-background/bg__4a08.html
index 743ad1200..743ad1200 100644
--- a/image/test/reftest/pngsuite-background/bg__4a08.html
+++ b/system/image/test/reftest/pngsuite-background/bg__4a08.html
diff --git a/image/test/reftest/pngsuite-background/bg__4a16.html b/system/image/test/reftest/pngsuite-background/bg__4a16.html
index b15b280f1..b15b280f1 100644
--- a/image/test/reftest/pngsuite-background/bg__4a16.html
+++ b/system/image/test/reftest/pngsuite-background/bg__4a16.html
diff --git a/image/test/reftest/pngsuite-background/bg__6a08.html b/system/image/test/reftest/pngsuite-background/bg__6a08.html
index 1ab2721f3..1ab2721f3 100644
--- a/image/test/reftest/pngsuite-background/bg__6a08.html
+++ b/system/image/test/reftest/pngsuite-background/bg__6a08.html
diff --git a/image/test/reftest/pngsuite-background/bg__6a16.html b/system/image/test/reftest/pngsuite-background/bg__6a16.html
index 8ead05a34..8ead05a34 100644
--- a/image/test/reftest/pngsuite-background/bg__6a16.html
+++ b/system/image/test/reftest/pngsuite-background/bg__6a16.html
diff --git a/image/test/reftest/pngsuite-background/bgai4a08.png b/system/image/test/reftest/pngsuite-background/bgai4a08.png
index 398132be5..398132be5 100644
--- a/image/test/reftest/pngsuite-background/bgai4a08.png
+++ b/system/image/test/reftest/pngsuite-background/bgai4a08.png
diff --git a/image/test/reftest/pngsuite-background/bgai4a16.png b/system/image/test/reftest/pngsuite-background/bgai4a16.png
index 51192e731..51192e731 100644
--- a/image/test/reftest/pngsuite-background/bgai4a16.png
+++ b/system/image/test/reftest/pngsuite-background/bgai4a16.png
diff --git a/image/test/reftest/pngsuite-background/bgan6a08.png b/system/image/test/reftest/pngsuite-background/bgan6a08.png
index e60873876..e60873876 100644
--- a/image/test/reftest/pngsuite-background/bgan6a08.png
+++ b/system/image/test/reftest/pngsuite-background/bgan6a08.png
diff --git a/image/test/reftest/pngsuite-background/bgan6a16.png b/system/image/test/reftest/pngsuite-background/bgan6a16.png
index 984a99525..984a99525 100644
--- a/image/test/reftest/pngsuite-background/bgan6a16.png
+++ b/system/image/test/reftest/pngsuite-background/bgan6a16.png
diff --git a/image/test/reftest/pngsuite-background/bgbn4a08.png b/system/image/test/reftest/pngsuite-background/bgbn4a08.png
index 7cbefc3bf..7cbefc3bf 100644
--- a/image/test/reftest/pngsuite-background/bgbn4a08.png
+++ b/system/image/test/reftest/pngsuite-background/bgbn4a08.png
diff --git a/image/test/reftest/pngsuite-background/bggn4a16.png b/system/image/test/reftest/pngsuite-background/bggn4a16.png
index 13fd85ba1..13fd85ba1 100644
--- a/image/test/reftest/pngsuite-background/bggn4a16.png
+++ b/system/image/test/reftest/pngsuite-background/bggn4a16.png
diff --git a/image/test/reftest/pngsuite-background/bgwn6a08.png b/system/image/test/reftest/pngsuite-background/bgwn6a08.png
index a67ff205b..a67ff205b 100644
--- a/image/test/reftest/pngsuite-background/bgwn6a08.png
+++ b/system/image/test/reftest/pngsuite-background/bgwn6a08.png
diff --git a/image/test/reftest/pngsuite-background/bgyn6a16.png b/system/image/test/reftest/pngsuite-background/bgyn6a16.png
index ae3e9be58..ae3e9be58 100644
--- a/image/test/reftest/pngsuite-background/bgyn6a16.png
+++ b/system/image/test/reftest/pngsuite-background/bgyn6a16.png
diff --git a/image/test/reftest/pngsuite-background/reftest-stylo.list b/system/image/test/reftest/pngsuite-background/reftest-stylo.list
index 567b36b5b..567b36b5b 100644
--- a/image/test/reftest/pngsuite-background/reftest-stylo.list
+++ b/system/image/test/reftest/pngsuite-background/reftest-stylo.list
diff --git a/image/test/reftest/pngsuite-background/reftest.list b/system/image/test/reftest/pngsuite-background/reftest.list
index f15cfa079..f15cfa079 100644
--- a/image/test/reftest/pngsuite-background/reftest.list
+++ b/system/image/test/reftest/pngsuite-background/reftest.list
diff --git a/image/test/reftest/pngsuite-background/wrapper.html b/system/image/test/reftest/pngsuite-background/wrapper.html
index 45b516775..45b516775 100644
--- a/image/test/reftest/pngsuite-background/wrapper.html
+++ b/system/image/test/reftest/pngsuite-background/wrapper.html
diff --git a/image/test/reftest/pngsuite-basic-i/basi0g01.html b/system/image/test/reftest/pngsuite-basic-i/basi0g01.html
index 7389a1b66..7389a1b66 100644
--- a/image/test/reftest/pngsuite-basic-i/basi0g01.html
+++ b/system/image/test/reftest/pngsuite-basic-i/basi0g01.html
diff --git a/image/test/reftest/pngsuite-basic-i/basi0g01.png b/system/image/test/reftest/pngsuite-basic-i/basi0g01.png
index 556fa7270..556fa7270 100644
--- a/image/test/reftest/pngsuite-basic-i/basi0g01.png
+++ b/system/image/test/reftest/pngsuite-basic-i/basi0g01.png
diff --git a/image/test/reftest/pngsuite-basic-i/basi0g02.html b/system/image/test/reftest/pngsuite-basic-i/basi0g02.html
index 538afad14..538afad14 100644
--- a/image/test/reftest/pngsuite-basic-i/basi0g02.html
+++ b/system/image/test/reftest/pngsuite-basic-i/basi0g02.html
diff --git a/image/test/reftest/pngsuite-basic-i/basi0g02.png b/system/image/test/reftest/pngsuite-basic-i/basi0g02.png
index ce09821ef..ce09821ef 100644
--- a/image/test/reftest/pngsuite-basic-i/basi0g02.png
+++ b/system/image/test/reftest/pngsuite-basic-i/basi0g02.png
diff --git a/image/test/reftest/pngsuite-basic-i/basi0g04.html b/system/image/test/reftest/pngsuite-basic-i/basi0g04.html
index d782230d4..d782230d4 100644
--- a/image/test/reftest/pngsuite-basic-i/basi0g04.html
+++ b/system/image/test/reftest/pngsuite-basic-i/basi0g04.html
diff --git a/image/test/reftest/pngsuite-basic-i/basi0g04.png b/system/image/test/reftest/pngsuite-basic-i/basi0g04.png
index 3853273f9..3853273f9 100644
--- a/image/test/reftest/pngsuite-basic-i/basi0g04.png
+++ b/system/image/test/reftest/pngsuite-basic-i/basi0g04.png
diff --git a/image/test/reftest/pngsuite-basic-i/basi0g08.html b/system/image/test/reftest/pngsuite-basic-i/basi0g08.html
index 5aaf11cab..5aaf11cab 100644
--- a/image/test/reftest/pngsuite-basic-i/basi0g08.html
+++ b/system/image/test/reftest/pngsuite-basic-i/basi0g08.html
diff --git a/image/test/reftest/pngsuite-basic-i/basi0g08.png b/system/image/test/reftest/pngsuite-basic-i/basi0g08.png
index faed8bec4..faed8bec4 100644
--- a/image/test/reftest/pngsuite-basic-i/basi0g08.png
+++ b/system/image/test/reftest/pngsuite-basic-i/basi0g08.png
diff --git a/image/test/reftest/pngsuite-basic-i/basi0g16.html b/system/image/test/reftest/pngsuite-basic-i/basi0g16.html
index fc18c727b..fc18c727b 100644
--- a/image/test/reftest/pngsuite-basic-i/basi0g16.html
+++ b/system/image/test/reftest/pngsuite-basic-i/basi0g16.html
diff --git a/image/test/reftest/pngsuite-basic-i/basi0g16.png b/system/image/test/reftest/pngsuite-basic-i/basi0g16.png
index a9f28165e..a9f28165e 100644
--- a/image/test/reftest/pngsuite-basic-i/basi0g16.png
+++ b/system/image/test/reftest/pngsuite-basic-i/basi0g16.png
diff --git a/image/test/reftest/pngsuite-basic-i/basi2c08.html b/system/image/test/reftest/pngsuite-basic-i/basi2c08.html
index e30216bdf..e30216bdf 100644
--- a/image/test/reftest/pngsuite-basic-i/basi2c08.html
+++ b/system/image/test/reftest/pngsuite-basic-i/basi2c08.html
diff --git a/image/test/reftest/pngsuite-basic-i/basi2c08.png b/system/image/test/reftest/pngsuite-basic-i/basi2c08.png
index 2aab44d42..2aab44d42 100644
--- a/image/test/reftest/pngsuite-basic-i/basi2c08.png
+++ b/system/image/test/reftest/pngsuite-basic-i/basi2c08.png
diff --git a/image/test/reftest/pngsuite-basic-i/basi2c16.html b/system/image/test/reftest/pngsuite-basic-i/basi2c16.html
index dd08f0e3d..dd08f0e3d 100644
--- a/image/test/reftest/pngsuite-basic-i/basi2c16.html
+++ b/system/image/test/reftest/pngsuite-basic-i/basi2c16.html
diff --git a/image/test/reftest/pngsuite-basic-i/basi2c16.png b/system/image/test/reftest/pngsuite-basic-i/basi2c16.png
index cd7e50f91..cd7e50f91 100644
--- a/image/test/reftest/pngsuite-basic-i/basi2c16.png
+++ b/system/image/test/reftest/pngsuite-basic-i/basi2c16.png
diff --git a/image/test/reftest/pngsuite-basic-i/basi3p01.html b/system/image/test/reftest/pngsuite-basic-i/basi3p01.html
index 2cb512200..2cb512200 100644
--- a/image/test/reftest/pngsuite-basic-i/basi3p01.html
+++ b/system/image/test/reftest/pngsuite-basic-i/basi3p01.html
diff --git a/image/test/reftest/pngsuite-basic-i/basi3p01.png b/system/image/test/reftest/pngsuite-basic-i/basi3p01.png
index 00a7cea6c..00a7cea6c 100644
--- a/image/test/reftest/pngsuite-basic-i/basi3p01.png
+++ b/system/image/test/reftest/pngsuite-basic-i/basi3p01.png
diff --git a/image/test/reftest/pngsuite-basic-i/basi3p02.html b/system/image/test/reftest/pngsuite-basic-i/basi3p02.html
index 4555fbb9b..4555fbb9b 100644
--- a/image/test/reftest/pngsuite-basic-i/basi3p02.html
+++ b/system/image/test/reftest/pngsuite-basic-i/basi3p02.html
diff --git a/image/test/reftest/pngsuite-basic-i/basi3p02.png b/system/image/test/reftest/pngsuite-basic-i/basi3p02.png
index bb16b44b3..bb16b44b3 100644
--- a/image/test/reftest/pngsuite-basic-i/basi3p02.png
+++ b/system/image/test/reftest/pngsuite-basic-i/basi3p02.png
diff --git a/image/test/reftest/pngsuite-basic-i/basi3p04.html b/system/image/test/reftest/pngsuite-basic-i/basi3p04.html
index dc2a121de..dc2a121de 100644
--- a/image/test/reftest/pngsuite-basic-i/basi3p04.html
+++ b/system/image/test/reftest/pngsuite-basic-i/basi3p04.html
diff --git a/image/test/reftest/pngsuite-basic-i/basi3p04.png b/system/image/test/reftest/pngsuite-basic-i/basi3p04.png
index b4e888e24..b4e888e24 100644
--- a/image/test/reftest/pngsuite-basic-i/basi3p04.png
+++ b/system/image/test/reftest/pngsuite-basic-i/basi3p04.png
diff --git a/image/test/reftest/pngsuite-basic-i/basi3p08.html b/system/image/test/reftest/pngsuite-basic-i/basi3p08.html
index 78b72c61c..78b72c61c 100644
--- a/image/test/reftest/pngsuite-basic-i/basi3p08.html
+++ b/system/image/test/reftest/pngsuite-basic-i/basi3p08.html
diff --git a/image/test/reftest/pngsuite-basic-i/basi3p08.png b/system/image/test/reftest/pngsuite-basic-i/basi3p08.png
index 50a6d1cac..50a6d1cac 100644
--- a/image/test/reftest/pngsuite-basic-i/basi3p08.png
+++ b/system/image/test/reftest/pngsuite-basic-i/basi3p08.png
diff --git a/image/test/reftest/pngsuite-basic-i/basi4a08.png b/system/image/test/reftest/pngsuite-basic-i/basi4a08.png
index 398132be5..398132be5 100644
--- a/image/test/reftest/pngsuite-basic-i/basi4a08.png
+++ b/system/image/test/reftest/pngsuite-basic-i/basi4a08.png
diff --git a/image/test/reftest/pngsuite-basic-i/basi4a16.png b/system/image/test/reftest/pngsuite-basic-i/basi4a16.png
index 51192e731..51192e731 100644
--- a/image/test/reftest/pngsuite-basic-i/basi4a16.png
+++ b/system/image/test/reftest/pngsuite-basic-i/basi4a16.png
diff --git a/image/test/reftest/pngsuite-basic-i/basi6a08.png b/system/image/test/reftest/pngsuite-basic-i/basi6a08.png
index aecb32e0d..aecb32e0d 100644
--- a/image/test/reftest/pngsuite-basic-i/basi6a08.png
+++ b/system/image/test/reftest/pngsuite-basic-i/basi6a08.png
diff --git a/image/test/reftest/pngsuite-basic-i/basi6a16.png b/system/image/test/reftest/pngsuite-basic-i/basi6a16.png
index 4181533ad..4181533ad 100644
--- a/image/test/reftest/pngsuite-basic-i/basi6a16.png
+++ b/system/image/test/reftest/pngsuite-basic-i/basi6a16.png
diff --git a/image/test/reftest/pngsuite-basic-i/reftest-stylo.list b/system/image/test/reftest/pngsuite-basic-i/reftest-stylo.list
index cef5dbc6c..cef5dbc6c 100644
--- a/image/test/reftest/pngsuite-basic-i/reftest-stylo.list
+++ b/system/image/test/reftest/pngsuite-basic-i/reftest-stylo.list
diff --git a/image/test/reftest/pngsuite-basic-i/reftest.list b/system/image/test/reftest/pngsuite-basic-i/reftest.list
index bc61af89d..bc61af89d 100644
--- a/image/test/reftest/pngsuite-basic-i/reftest.list
+++ b/system/image/test/reftest/pngsuite-basic-i/reftest.list
diff --git a/image/test/reftest/pngsuite-basic-n/basn0g01.html b/system/image/test/reftest/pngsuite-basic-n/basn0g01.html
index 7389a1b66..7389a1b66 100644
--- a/image/test/reftest/pngsuite-basic-n/basn0g01.html
+++ b/system/image/test/reftest/pngsuite-basic-n/basn0g01.html
diff --git a/image/test/reftest/pngsuite-basic-n/basn0g01.png b/system/image/test/reftest/pngsuite-basic-n/basn0g01.png
index 1d722423a..1d722423a 100644
--- a/image/test/reftest/pngsuite-basic-n/basn0g01.png
+++ b/system/image/test/reftest/pngsuite-basic-n/basn0g01.png
diff --git a/image/test/reftest/pngsuite-basic-n/basn0g02.html b/system/image/test/reftest/pngsuite-basic-n/basn0g02.html
index 538afad14..538afad14 100644
--- a/image/test/reftest/pngsuite-basic-n/basn0g02.html
+++ b/system/image/test/reftest/pngsuite-basic-n/basn0g02.html
diff --git a/image/test/reftest/pngsuite-basic-n/basn0g02.png b/system/image/test/reftest/pngsuite-basic-n/basn0g02.png
index 508332418..508332418 100644
--- a/image/test/reftest/pngsuite-basic-n/basn0g02.png
+++ b/system/image/test/reftest/pngsuite-basic-n/basn0g02.png
diff --git a/image/test/reftest/pngsuite-basic-n/basn0g04.html b/system/image/test/reftest/pngsuite-basic-n/basn0g04.html
index d782230d4..d782230d4 100644
--- a/image/test/reftest/pngsuite-basic-n/basn0g04.html
+++ b/system/image/test/reftest/pngsuite-basic-n/basn0g04.html
diff --git a/image/test/reftest/pngsuite-basic-n/basn0g04.png b/system/image/test/reftest/pngsuite-basic-n/basn0g04.png
index 0bf368786..0bf368786 100644
--- a/image/test/reftest/pngsuite-basic-n/basn0g04.png
+++ b/system/image/test/reftest/pngsuite-basic-n/basn0g04.png
diff --git a/image/test/reftest/pngsuite-basic-n/basn0g08.html b/system/image/test/reftest/pngsuite-basic-n/basn0g08.html
index 5aaf11cab..5aaf11cab 100644
--- a/image/test/reftest/pngsuite-basic-n/basn0g08.html
+++ b/system/image/test/reftest/pngsuite-basic-n/basn0g08.html
diff --git a/image/test/reftest/pngsuite-basic-n/basn0g08.png b/system/image/test/reftest/pngsuite-basic-n/basn0g08.png
index 23c82379a..23c82379a 100644
--- a/image/test/reftest/pngsuite-basic-n/basn0g08.png
+++ b/system/image/test/reftest/pngsuite-basic-n/basn0g08.png
diff --git a/image/test/reftest/pngsuite-basic-n/basn0g16.html b/system/image/test/reftest/pngsuite-basic-n/basn0g16.html
index fc18c727b..fc18c727b 100644
--- a/image/test/reftest/pngsuite-basic-n/basn0g16.html
+++ b/system/image/test/reftest/pngsuite-basic-n/basn0g16.html
diff --git a/image/test/reftest/pngsuite-basic-n/basn0g16.png b/system/image/test/reftest/pngsuite-basic-n/basn0g16.png
index e7c82f78e..e7c82f78e 100644
--- a/image/test/reftest/pngsuite-basic-n/basn0g16.png
+++ b/system/image/test/reftest/pngsuite-basic-n/basn0g16.png
diff --git a/image/test/reftest/pngsuite-basic-n/basn2c08.html b/system/image/test/reftest/pngsuite-basic-n/basn2c08.html
index e30216bdf..e30216bdf 100644
--- a/image/test/reftest/pngsuite-basic-n/basn2c08.html
+++ b/system/image/test/reftest/pngsuite-basic-n/basn2c08.html
diff --git a/image/test/reftest/pngsuite-basic-n/basn2c08.png b/system/image/test/reftest/pngsuite-basic-n/basn2c08.png
index db5ad1586..db5ad1586 100644
--- a/image/test/reftest/pngsuite-basic-n/basn2c08.png
+++ b/system/image/test/reftest/pngsuite-basic-n/basn2c08.png
diff --git a/image/test/reftest/pngsuite-basic-n/basn2c16.html b/system/image/test/reftest/pngsuite-basic-n/basn2c16.html
index dd08f0e3d..dd08f0e3d 100644
--- a/image/test/reftest/pngsuite-basic-n/basn2c16.html
+++ b/system/image/test/reftest/pngsuite-basic-n/basn2c16.html
diff --git a/image/test/reftest/pngsuite-basic-n/basn2c16.png b/system/image/test/reftest/pngsuite-basic-n/basn2c16.png
index 50c1cb91a..50c1cb91a 100644
--- a/image/test/reftest/pngsuite-basic-n/basn2c16.png
+++ b/system/image/test/reftest/pngsuite-basic-n/basn2c16.png
diff --git a/image/test/reftest/pngsuite-basic-n/basn3p01.html b/system/image/test/reftest/pngsuite-basic-n/basn3p01.html
index 2cb512200..2cb512200 100644
--- a/image/test/reftest/pngsuite-basic-n/basn3p01.html
+++ b/system/image/test/reftest/pngsuite-basic-n/basn3p01.html
diff --git a/image/test/reftest/pngsuite-basic-n/basn3p01.png b/system/image/test/reftest/pngsuite-basic-n/basn3p01.png
index b145c2b8e..b145c2b8e 100644
--- a/image/test/reftest/pngsuite-basic-n/basn3p01.png
+++ b/system/image/test/reftest/pngsuite-basic-n/basn3p01.png
diff --git a/image/test/reftest/pngsuite-basic-n/basn3p02.html b/system/image/test/reftest/pngsuite-basic-n/basn3p02.html
index 4555fbb9b..4555fbb9b 100644
--- a/image/test/reftest/pngsuite-basic-n/basn3p02.html
+++ b/system/image/test/reftest/pngsuite-basic-n/basn3p02.html
diff --git a/image/test/reftest/pngsuite-basic-n/basn3p02.png b/system/image/test/reftest/pngsuite-basic-n/basn3p02.png
index 8985b3d81..8985b3d81 100644
--- a/image/test/reftest/pngsuite-basic-n/basn3p02.png
+++ b/system/image/test/reftest/pngsuite-basic-n/basn3p02.png
diff --git a/image/test/reftest/pngsuite-basic-n/basn3p04.html b/system/image/test/reftest/pngsuite-basic-n/basn3p04.html
index dc2a121de..dc2a121de 100644
--- a/image/test/reftest/pngsuite-basic-n/basn3p04.html
+++ b/system/image/test/reftest/pngsuite-basic-n/basn3p04.html
diff --git a/image/test/reftest/pngsuite-basic-n/basn3p04.png b/system/image/test/reftest/pngsuite-basic-n/basn3p04.png
index 0fbf9e827..0fbf9e827 100644
--- a/image/test/reftest/pngsuite-basic-n/basn3p04.png
+++ b/system/image/test/reftest/pngsuite-basic-n/basn3p04.png
diff --git a/image/test/reftest/pngsuite-basic-n/basn3p08.html b/system/image/test/reftest/pngsuite-basic-n/basn3p08.html
index 78b72c61c..78b72c61c 100644
--- a/image/test/reftest/pngsuite-basic-n/basn3p08.html
+++ b/system/image/test/reftest/pngsuite-basic-n/basn3p08.html
diff --git a/image/test/reftest/pngsuite-basic-n/basn3p08.png b/system/image/test/reftest/pngsuite-basic-n/basn3p08.png
index 0ddad07e5..0ddad07e5 100644
--- a/image/test/reftest/pngsuite-basic-n/basn3p08.png
+++ b/system/image/test/reftest/pngsuite-basic-n/basn3p08.png
diff --git a/image/test/reftest/pngsuite-basic-n/basn4a08.png b/system/image/test/reftest/pngsuite-basic-n/basn4a08.png
index 3e1305220..3e1305220 100644
--- a/image/test/reftest/pngsuite-basic-n/basn4a08.png
+++ b/system/image/test/reftest/pngsuite-basic-n/basn4a08.png
diff --git a/image/test/reftest/pngsuite-basic-n/basn4a16.png b/system/image/test/reftest/pngsuite-basic-n/basn4a16.png
index 8243644d0..8243644d0 100644
--- a/image/test/reftest/pngsuite-basic-n/basn4a16.png
+++ b/system/image/test/reftest/pngsuite-basic-n/basn4a16.png
diff --git a/image/test/reftest/pngsuite-basic-n/basn6a08.png b/system/image/test/reftest/pngsuite-basic-n/basn6a08.png
index e60873876..e60873876 100644
--- a/image/test/reftest/pngsuite-basic-n/basn6a08.png
+++ b/system/image/test/reftest/pngsuite-basic-n/basn6a08.png
diff --git a/image/test/reftest/pngsuite-basic-n/basn6a16.png b/system/image/test/reftest/pngsuite-basic-n/basn6a16.png
index 984a99525..984a99525 100644
--- a/image/test/reftest/pngsuite-basic-n/basn6a16.png
+++ b/system/image/test/reftest/pngsuite-basic-n/basn6a16.png
diff --git a/image/test/reftest/pngsuite-basic-n/reftest-stylo.list b/system/image/test/reftest/pngsuite-basic-n/reftest-stylo.list
index a4f594645..a4f594645 100644
--- a/image/test/reftest/pngsuite-basic-n/reftest-stylo.list
+++ b/system/image/test/reftest/pngsuite-basic-n/reftest-stylo.list
diff --git a/image/test/reftest/pngsuite-basic-n/reftest.list b/system/image/test/reftest/pngsuite-basic-n/reftest.list
index c59a5a7e4..c59a5a7e4 100644
--- a/image/test/reftest/pngsuite-basic-n/reftest.list
+++ b/system/image/test/reftest/pngsuite-basic-n/reftest.list
diff --git a/image/test/reftest/pngsuite-chunkorder/color.html b/system/image/test/reftest/pngsuite-chunkorder/color.html
index dd08f0e3d..dd08f0e3d 100644
--- a/image/test/reftest/pngsuite-chunkorder/color.html
+++ b/system/image/test/reftest/pngsuite-chunkorder/color.html
diff --git a/image/test/reftest/pngsuite-chunkorder/grayscale.html b/system/image/test/reftest/pngsuite-chunkorder/grayscale.html
index fc18c727b..fc18c727b 100644
--- a/image/test/reftest/pngsuite-chunkorder/grayscale.html
+++ b/system/image/test/reftest/pngsuite-chunkorder/grayscale.html
diff --git a/image/test/reftest/pngsuite-chunkorder/oi1n0g16.png b/system/image/test/reftest/pngsuite-chunkorder/oi1n0g16.png
index e7c82f78e..e7c82f78e 100644
--- a/image/test/reftest/pngsuite-chunkorder/oi1n0g16.png
+++ b/system/image/test/reftest/pngsuite-chunkorder/oi1n0g16.png
diff --git a/image/test/reftest/pngsuite-chunkorder/oi1n2c16.png b/system/image/test/reftest/pngsuite-chunkorder/oi1n2c16.png
index 50c1cb91a..50c1cb91a 100644
--- a/image/test/reftest/pngsuite-chunkorder/oi1n2c16.png
+++ b/system/image/test/reftest/pngsuite-chunkorder/oi1n2c16.png
diff --git a/image/test/reftest/pngsuite-chunkorder/oi2n0g16.png b/system/image/test/reftest/pngsuite-chunkorder/oi2n0g16.png
index 14d64c583..14d64c583 100644
--- a/image/test/reftest/pngsuite-chunkorder/oi2n0g16.png
+++ b/system/image/test/reftest/pngsuite-chunkorder/oi2n0g16.png
diff --git a/image/test/reftest/pngsuite-chunkorder/oi2n2c16.png b/system/image/test/reftest/pngsuite-chunkorder/oi2n2c16.png
index 4c2e3e335..4c2e3e335 100644
--- a/image/test/reftest/pngsuite-chunkorder/oi2n2c16.png
+++ b/system/image/test/reftest/pngsuite-chunkorder/oi2n2c16.png
diff --git a/image/test/reftest/pngsuite-chunkorder/oi4n0g16.png b/system/image/test/reftest/pngsuite-chunkorder/oi4n0g16.png
index 69e73ede3..69e73ede3 100644
--- a/image/test/reftest/pngsuite-chunkorder/oi4n0g16.png
+++ b/system/image/test/reftest/pngsuite-chunkorder/oi4n0g16.png
diff --git a/image/test/reftest/pngsuite-chunkorder/oi4n2c16.png b/system/image/test/reftest/pngsuite-chunkorder/oi4n2c16.png
index 93691e373..93691e373 100644
--- a/image/test/reftest/pngsuite-chunkorder/oi4n2c16.png
+++ b/system/image/test/reftest/pngsuite-chunkorder/oi4n2c16.png
diff --git a/image/test/reftest/pngsuite-chunkorder/oi9n0g16.png b/system/image/test/reftest/pngsuite-chunkorder/oi9n0g16.png
index 924841357..924841357 100644
--- a/image/test/reftest/pngsuite-chunkorder/oi9n0g16.png
+++ b/system/image/test/reftest/pngsuite-chunkorder/oi9n0g16.png
diff --git a/image/test/reftest/pngsuite-chunkorder/oi9n2c16.png b/system/image/test/reftest/pngsuite-chunkorder/oi9n2c16.png
index f0512e49f..f0512e49f 100644
--- a/image/test/reftest/pngsuite-chunkorder/oi9n2c16.png
+++ b/system/image/test/reftest/pngsuite-chunkorder/oi9n2c16.png
diff --git a/image/test/reftest/pngsuite-chunkorder/reftest-stylo.list b/system/image/test/reftest/pngsuite-chunkorder/reftest-stylo.list
index 57415ac0e..57415ac0e 100644
--- a/image/test/reftest/pngsuite-chunkorder/reftest-stylo.list
+++ b/system/image/test/reftest/pngsuite-chunkorder/reftest-stylo.list
diff --git a/image/test/reftest/pngsuite-chunkorder/reftest.list b/system/image/test/reftest/pngsuite-chunkorder/reftest.list
index 2e161d0d3..2e161d0d3 100644
--- a/image/test/reftest/pngsuite-chunkorder/reftest.list
+++ b/system/image/test/reftest/pngsuite-chunkorder/reftest.list
diff --git a/image/test/reftest/pngsuite-corrupted/reftest-stylo.list b/system/image/test/reftest/pngsuite-corrupted/reftest-stylo.list
index ed4baead8..ed4baead8 100644
--- a/image/test/reftest/pngsuite-corrupted/reftest-stylo.list
+++ b/system/image/test/reftest/pngsuite-corrupted/reftest-stylo.list
diff --git a/image/test/reftest/pngsuite-corrupted/reftest.list b/system/image/test/reftest/pngsuite-corrupted/reftest.list
index 86c5880f2..86c5880f2 100644
--- a/image/test/reftest/pngsuite-corrupted/reftest.list
+++ b/system/image/test/reftest/pngsuite-corrupted/reftest.list
diff --git a/image/test/reftest/pngsuite-corrupted/wrapper.html b/system/image/test/reftest/pngsuite-corrupted/wrapper.html
index 45b516775..45b516775 100644
--- a/image/test/reftest/pngsuite-corrupted/wrapper.html
+++ b/system/image/test/reftest/pngsuite-corrupted/wrapper.html
diff --git a/image/test/reftest/pngsuite-corrupted/x00n0g01.png b/system/image/test/reftest/pngsuite-corrupted/x00n0g01.png
index db3a5fda7..db3a5fda7 100644
--- a/image/test/reftest/pngsuite-corrupted/x00n0g01.png
+++ b/system/image/test/reftest/pngsuite-corrupted/x00n0g01.png
diff --git a/image/test/reftest/pngsuite-corrupted/xcrn0g04.png b/system/image/test/reftest/pngsuite-corrupted/xcrn0g04.png
index 5bce9f3ad..5bce9f3ad 100644
--- a/image/test/reftest/pngsuite-corrupted/xcrn0g04.png
+++ b/system/image/test/reftest/pngsuite-corrupted/xcrn0g04.png
diff --git a/image/test/reftest/pngsuite-corrupted/xlfn0g04.png b/system/image/test/reftest/pngsuite-corrupted/xlfn0g04.png
index 1fd104ba6..1fd104ba6 100644
--- a/image/test/reftest/pngsuite-corrupted/xlfn0g04.png
+++ b/system/image/test/reftest/pngsuite-corrupted/xlfn0g04.png
diff --git a/image/test/reftest/pngsuite-filtering/f00n0g08.html b/system/image/test/reftest/pngsuite-filtering/f00n0g08.html
index 3df624891..3df624891 100644
--- a/image/test/reftest/pngsuite-filtering/f00n0g08.html
+++ b/system/image/test/reftest/pngsuite-filtering/f00n0g08.html
diff --git a/image/test/reftest/pngsuite-filtering/f00n0g08.png b/system/image/test/reftest/pngsuite-filtering/f00n0g08.png
index 45a007596..45a007596 100644
--- a/image/test/reftest/pngsuite-filtering/f00n0g08.png
+++ b/system/image/test/reftest/pngsuite-filtering/f00n0g08.png
diff --git a/image/test/reftest/pngsuite-filtering/f00n2c08.html b/system/image/test/reftest/pngsuite-filtering/f00n2c08.html
index 2e5f1e186..2e5f1e186 100644
--- a/image/test/reftest/pngsuite-filtering/f00n2c08.html
+++ b/system/image/test/reftest/pngsuite-filtering/f00n2c08.html
diff --git a/image/test/reftest/pngsuite-filtering/f00n2c08.png b/system/image/test/reftest/pngsuite-filtering/f00n2c08.png
index d6a1ffff6..d6a1ffff6 100644
--- a/image/test/reftest/pngsuite-filtering/f00n2c08.png
+++ b/system/image/test/reftest/pngsuite-filtering/f00n2c08.png
diff --git a/image/test/reftest/pngsuite-filtering/f01n0g08.html b/system/image/test/reftest/pngsuite-filtering/f01n0g08.html
index 2e056ecb9..2e056ecb9 100644
--- a/image/test/reftest/pngsuite-filtering/f01n0g08.html
+++ b/system/image/test/reftest/pngsuite-filtering/f01n0g08.html
diff --git a/image/test/reftest/pngsuite-filtering/f01n0g08.png b/system/image/test/reftest/pngsuite-filtering/f01n0g08.png
index 4a1107b46..4a1107b46 100644
--- a/image/test/reftest/pngsuite-filtering/f01n0g08.png
+++ b/system/image/test/reftest/pngsuite-filtering/f01n0g08.png
diff --git a/image/test/reftest/pngsuite-filtering/f01n2c08.html b/system/image/test/reftest/pngsuite-filtering/f01n2c08.html
index 25c4fe044..25c4fe044 100644
--- a/image/test/reftest/pngsuite-filtering/f01n2c08.html
+++ b/system/image/test/reftest/pngsuite-filtering/f01n2c08.html
diff --git a/image/test/reftest/pngsuite-filtering/f01n2c08.png b/system/image/test/reftest/pngsuite-filtering/f01n2c08.png
index 26fee958c..26fee958c 100644
--- a/image/test/reftest/pngsuite-filtering/f01n2c08.png
+++ b/system/image/test/reftest/pngsuite-filtering/f01n2c08.png
diff --git a/image/test/reftest/pngsuite-filtering/f02n0g08.html b/system/image/test/reftest/pngsuite-filtering/f02n0g08.html
index c9a6263f4..c9a6263f4 100644
--- a/image/test/reftest/pngsuite-filtering/f02n0g08.html
+++ b/system/image/test/reftest/pngsuite-filtering/f02n0g08.html
diff --git a/image/test/reftest/pngsuite-filtering/f02n0g08.png b/system/image/test/reftest/pngsuite-filtering/f02n0g08.png
index bfe410c5e..bfe410c5e 100644
--- a/image/test/reftest/pngsuite-filtering/f02n0g08.png
+++ b/system/image/test/reftest/pngsuite-filtering/f02n0g08.png
diff --git a/image/test/reftest/pngsuite-filtering/f02n2c08.html b/system/image/test/reftest/pngsuite-filtering/f02n2c08.html
index 051691ab9..051691ab9 100644
--- a/image/test/reftest/pngsuite-filtering/f02n2c08.html
+++ b/system/image/test/reftest/pngsuite-filtering/f02n2c08.html
diff --git a/image/test/reftest/pngsuite-filtering/f02n2c08.png b/system/image/test/reftest/pngsuite-filtering/f02n2c08.png
index e590f1234..e590f1234 100644
--- a/image/test/reftest/pngsuite-filtering/f02n2c08.png
+++ b/system/image/test/reftest/pngsuite-filtering/f02n2c08.png
diff --git a/image/test/reftest/pngsuite-filtering/f03n0g08.html b/system/image/test/reftest/pngsuite-filtering/f03n0g08.html
index f40bbe51b..f40bbe51b 100644
--- a/image/test/reftest/pngsuite-filtering/f03n0g08.html
+++ b/system/image/test/reftest/pngsuite-filtering/f03n0g08.html
diff --git a/image/test/reftest/pngsuite-filtering/f03n0g08.png b/system/image/test/reftest/pngsuite-filtering/f03n0g08.png
index ed01e2923..ed01e2923 100644
--- a/image/test/reftest/pngsuite-filtering/f03n0g08.png
+++ b/system/image/test/reftest/pngsuite-filtering/f03n0g08.png
diff --git a/image/test/reftest/pngsuite-filtering/f03n2c08.html b/system/image/test/reftest/pngsuite-filtering/f03n2c08.html
index 3d3c85e6c..3d3c85e6c 100644
--- a/image/test/reftest/pngsuite-filtering/f03n2c08.html
+++ b/system/image/test/reftest/pngsuite-filtering/f03n2c08.html
diff --git a/image/test/reftest/pngsuite-filtering/f03n2c08.png b/system/image/test/reftest/pngsuite-filtering/f03n2c08.png
index 758115059..758115059 100644
--- a/image/test/reftest/pngsuite-filtering/f03n2c08.png
+++ b/system/image/test/reftest/pngsuite-filtering/f03n2c08.png
diff --git a/image/test/reftest/pngsuite-filtering/f04n0g08.html b/system/image/test/reftest/pngsuite-filtering/f04n0g08.html
index 3c7ce550b..3c7ce550b 100644
--- a/image/test/reftest/pngsuite-filtering/f04n0g08.html
+++ b/system/image/test/reftest/pngsuite-filtering/f04n0g08.html
diff --git a/image/test/reftest/pngsuite-filtering/f04n0g08.png b/system/image/test/reftest/pngsuite-filtering/f04n0g08.png
index 663fdae3e..663fdae3e 100644
--- a/image/test/reftest/pngsuite-filtering/f04n0g08.png
+++ b/system/image/test/reftest/pngsuite-filtering/f04n0g08.png
diff --git a/image/test/reftest/pngsuite-filtering/f04n2c08.html b/system/image/test/reftest/pngsuite-filtering/f04n2c08.html
index 77c90face..77c90face 100644
--- a/image/test/reftest/pngsuite-filtering/f04n2c08.html
+++ b/system/image/test/reftest/pngsuite-filtering/f04n2c08.html
diff --git a/image/test/reftest/pngsuite-filtering/f04n2c08.png b/system/image/test/reftest/pngsuite-filtering/f04n2c08.png
index 3c8b5116e..3c8b5116e 100644
--- a/image/test/reftest/pngsuite-filtering/f04n2c08.png
+++ b/system/image/test/reftest/pngsuite-filtering/f04n2c08.png
diff --git a/image/test/reftest/pngsuite-filtering/reftest-stylo.list b/system/image/test/reftest/pngsuite-filtering/reftest-stylo.list
index d69ff484e..d69ff484e 100644
--- a/image/test/reftest/pngsuite-filtering/reftest-stylo.list
+++ b/system/image/test/reftest/pngsuite-filtering/reftest-stylo.list
diff --git a/image/test/reftest/pngsuite-filtering/reftest.list b/system/image/test/reftest/pngsuite-filtering/reftest.list
index 81b4ac5f3..81b4ac5f3 100644
--- a/image/test/reftest/pngsuite-filtering/reftest.list
+++ b/system/image/test/reftest/pngsuite-filtering/reftest.list
diff --git a/image/test/reftest/pngsuite-gamma/g03n0g16.html b/system/image/test/reftest/pngsuite-gamma/g03n0g16.html
index dc15a536b..dc15a536b 100644
--- a/image/test/reftest/pngsuite-gamma/g03n0g16.html
+++ b/system/image/test/reftest/pngsuite-gamma/g03n0g16.html
diff --git a/image/test/reftest/pngsuite-gamma/g03n0g16.png b/system/image/test/reftest/pngsuite-gamma/g03n0g16.png
index 41083ca80..41083ca80 100644
--- a/image/test/reftest/pngsuite-gamma/g03n0g16.png
+++ b/system/image/test/reftest/pngsuite-gamma/g03n0g16.png
diff --git a/image/test/reftest/pngsuite-gamma/g03n2c08.html b/system/image/test/reftest/pngsuite-gamma/g03n2c08.html
index c2d02beed..c2d02beed 100644
--- a/image/test/reftest/pngsuite-gamma/g03n2c08.html
+++ b/system/image/test/reftest/pngsuite-gamma/g03n2c08.html
diff --git a/image/test/reftest/pngsuite-gamma/g03n2c08.png b/system/image/test/reftest/pngsuite-gamma/g03n2c08.png
index a9354dbee..a9354dbee 100644
--- a/image/test/reftest/pngsuite-gamma/g03n2c08.png
+++ b/system/image/test/reftest/pngsuite-gamma/g03n2c08.png
diff --git a/image/test/reftest/pngsuite-gamma/g03n3p04.html b/system/image/test/reftest/pngsuite-gamma/g03n3p04.html
index efcf39f29..efcf39f29 100644
--- a/image/test/reftest/pngsuite-gamma/g03n3p04.html
+++ b/system/image/test/reftest/pngsuite-gamma/g03n3p04.html
diff --git a/image/test/reftest/pngsuite-gamma/g03n3p04.png b/system/image/test/reftest/pngsuite-gamma/g03n3p04.png
index 60396c95a..60396c95a 100644
--- a/image/test/reftest/pngsuite-gamma/g03n3p04.png
+++ b/system/image/test/reftest/pngsuite-gamma/g03n3p04.png
diff --git a/image/test/reftest/pngsuite-gamma/g04n0g16.html b/system/image/test/reftest/pngsuite-gamma/g04n0g16.html
index 5bec9867f..5bec9867f 100644
--- a/image/test/reftest/pngsuite-gamma/g04n0g16.html
+++ b/system/image/test/reftest/pngsuite-gamma/g04n0g16.html
diff --git a/image/test/reftest/pngsuite-gamma/g04n0g16.png b/system/image/test/reftest/pngsuite-gamma/g04n0g16.png
index 32395b76c..32395b76c 100644
--- a/image/test/reftest/pngsuite-gamma/g04n0g16.png
+++ b/system/image/test/reftest/pngsuite-gamma/g04n0g16.png
diff --git a/image/test/reftest/pngsuite-gamma/g04n2c08.html b/system/image/test/reftest/pngsuite-gamma/g04n2c08.html
index b3b0556c6..b3b0556c6 100644
--- a/image/test/reftest/pngsuite-gamma/g04n2c08.html
+++ b/system/image/test/reftest/pngsuite-gamma/g04n2c08.html
diff --git a/image/test/reftest/pngsuite-gamma/g04n2c08.png b/system/image/test/reftest/pngsuite-gamma/g04n2c08.png
index a652b0ce8..a652b0ce8 100644
--- a/image/test/reftest/pngsuite-gamma/g04n2c08.png
+++ b/system/image/test/reftest/pngsuite-gamma/g04n2c08.png
diff --git a/image/test/reftest/pngsuite-gamma/g04n3p04.html b/system/image/test/reftest/pngsuite-gamma/g04n3p04.html
index 337dcb49d..337dcb49d 100644
--- a/image/test/reftest/pngsuite-gamma/g04n3p04.html
+++ b/system/image/test/reftest/pngsuite-gamma/g04n3p04.html
diff --git a/image/test/reftest/pngsuite-gamma/g04n3p04.png b/system/image/test/reftest/pngsuite-gamma/g04n3p04.png
index 5661cc313..5661cc313 100644
--- a/image/test/reftest/pngsuite-gamma/g04n3p04.png
+++ b/system/image/test/reftest/pngsuite-gamma/g04n3p04.png
diff --git a/image/test/reftest/pngsuite-gamma/g05n0g16.html b/system/image/test/reftest/pngsuite-gamma/g05n0g16.html
index ab100e638..ab100e638 100644
--- a/image/test/reftest/pngsuite-gamma/g05n0g16.html
+++ b/system/image/test/reftest/pngsuite-gamma/g05n0g16.html
diff --git a/image/test/reftest/pngsuite-gamma/g05n0g16.png b/system/image/test/reftest/pngsuite-gamma/g05n0g16.png
index 70b37f01e..70b37f01e 100644
--- a/image/test/reftest/pngsuite-gamma/g05n0g16.png
+++ b/system/image/test/reftest/pngsuite-gamma/g05n0g16.png
diff --git a/image/test/reftest/pngsuite-gamma/g05n2c08.html b/system/image/test/reftest/pngsuite-gamma/g05n2c08.html
index 475ecd21d..475ecd21d 100644
--- a/image/test/reftest/pngsuite-gamma/g05n2c08.html
+++ b/system/image/test/reftest/pngsuite-gamma/g05n2c08.html
diff --git a/image/test/reftest/pngsuite-gamma/g05n2c08.png b/system/image/test/reftest/pngsuite-gamma/g05n2c08.png
index 932c13653..932c13653 100644
--- a/image/test/reftest/pngsuite-gamma/g05n2c08.png
+++ b/system/image/test/reftest/pngsuite-gamma/g05n2c08.png
diff --git a/image/test/reftest/pngsuite-gamma/g05n3p04.html b/system/image/test/reftest/pngsuite-gamma/g05n3p04.html
index d71689c29..d71689c29 100644
--- a/image/test/reftest/pngsuite-gamma/g05n3p04.html
+++ b/system/image/test/reftest/pngsuite-gamma/g05n3p04.html
diff --git a/image/test/reftest/pngsuite-gamma/g05n3p04.png b/system/image/test/reftest/pngsuite-gamma/g05n3p04.png
index 961993058..961993058 100644
--- a/image/test/reftest/pngsuite-gamma/g05n3p04.png
+++ b/system/image/test/reftest/pngsuite-gamma/g05n3p04.png
diff --git a/image/test/reftest/pngsuite-gamma/g07n0g16.html b/system/image/test/reftest/pngsuite-gamma/g07n0g16.html
index b9f1a1c3e..b9f1a1c3e 100644
--- a/image/test/reftest/pngsuite-gamma/g07n0g16.html
+++ b/system/image/test/reftest/pngsuite-gamma/g07n0g16.html
diff --git a/image/test/reftest/pngsuite-gamma/g07n0g16.png b/system/image/test/reftest/pngsuite-gamma/g07n0g16.png
index d6a47c2d5..d6a47c2d5 100644
--- a/image/test/reftest/pngsuite-gamma/g07n0g16.png
+++ b/system/image/test/reftest/pngsuite-gamma/g07n0g16.png
diff --git a/image/test/reftest/pngsuite-gamma/g07n2c08.html b/system/image/test/reftest/pngsuite-gamma/g07n2c08.html
index 0a5b63bf0..0a5b63bf0 100644
--- a/image/test/reftest/pngsuite-gamma/g07n2c08.html
+++ b/system/image/test/reftest/pngsuite-gamma/g07n2c08.html
diff --git a/image/test/reftest/pngsuite-gamma/g07n2c08.png b/system/image/test/reftest/pngsuite-gamma/g07n2c08.png
index 597346460..597346460 100644
--- a/image/test/reftest/pngsuite-gamma/g07n2c08.png
+++ b/system/image/test/reftest/pngsuite-gamma/g07n2c08.png
diff --git a/image/test/reftest/pngsuite-gamma/g07n3p04.html b/system/image/test/reftest/pngsuite-gamma/g07n3p04.html
index 7303ed0d7..7303ed0d7 100644
--- a/image/test/reftest/pngsuite-gamma/g07n3p04.html
+++ b/system/image/test/reftest/pngsuite-gamma/g07n3p04.html
diff --git a/image/test/reftest/pngsuite-gamma/g07n3p04.png b/system/image/test/reftest/pngsuite-gamma/g07n3p04.png
index c73fb6136..c73fb6136 100644
--- a/image/test/reftest/pngsuite-gamma/g07n3p04.png
+++ b/system/image/test/reftest/pngsuite-gamma/g07n3p04.png
diff --git a/image/test/reftest/pngsuite-gamma/g10n0g16.html b/system/image/test/reftest/pngsuite-gamma/g10n0g16.html
index 29301dd71..29301dd71 100644
--- a/image/test/reftest/pngsuite-gamma/g10n0g16.html
+++ b/system/image/test/reftest/pngsuite-gamma/g10n0g16.html
diff --git a/image/test/reftest/pngsuite-gamma/g10n0g16.png b/system/image/test/reftest/pngsuite-gamma/g10n0g16.png
index 85f2c958e..85f2c958e 100644
--- a/image/test/reftest/pngsuite-gamma/g10n0g16.png
+++ b/system/image/test/reftest/pngsuite-gamma/g10n0g16.png
diff --git a/image/test/reftest/pngsuite-gamma/g10n2c08.html b/system/image/test/reftest/pngsuite-gamma/g10n2c08.html
index 24e8637b7..24e8637b7 100644
--- a/image/test/reftest/pngsuite-gamma/g10n2c08.html
+++ b/system/image/test/reftest/pngsuite-gamma/g10n2c08.html
diff --git a/image/test/reftest/pngsuite-gamma/g10n2c08.png b/system/image/test/reftest/pngsuite-gamma/g10n2c08.png
index b3039970c..b3039970c 100644
--- a/image/test/reftest/pngsuite-gamma/g10n2c08.png
+++ b/system/image/test/reftest/pngsuite-gamma/g10n2c08.png
diff --git a/image/test/reftest/pngsuite-gamma/g10n3p04.html b/system/image/test/reftest/pngsuite-gamma/g10n3p04.html
index 7c25d439d..7c25d439d 100644
--- a/image/test/reftest/pngsuite-gamma/g10n3p04.html
+++ b/system/image/test/reftest/pngsuite-gamma/g10n3p04.html
diff --git a/image/test/reftest/pngsuite-gamma/g10n3p04.png b/system/image/test/reftest/pngsuite-gamma/g10n3p04.png
index 1b6a6be2c..1b6a6be2c 100644
--- a/image/test/reftest/pngsuite-gamma/g10n3p04.png
+++ b/system/image/test/reftest/pngsuite-gamma/g10n3p04.png
diff --git a/image/test/reftest/pngsuite-gamma/g25n0g16.html b/system/image/test/reftest/pngsuite-gamma/g25n0g16.html
index 7f3d84edf..7f3d84edf 100644
--- a/image/test/reftest/pngsuite-gamma/g25n0g16.html
+++ b/system/image/test/reftest/pngsuite-gamma/g25n0g16.html
diff --git a/image/test/reftest/pngsuite-gamma/g25n0g16.png b/system/image/test/reftest/pngsuite-gamma/g25n0g16.png
index a9f6787c7..a9f6787c7 100644
--- a/image/test/reftest/pngsuite-gamma/g25n0g16.png
+++ b/system/image/test/reftest/pngsuite-gamma/g25n0g16.png
diff --git a/image/test/reftest/pngsuite-gamma/g25n2c08.html b/system/image/test/reftest/pngsuite-gamma/g25n2c08.html
index 2476d2cc9..2476d2cc9 100644
--- a/image/test/reftest/pngsuite-gamma/g25n2c08.html
+++ b/system/image/test/reftest/pngsuite-gamma/g25n2c08.html
diff --git a/image/test/reftest/pngsuite-gamma/g25n2c08.png b/system/image/test/reftest/pngsuite-gamma/g25n2c08.png
index 03f505a64..03f505a64 100644
--- a/image/test/reftest/pngsuite-gamma/g25n2c08.png
+++ b/system/image/test/reftest/pngsuite-gamma/g25n2c08.png
diff --git a/image/test/reftest/pngsuite-gamma/g25n3p04.html b/system/image/test/reftest/pngsuite-gamma/g25n3p04.html
index 3cb0205be..3cb0205be 100644
--- a/image/test/reftest/pngsuite-gamma/g25n3p04.html
+++ b/system/image/test/reftest/pngsuite-gamma/g25n3p04.html
diff --git a/image/test/reftest/pngsuite-gamma/g25n3p04.png b/system/image/test/reftest/pngsuite-gamma/g25n3p04.png
index 4f943c617..4f943c617 100644
--- a/image/test/reftest/pngsuite-gamma/g25n3p04.png
+++ b/system/image/test/reftest/pngsuite-gamma/g25n3p04.png
diff --git a/image/test/reftest/pngsuite-gamma/reftest-stylo.list b/system/image/test/reftest/pngsuite-gamma/reftest-stylo.list
index 25439123a..25439123a 100644
--- a/image/test/reftest/pngsuite-gamma/reftest-stylo.list
+++ b/system/image/test/reftest/pngsuite-gamma/reftest-stylo.list
diff --git a/image/test/reftest/pngsuite-gamma/reftest.list b/system/image/test/reftest/pngsuite-gamma/reftest.list
index 1b5abdda7..1b5abdda7 100644
--- a/image/test/reftest/pngsuite-gamma/reftest.list
+++ b/system/image/test/reftest/pngsuite-gamma/reftest.list
diff --git a/image/test/reftest/pngsuite-oddsizes/reftest-stylo.list b/system/image/test/reftest/pngsuite-oddsizes/reftest-stylo.list
index 21254621c..21254621c 100644
--- a/image/test/reftest/pngsuite-oddsizes/reftest-stylo.list
+++ b/system/image/test/reftest/pngsuite-oddsizes/reftest-stylo.list
diff --git a/image/test/reftest/pngsuite-oddsizes/reftest.list b/system/image/test/reftest/pngsuite-oddsizes/reftest.list
index fa72e005b..fa72e005b 100644
--- a/image/test/reftest/pngsuite-oddsizes/reftest.list
+++ b/system/image/test/reftest/pngsuite-oddsizes/reftest.list
diff --git a/image/test/reftest/pngsuite-oddsizes/s01_3p01.html b/system/image/test/reftest/pngsuite-oddsizes/s01_3p01.html
index f38d98f1a..f38d98f1a 100644
--- a/image/test/reftest/pngsuite-oddsizes/s01_3p01.html
+++ b/system/image/test/reftest/pngsuite-oddsizes/s01_3p01.html
diff --git a/image/test/reftest/pngsuite-oddsizes/s01i3p01.png b/system/image/test/reftest/pngsuite-oddsizes/s01i3p01.png
index 6c0fad1fc..6c0fad1fc 100644
--- a/image/test/reftest/pngsuite-oddsizes/s01i3p01.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s01i3p01.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s01n3p01.png b/system/image/test/reftest/pngsuite-oddsizes/s01n3p01.png
index cb2c8c782..cb2c8c782 100644
--- a/image/test/reftest/pngsuite-oddsizes/s01n3p01.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s01n3p01.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s02_3p01.html b/system/image/test/reftest/pngsuite-oddsizes/s02_3p01.html
index ad4660a24..ad4660a24 100644
--- a/image/test/reftest/pngsuite-oddsizes/s02_3p01.html
+++ b/system/image/test/reftest/pngsuite-oddsizes/s02_3p01.html
diff --git a/image/test/reftest/pngsuite-oddsizes/s02i3p01.png b/system/image/test/reftest/pngsuite-oddsizes/s02i3p01.png
index 2defaed91..2defaed91 100644
--- a/image/test/reftest/pngsuite-oddsizes/s02i3p01.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s02i3p01.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s02n3p01.png b/system/image/test/reftest/pngsuite-oddsizes/s02n3p01.png
index 2b1b66964..2b1b66964 100644
--- a/image/test/reftest/pngsuite-oddsizes/s02n3p01.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s02n3p01.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s03_3p01.html b/system/image/test/reftest/pngsuite-oddsizes/s03_3p01.html
index adff34db3..adff34db3 100644
--- a/image/test/reftest/pngsuite-oddsizes/s03_3p01.html
+++ b/system/image/test/reftest/pngsuite-oddsizes/s03_3p01.html
diff --git a/image/test/reftest/pngsuite-oddsizes/s03i3p01.png b/system/image/test/reftest/pngsuite-oddsizes/s03i3p01.png
index c23fdc463..c23fdc463 100644
--- a/image/test/reftest/pngsuite-oddsizes/s03i3p01.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s03i3p01.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s03n3p01.png b/system/image/test/reftest/pngsuite-oddsizes/s03n3p01.png
index 6d96ee4f8..6d96ee4f8 100644
--- a/image/test/reftest/pngsuite-oddsizes/s03n3p01.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s03n3p01.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s04_3p01.html b/system/image/test/reftest/pngsuite-oddsizes/s04_3p01.html
index d97c2d42c..d97c2d42c 100644
--- a/image/test/reftest/pngsuite-oddsizes/s04_3p01.html
+++ b/system/image/test/reftest/pngsuite-oddsizes/s04_3p01.html
diff --git a/image/test/reftest/pngsuite-oddsizes/s04i3p01.png b/system/image/test/reftest/pngsuite-oddsizes/s04i3p01.png
index 0e710c2c3..0e710c2c3 100644
--- a/image/test/reftest/pngsuite-oddsizes/s04i3p01.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s04i3p01.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s04n3p01.png b/system/image/test/reftest/pngsuite-oddsizes/s04n3p01.png
index 956396c45..956396c45 100644
--- a/image/test/reftest/pngsuite-oddsizes/s04n3p01.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s04n3p01.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s05_3p02.html b/system/image/test/reftest/pngsuite-oddsizes/s05_3p02.html
index e5664fb9d..e5664fb9d 100644
--- a/image/test/reftest/pngsuite-oddsizes/s05_3p02.html
+++ b/system/image/test/reftest/pngsuite-oddsizes/s05_3p02.html
diff --git a/image/test/reftest/pngsuite-oddsizes/s05i3p02.png b/system/image/test/reftest/pngsuite-oddsizes/s05i3p02.png
index d14cbd351..d14cbd351 100644
--- a/image/test/reftest/pngsuite-oddsizes/s05i3p02.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s05i3p02.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s05n3p02.png b/system/image/test/reftest/pngsuite-oddsizes/s05n3p02.png
index bf940f057..bf940f057 100644
--- a/image/test/reftest/pngsuite-oddsizes/s05n3p02.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s05n3p02.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s06_3p02.html b/system/image/test/reftest/pngsuite-oddsizes/s06_3p02.html
index 6d13dc56f..6d13dc56f 100644
--- a/image/test/reftest/pngsuite-oddsizes/s06_3p02.html
+++ b/system/image/test/reftest/pngsuite-oddsizes/s06_3p02.html
diff --git a/image/test/reftest/pngsuite-oddsizes/s06i3p02.png b/system/image/test/reftest/pngsuite-oddsizes/s06i3p02.png
index 456ada320..456ada320 100644
--- a/image/test/reftest/pngsuite-oddsizes/s06i3p02.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s06i3p02.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s06n3p02.png b/system/image/test/reftest/pngsuite-oddsizes/s06n3p02.png
index 501064dc2..501064dc2 100644
--- a/image/test/reftest/pngsuite-oddsizes/s06n3p02.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s06n3p02.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s07_3p02.html b/system/image/test/reftest/pngsuite-oddsizes/s07_3p02.html
index 3fc2d42a7..3fc2d42a7 100644
--- a/image/test/reftest/pngsuite-oddsizes/s07_3p02.html
+++ b/system/image/test/reftest/pngsuite-oddsizes/s07_3p02.html
diff --git a/image/test/reftest/pngsuite-oddsizes/s07i3p02.png b/system/image/test/reftest/pngsuite-oddsizes/s07i3p02.png
index 44b66bab9..44b66bab9 100644
--- a/image/test/reftest/pngsuite-oddsizes/s07i3p02.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s07i3p02.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s07n3p02.png b/system/image/test/reftest/pngsuite-oddsizes/s07n3p02.png
index 6a582593d..6a582593d 100644
--- a/image/test/reftest/pngsuite-oddsizes/s07n3p02.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s07n3p02.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s08_3p02.html b/system/image/test/reftest/pngsuite-oddsizes/s08_3p02.html
index 52079c319..52079c319 100644
--- a/image/test/reftest/pngsuite-oddsizes/s08_3p02.html
+++ b/system/image/test/reftest/pngsuite-oddsizes/s08_3p02.html
diff --git a/image/test/reftest/pngsuite-oddsizes/s08i3p02.png b/system/image/test/reftest/pngsuite-oddsizes/s08i3p02.png
index acf74f3fc..acf74f3fc 100644
--- a/image/test/reftest/pngsuite-oddsizes/s08i3p02.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s08i3p02.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s08n3p02.png b/system/image/test/reftest/pngsuite-oddsizes/s08n3p02.png
index b7094e1b4..b7094e1b4 100644
--- a/image/test/reftest/pngsuite-oddsizes/s08n3p02.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s08n3p02.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s09_3p02.html b/system/image/test/reftest/pngsuite-oddsizes/s09_3p02.html
index 3b994e128..3b994e128 100644
--- a/image/test/reftest/pngsuite-oddsizes/s09_3p02.html
+++ b/system/image/test/reftest/pngsuite-oddsizes/s09_3p02.html
diff --git a/image/test/reftest/pngsuite-oddsizes/s09i3p02.png b/system/image/test/reftest/pngsuite-oddsizes/s09i3p02.png
index 0bfae8e45..0bfae8e45 100644
--- a/image/test/reftest/pngsuite-oddsizes/s09i3p02.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s09i3p02.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s09n3p02.png b/system/image/test/reftest/pngsuite-oddsizes/s09n3p02.png
index 711ab8245..711ab8245 100644
--- a/image/test/reftest/pngsuite-oddsizes/s09n3p02.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s09n3p02.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s32_3p04.html b/system/image/test/reftest/pngsuite-oddsizes/s32_3p04.html
index a10399ba6..a10399ba6 100644
--- a/image/test/reftest/pngsuite-oddsizes/s32_3p04.html
+++ b/system/image/test/reftest/pngsuite-oddsizes/s32_3p04.html
diff --git a/image/test/reftest/pngsuite-oddsizes/s32i3p04.png b/system/image/test/reftest/pngsuite-oddsizes/s32i3p04.png
index 0841910b7..0841910b7 100644
--- a/image/test/reftest/pngsuite-oddsizes/s32i3p04.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s32i3p04.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s32n3p04.png b/system/image/test/reftest/pngsuite-oddsizes/s32n3p04.png
index fa58e3e3f..fa58e3e3f 100644
--- a/image/test/reftest/pngsuite-oddsizes/s32n3p04.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s32n3p04.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s33_3p04.html b/system/image/test/reftest/pngsuite-oddsizes/s33_3p04.html
index d845558ce..d845558ce 100644
--- a/image/test/reftest/pngsuite-oddsizes/s33_3p04.html
+++ b/system/image/test/reftest/pngsuite-oddsizes/s33_3p04.html
diff --git a/image/test/reftest/pngsuite-oddsizes/s33i3p04.png b/system/image/test/reftest/pngsuite-oddsizes/s33i3p04.png
index ab0dc14ab..ab0dc14ab 100644
--- a/image/test/reftest/pngsuite-oddsizes/s33i3p04.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s33i3p04.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s33n3p04.png b/system/image/test/reftest/pngsuite-oddsizes/s33n3p04.png
index 764f1a3dc..764f1a3dc 100644
--- a/image/test/reftest/pngsuite-oddsizes/s33n3p04.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s33n3p04.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s34_3p04.html b/system/image/test/reftest/pngsuite-oddsizes/s34_3p04.html
index 605ff9264..605ff9264 100644
--- a/image/test/reftest/pngsuite-oddsizes/s34_3p04.html
+++ b/system/image/test/reftest/pngsuite-oddsizes/s34_3p04.html
diff --git a/image/test/reftest/pngsuite-oddsizes/s34i3p04.png b/system/image/test/reftest/pngsuite-oddsizes/s34i3p04.png
index bd99039be..bd99039be 100644
--- a/image/test/reftest/pngsuite-oddsizes/s34i3p04.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s34i3p04.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s34n3p04.png b/system/image/test/reftest/pngsuite-oddsizes/s34n3p04.png
index 9cbc68b3b..9cbc68b3b 100644
--- a/image/test/reftest/pngsuite-oddsizes/s34n3p04.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s34n3p04.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s35_3p04.html b/system/image/test/reftest/pngsuite-oddsizes/s35_3p04.html
index 6a5f720a9..6a5f720a9 100644
--- a/image/test/reftest/pngsuite-oddsizes/s35_3p04.html
+++ b/system/image/test/reftest/pngsuite-oddsizes/s35_3p04.html
diff --git a/image/test/reftest/pngsuite-oddsizes/s35i3p04.png b/system/image/test/reftest/pngsuite-oddsizes/s35i3p04.png
index e2a5e0a65..e2a5e0a65 100644
--- a/image/test/reftest/pngsuite-oddsizes/s35i3p04.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s35i3p04.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s35n3p04.png b/system/image/test/reftest/pngsuite-oddsizes/s35n3p04.png
index 90b892eba..90b892eba 100644
--- a/image/test/reftest/pngsuite-oddsizes/s35n3p04.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s35n3p04.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s36_3p04.html b/system/image/test/reftest/pngsuite-oddsizes/s36_3p04.html
index 68a5ae4be..68a5ae4be 100644
--- a/image/test/reftest/pngsuite-oddsizes/s36_3p04.html
+++ b/system/image/test/reftest/pngsuite-oddsizes/s36_3p04.html
diff --git a/image/test/reftest/pngsuite-oddsizes/s36i3p04.png b/system/image/test/reftest/pngsuite-oddsizes/s36i3p04.png
index eb61b6f9a..eb61b6f9a 100644
--- a/image/test/reftest/pngsuite-oddsizes/s36i3p04.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s36i3p04.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s36n3p04.png b/system/image/test/reftest/pngsuite-oddsizes/s36n3p04.png
index b38d17977..b38d17977 100644
--- a/image/test/reftest/pngsuite-oddsizes/s36n3p04.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s36n3p04.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s37_3p04.html b/system/image/test/reftest/pngsuite-oddsizes/s37_3p04.html
index 0f19b653a..0f19b653a 100644
--- a/image/test/reftest/pngsuite-oddsizes/s37_3p04.html
+++ b/system/image/test/reftest/pngsuite-oddsizes/s37_3p04.html
diff --git a/image/test/reftest/pngsuite-oddsizes/s37i3p04.png b/system/image/test/reftest/pngsuite-oddsizes/s37i3p04.png
index 6e2b1e9b7..6e2b1e9b7 100644
--- a/image/test/reftest/pngsuite-oddsizes/s37i3p04.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s37i3p04.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s37n3p04.png b/system/image/test/reftest/pngsuite-oddsizes/s37n3p04.png
index 4d3054da5..4d3054da5 100644
--- a/image/test/reftest/pngsuite-oddsizes/s37n3p04.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s37n3p04.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s38_3p04.html b/system/image/test/reftest/pngsuite-oddsizes/s38_3p04.html
index 38a869298..38a869298 100644
--- a/image/test/reftest/pngsuite-oddsizes/s38_3p04.html
+++ b/system/image/test/reftest/pngsuite-oddsizes/s38_3p04.html
diff --git a/image/test/reftest/pngsuite-oddsizes/s38i3p04.png b/system/image/test/reftest/pngsuite-oddsizes/s38i3p04.png
index a0a8a140a..a0a8a140a 100644
--- a/image/test/reftest/pngsuite-oddsizes/s38i3p04.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s38i3p04.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s38n3p04.png b/system/image/test/reftest/pngsuite-oddsizes/s38n3p04.png
index 1233ed048..1233ed048 100644
--- a/image/test/reftest/pngsuite-oddsizes/s38n3p04.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s38n3p04.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s39_3p04.html b/system/image/test/reftest/pngsuite-oddsizes/s39_3p04.html
index 6a00026dc..6a00026dc 100644
--- a/image/test/reftest/pngsuite-oddsizes/s39_3p04.html
+++ b/system/image/test/reftest/pngsuite-oddsizes/s39_3p04.html
diff --git a/image/test/reftest/pngsuite-oddsizes/s39i3p04.png b/system/image/test/reftest/pngsuite-oddsizes/s39i3p04.png
index 04fee93ea..04fee93ea 100644
--- a/image/test/reftest/pngsuite-oddsizes/s39i3p04.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s39i3p04.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s39n3p04.png b/system/image/test/reftest/pngsuite-oddsizes/s39n3p04.png
index c750100d5..c750100d5 100644
--- a/image/test/reftest/pngsuite-oddsizes/s39n3p04.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s39n3p04.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s40_3p04.html b/system/image/test/reftest/pngsuite-oddsizes/s40_3p04.html
index 59b18da4d..59b18da4d 100644
--- a/image/test/reftest/pngsuite-oddsizes/s40_3p04.html
+++ b/system/image/test/reftest/pngsuite-oddsizes/s40_3p04.html
diff --git a/image/test/reftest/pngsuite-oddsizes/s40i3p04.png b/system/image/test/reftest/pngsuite-oddsizes/s40i3p04.png
index 68f358b82..68f358b82 100644
--- a/image/test/reftest/pngsuite-oddsizes/s40i3p04.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s40i3p04.png
diff --git a/image/test/reftest/pngsuite-oddsizes/s40n3p04.png b/system/image/test/reftest/pngsuite-oddsizes/s40n3p04.png
index 864b6b967..864b6b967 100644
--- a/image/test/reftest/pngsuite-oddsizes/s40n3p04.png
+++ b/system/image/test/reftest/pngsuite-oddsizes/s40n3p04.png
diff --git a/image/test/reftest/pngsuite-palettes/pp0n2c16.html b/system/image/test/reftest/pngsuite-palettes/pp0n2c16.html
index dd08f0e3d..dd08f0e3d 100644
--- a/image/test/reftest/pngsuite-palettes/pp0n2c16.html
+++ b/system/image/test/reftest/pngsuite-palettes/pp0n2c16.html
diff --git a/image/test/reftest/pngsuite-palettes/pp0n2c16.png b/system/image/test/reftest/pngsuite-palettes/pp0n2c16.png
index 8f2aad733..8f2aad733 100644
--- a/image/test/reftest/pngsuite-palettes/pp0n2c16.png
+++ b/system/image/test/reftest/pngsuite-palettes/pp0n2c16.png
diff --git a/image/test/reftest/pngsuite-palettes/pp0n6a08.png b/system/image/test/reftest/pngsuite-palettes/pp0n6a08.png
index 4ed7a30e4..4ed7a30e4 100644
--- a/image/test/reftest/pngsuite-palettes/pp0n6a08.png
+++ b/system/image/test/reftest/pngsuite-palettes/pp0n6a08.png
diff --git a/image/test/reftest/pngsuite-palettes/ps1n0g08.html b/system/image/test/reftest/pngsuite-palettes/ps1n0g08.html
index 5aaf11cab..5aaf11cab 100644
--- a/image/test/reftest/pngsuite-palettes/ps1n0g08.html
+++ b/system/image/test/reftest/pngsuite-palettes/ps1n0g08.html
diff --git a/image/test/reftest/pngsuite-palettes/ps1n0g08.png b/system/image/test/reftest/pngsuite-palettes/ps1n0g08.png
index 2053df2ba..2053df2ba 100644
--- a/image/test/reftest/pngsuite-palettes/ps1n0g08.png
+++ b/system/image/test/reftest/pngsuite-palettes/ps1n0g08.png
diff --git a/image/test/reftest/pngsuite-palettes/ps1n2c16.html b/system/image/test/reftest/pngsuite-palettes/ps1n2c16.html
index dd08f0e3d..dd08f0e3d 100644
--- a/image/test/reftest/pngsuite-palettes/ps1n2c16.html
+++ b/system/image/test/reftest/pngsuite-palettes/ps1n2c16.html
diff --git a/image/test/reftest/pngsuite-palettes/ps1n2c16.png b/system/image/test/reftest/pngsuite-palettes/ps1n2c16.png
index b03ecfc66..b03ecfc66 100644
--- a/image/test/reftest/pngsuite-palettes/ps1n2c16.png
+++ b/system/image/test/reftest/pngsuite-palettes/ps1n2c16.png
diff --git a/image/test/reftest/pngsuite-palettes/ps2n0g08.html b/system/image/test/reftest/pngsuite-palettes/ps2n0g08.html
index 5aaf11cab..5aaf11cab 100644
--- a/image/test/reftest/pngsuite-palettes/ps2n0g08.html
+++ b/system/image/test/reftest/pngsuite-palettes/ps2n0g08.html
diff --git a/image/test/reftest/pngsuite-palettes/ps2n0g08.png b/system/image/test/reftest/pngsuite-palettes/ps2n0g08.png
index beeab8ff3..beeab8ff3 100644
--- a/image/test/reftest/pngsuite-palettes/ps2n0g08.png
+++ b/system/image/test/reftest/pngsuite-palettes/ps2n0g08.png
diff --git a/image/test/reftest/pngsuite-palettes/ps2n2c16.html b/system/image/test/reftest/pngsuite-palettes/ps2n2c16.html
index dd08f0e3d..dd08f0e3d 100644
--- a/image/test/reftest/pngsuite-palettes/ps2n2c16.html
+++ b/system/image/test/reftest/pngsuite-palettes/ps2n2c16.html
diff --git a/image/test/reftest/pngsuite-palettes/ps2n2c16.png b/system/image/test/reftest/pngsuite-palettes/ps2n2c16.png
index c256f9091..c256f9091 100644
--- a/image/test/reftest/pngsuite-palettes/ps2n2c16.png
+++ b/system/image/test/reftest/pngsuite-palettes/ps2n2c16.png
diff --git a/image/test/reftest/pngsuite-palettes/reftest-stylo.list b/system/image/test/reftest/pngsuite-palettes/reftest-stylo.list
index 702529b29..702529b29 100644
--- a/image/test/reftest/pngsuite-palettes/reftest-stylo.list
+++ b/system/image/test/reftest/pngsuite-palettes/reftest-stylo.list
diff --git a/image/test/reftest/pngsuite-palettes/reftest.list b/system/image/test/reftest/pngsuite-palettes/reftest.list
index 56eb56e0a..56eb56e0a 100644
--- a/image/test/reftest/pngsuite-palettes/reftest.list
+++ b/system/image/test/reftest/pngsuite-palettes/reftest.list
diff --git a/image/test/reftest/pngsuite-transparency/reftest-stylo.list b/system/image/test/reftest/pngsuite-transparency/reftest-stylo.list
index 90543ab95..90543ab95 100644
--- a/image/test/reftest/pngsuite-transparency/reftest-stylo.list
+++ b/system/image/test/reftest/pngsuite-transparency/reftest-stylo.list
diff --git a/image/test/reftest/pngsuite-transparency/reftest.list b/system/image/test/reftest/pngsuite-transparency/reftest.list
index 2b574c5d8..2b574c5d8 100644
--- a/image/test/reftest/pngsuite-transparency/reftest.list
+++ b/system/image/test/reftest/pngsuite-transparency/reftest.list
diff --git a/image/test/reftest/pngsuite-transparency/tbbn1g04.html b/system/image/test/reftest/pngsuite-transparency/tbbn1g04.html
index c2e5780b0..c2e5780b0 100644
--- a/image/test/reftest/pngsuite-transparency/tbbn1g04.html
+++ b/system/image/test/reftest/pngsuite-transparency/tbbn1g04.html
diff --git a/image/test/reftest/pngsuite-transparency/tbbn1g04.png b/system/image/test/reftest/pngsuite-transparency/tbbn1g04.png
index fc8002053..fc8002053 100644
--- a/image/test/reftest/pngsuite-transparency/tbbn1g04.png
+++ b/system/image/test/reftest/pngsuite-transparency/tbbn1g04.png
diff --git a/image/test/reftest/pngsuite-transparency/tbbn2c16.html b/system/image/test/reftest/pngsuite-transparency/tbbn2c16.html
index 849c66faf..849c66faf 100644
--- a/image/test/reftest/pngsuite-transparency/tbbn2c16.html
+++ b/system/image/test/reftest/pngsuite-transparency/tbbn2c16.html
diff --git a/image/test/reftest/pngsuite-transparency/tbbn2c16.png b/system/image/test/reftest/pngsuite-transparency/tbbn2c16.png
index 5abfbbb3a..5abfbbb3a 100644
--- a/image/test/reftest/pngsuite-transparency/tbbn2c16.png
+++ b/system/image/test/reftest/pngsuite-transparency/tbbn2c16.png
diff --git a/image/test/reftest/pngsuite-transparency/tbbn3p08.html b/system/image/test/reftest/pngsuite-transparency/tbbn3p08.html
index 9248bb274..9248bb274 100644
--- a/image/test/reftest/pngsuite-transparency/tbbn3p08.html
+++ b/system/image/test/reftest/pngsuite-transparency/tbbn3p08.html
diff --git a/image/test/reftest/pngsuite-transparency/tbbn3p08.png b/system/image/test/reftest/pngsuite-transparency/tbbn3p08.png
index 4210d1683..4210d1683 100644
--- a/image/test/reftest/pngsuite-transparency/tbbn3p08.png
+++ b/system/image/test/reftest/pngsuite-transparency/tbbn3p08.png
diff --git a/image/test/reftest/pngsuite-transparency/tbgn2c16.html b/system/image/test/reftest/pngsuite-transparency/tbgn2c16.html
index 849c66faf..849c66faf 100644
--- a/image/test/reftest/pngsuite-transparency/tbgn2c16.html
+++ b/system/image/test/reftest/pngsuite-transparency/tbgn2c16.html
diff --git a/image/test/reftest/pngsuite-transparency/tbgn2c16.png b/system/image/test/reftest/pngsuite-transparency/tbgn2c16.png
index 236c81dcf..236c81dcf 100644
--- a/image/test/reftest/pngsuite-transparency/tbgn2c16.png
+++ b/system/image/test/reftest/pngsuite-transparency/tbgn2c16.png
diff --git a/image/test/reftest/pngsuite-transparency/tbgn3p08.html b/system/image/test/reftest/pngsuite-transparency/tbgn3p08.html
index 9248bb274..9248bb274 100644
--- a/image/test/reftest/pngsuite-transparency/tbgn3p08.html
+++ b/system/image/test/reftest/pngsuite-transparency/tbgn3p08.html
diff --git a/image/test/reftest/pngsuite-transparency/tbgn3p08.png b/system/image/test/reftest/pngsuite-transparency/tbgn3p08.png
index 42db2325b..42db2325b 100644
--- a/image/test/reftest/pngsuite-transparency/tbgn3p08.png
+++ b/system/image/test/reftest/pngsuite-transparency/tbgn3p08.png
diff --git a/image/test/reftest/pngsuite-transparency/tbrn2c08.html b/system/image/test/reftest/pngsuite-transparency/tbrn2c08.html
index 9248bb274..9248bb274 100644
--- a/image/test/reftest/pngsuite-transparency/tbrn2c08.html
+++ b/system/image/test/reftest/pngsuite-transparency/tbrn2c08.html
diff --git a/image/test/reftest/pngsuite-transparency/tbrn2c08.png b/system/image/test/reftest/pngsuite-transparency/tbrn2c08.png
index 8c214746d..8c214746d 100644
--- a/image/test/reftest/pngsuite-transparency/tbrn2c08.png
+++ b/system/image/test/reftest/pngsuite-transparency/tbrn2c08.png
diff --git a/image/test/reftest/pngsuite-transparency/tbwn1g16.html b/system/image/test/reftest/pngsuite-transparency/tbwn1g16.html
index 381cc427c..381cc427c 100644
--- a/image/test/reftest/pngsuite-transparency/tbwn1g16.html
+++ b/system/image/test/reftest/pngsuite-transparency/tbwn1g16.html
diff --git a/image/test/reftest/pngsuite-transparency/tbwn1g16.png b/system/image/test/reftest/pngsuite-transparency/tbwn1g16.png
index dba2cbb6c..dba2cbb6c 100644
--- a/image/test/reftest/pngsuite-transparency/tbwn1g16.png
+++ b/system/image/test/reftest/pngsuite-transparency/tbwn1g16.png
diff --git a/image/test/reftest/pngsuite-transparency/tbwn3p08.html b/system/image/test/reftest/pngsuite-transparency/tbwn3p08.html
index 9248bb274..9248bb274 100644
--- a/image/test/reftest/pngsuite-transparency/tbwn3p08.html
+++ b/system/image/test/reftest/pngsuite-transparency/tbwn3p08.html
diff --git a/image/test/reftest/pngsuite-transparency/tbwn3p08.png b/system/image/test/reftest/pngsuite-transparency/tbwn3p08.png
index 7922135aa..7922135aa 100644
--- a/image/test/reftest/pngsuite-transparency/tbwn3p08.png
+++ b/system/image/test/reftest/pngsuite-transparency/tbwn3p08.png
diff --git a/image/test/reftest/pngsuite-transparency/tbyn3p08.html b/system/image/test/reftest/pngsuite-transparency/tbyn3p08.html
index 9248bb274..9248bb274 100644
--- a/image/test/reftest/pngsuite-transparency/tbyn3p08.html
+++ b/system/image/test/reftest/pngsuite-transparency/tbyn3p08.html
diff --git a/image/test/reftest/pngsuite-transparency/tbyn3p08.png b/system/image/test/reftest/pngsuite-transparency/tbyn3p08.png
index 5b2c6cbba..5b2c6cbba 100644
--- a/image/test/reftest/pngsuite-transparency/tbyn3p08.png
+++ b/system/image/test/reftest/pngsuite-transparency/tbyn3p08.png
diff --git a/image/test/reftest/pngsuite-transparency/tp1n3p08.html b/system/image/test/reftest/pngsuite-transparency/tp1n3p08.html
index 9248bb274..9248bb274 100644
--- a/image/test/reftest/pngsuite-transparency/tp1n3p08.html
+++ b/system/image/test/reftest/pngsuite-transparency/tp1n3p08.html
diff --git a/image/test/reftest/pngsuite-transparency/tp1n3p08.png b/system/image/test/reftest/pngsuite-transparency/tp1n3p08.png
index 6c5fd6ec3..6c5fd6ec3 100644
--- a/image/test/reftest/pngsuite-transparency/tp1n3p08.png
+++ b/system/image/test/reftest/pngsuite-transparency/tp1n3p08.png
diff --git a/image/test/reftest/pngsuite-transparency/wrapper.html b/system/image/test/reftest/pngsuite-transparency/wrapper.html
index 45b516775..45b516775 100644
--- a/image/test/reftest/pngsuite-transparency/wrapper.html
+++ b/system/image/test/reftest/pngsuite-transparency/wrapper.html
diff --git a/image/test/reftest/pngsuite-zlib/reftest-stylo.list b/system/image/test/reftest/pngsuite-zlib/reftest-stylo.list
index 35753fa4e..35753fa4e 100644
--- a/image/test/reftest/pngsuite-zlib/reftest-stylo.list
+++ b/system/image/test/reftest/pngsuite-zlib/reftest-stylo.list
diff --git a/image/test/reftest/pngsuite-zlib/reftest.list b/system/image/test/reftest/pngsuite-zlib/reftest.list
index ec153449f..ec153449f 100644
--- a/image/test/reftest/pngsuite-zlib/reftest.list
+++ b/system/image/test/reftest/pngsuite-zlib/reftest.list
diff --git a/image/test/reftest/pngsuite-zlib/z00n2c08.html b/system/image/test/reftest/pngsuite-zlib/z00n2c08.html
index c878a03ff..c878a03ff 100644
--- a/image/test/reftest/pngsuite-zlib/z00n2c08.html
+++ b/system/image/test/reftest/pngsuite-zlib/z00n2c08.html
diff --git a/image/test/reftest/pngsuite-zlib/z00n2c08.png b/system/image/test/reftest/pngsuite-zlib/z00n2c08.png
index 7669eb838..7669eb838 100644
--- a/image/test/reftest/pngsuite-zlib/z00n2c08.png
+++ b/system/image/test/reftest/pngsuite-zlib/z00n2c08.png
diff --git a/image/test/reftest/pngsuite-zlib/z03n2c08.html b/system/image/test/reftest/pngsuite-zlib/z03n2c08.html
index c878a03ff..c878a03ff 100644
--- a/image/test/reftest/pngsuite-zlib/z03n2c08.html
+++ b/system/image/test/reftest/pngsuite-zlib/z03n2c08.html
diff --git a/image/test/reftest/pngsuite-zlib/z03n2c08.png b/system/image/test/reftest/pngsuite-zlib/z03n2c08.png
index bfb10de8d..bfb10de8d 100644
--- a/image/test/reftest/pngsuite-zlib/z03n2c08.png
+++ b/system/image/test/reftest/pngsuite-zlib/z03n2c08.png
diff --git a/image/test/reftest/pngsuite-zlib/z06n2c08.html b/system/image/test/reftest/pngsuite-zlib/z06n2c08.html
index c878a03ff..c878a03ff 100644
--- a/image/test/reftest/pngsuite-zlib/z06n2c08.html
+++ b/system/image/test/reftest/pngsuite-zlib/z06n2c08.html
diff --git a/image/test/reftest/pngsuite-zlib/z06n2c08.png b/system/image/test/reftest/pngsuite-zlib/z06n2c08.png
index b90ebc10f..b90ebc10f 100644
--- a/image/test/reftest/pngsuite-zlib/z06n2c08.png
+++ b/system/image/test/reftest/pngsuite-zlib/z06n2c08.png
diff --git a/image/test/reftest/pngsuite-zlib/z09n2c08.html b/system/image/test/reftest/pngsuite-zlib/z09n2c08.html
index c878a03ff..c878a03ff 100644
--- a/image/test/reftest/pngsuite-zlib/z09n2c08.html
+++ b/system/image/test/reftest/pngsuite-zlib/z09n2c08.html
diff --git a/image/test/reftest/pngsuite-zlib/z09n2c08.png b/system/image/test/reftest/pngsuite-zlib/z09n2c08.png
index 5f191a78e..5f191a78e 100644
--- a/image/test/reftest/pngsuite-zlib/z09n2c08.png
+++ b/system/image/test/reftest/pngsuite-zlib/z09n2c08.png
diff --git a/image/test/reftest/reftest-stylo.list b/system/image/test/reftest/reftest-stylo.list
index 8c76cce79..8c76cce79 100644
--- a/image/test/reftest/reftest-stylo.list
+++ b/system/image/test/reftest/reftest-stylo.list
diff --git a/image/test/reftest/reftest.list b/system/image/test/reftest/reftest.list
index bfa154e6a..bfa154e6a 100644
--- a/image/test/reftest/reftest.list
+++ b/system/image/test/reftest/reftest.list
diff --git a/image/test/unit/async_load_tests.js b/system/image/test/unit/async_load_tests.js
index fafb26f75..fafb26f75 100644
--- a/image/test/unit/async_load_tests.js
+++ b/system/image/test/unit/async_load_tests.js
diff --git a/image/test/unit/bug413512.ico b/system/image/test/unit/bug413512.ico
index b2db0429f..b2db0429f 100644
--- a/image/test/unit/bug413512.ico
+++ b/system/image/test/unit/bug413512.ico
diff --git a/image/test/unit/bug815359.ico b/system/image/test/unit/bug815359.ico
index a24b8fb6b..a24b8fb6b 100644
--- a/image/test/unit/bug815359.ico
+++ b/system/image/test/unit/bug815359.ico
diff --git a/image/test/unit/image1.png b/system/image/test/unit/image1.png
index 2fb37aeec..2fb37aeec 100644
--- a/image/test/unit/image1.png
+++ b/system/image/test/unit/image1.png
diff --git a/image/test/unit/image1png16x16.jpg b/system/image/test/unit/image1png16x16.jpg
index ea14dbede..ea14dbede 100644
--- a/image/test/unit/image1png16x16.jpg
+++ b/system/image/test/unit/image1png16x16.jpg
diff --git a/image/test/unit/image1png64x64.jpg b/system/image/test/unit/image1png64x64.jpg
index 11c34f6c6..11c34f6c6 100644
--- a/image/test/unit/image1png64x64.jpg
+++ b/system/image/test/unit/image1png64x64.jpg
diff --git a/image/test/unit/image2.jpg b/system/image/test/unit/image2.jpg
index b2131bf0c..b2131bf0c 100644
--- a/image/test/unit/image2.jpg
+++ b/system/image/test/unit/image2.jpg
diff --git a/image/test/unit/image2jpg16x16-win.png b/system/image/test/unit/image2jpg16x16-win.png
index a821626c0..a821626c0 100644
--- a/image/test/unit/image2jpg16x16-win.png
+++ b/system/image/test/unit/image2jpg16x16-win.png
diff --git a/image/test/unit/image2jpg16x16.png b/system/image/test/unit/image2jpg16x16.png
index 5722223c2..5722223c2 100644
--- a/image/test/unit/image2jpg16x16.png
+++ b/system/image/test/unit/image2jpg16x16.png
diff --git a/image/test/unit/image2jpg16x16cropped.jpg b/system/image/test/unit/image2jpg16x16cropped.jpg
index fca22cb30..fca22cb30 100644
--- a/image/test/unit/image2jpg16x16cropped.jpg
+++ b/system/image/test/unit/image2jpg16x16cropped.jpg
diff --git a/image/test/unit/image2jpg16x16cropped2.jpg b/system/image/test/unit/image2jpg16x16cropped2.jpg
index e51d3530d..e51d3530d 100644
--- a/image/test/unit/image2jpg16x16cropped2.jpg
+++ b/system/image/test/unit/image2jpg16x16cropped2.jpg
diff --git a/image/test/unit/image2jpg16x32cropped3.jpg b/system/image/test/unit/image2jpg16x32cropped3.jpg
index 13a3d26e5..13a3d26e5 100644
--- a/image/test/unit/image2jpg16x32cropped3.jpg
+++ b/system/image/test/unit/image2jpg16x32cropped3.jpg
diff --git a/image/test/unit/image2jpg16x32scaled.jpg b/system/image/test/unit/image2jpg16x32scaled.jpg
index 6abef0f99..6abef0f99 100644
--- a/image/test/unit/image2jpg16x32scaled.jpg
+++ b/system/image/test/unit/image2jpg16x32scaled.jpg
diff --git a/image/test/unit/image2jpg32x16cropped4.jpg b/system/image/test/unit/image2jpg32x16cropped4.jpg
index 46f34918c..46f34918c 100644
--- a/image/test/unit/image2jpg32x16cropped4.jpg
+++ b/system/image/test/unit/image2jpg32x16cropped4.jpg
diff --git a/image/test/unit/image2jpg32x16scaled.jpg b/system/image/test/unit/image2jpg32x16scaled.jpg
index e302fbafd..e302fbafd 100644
--- a/image/test/unit/image2jpg32x16scaled.jpg
+++ b/system/image/test/unit/image2jpg32x16scaled.jpg
diff --git a/image/test/unit/image2jpg32x32-win.png b/system/image/test/unit/image2jpg32x32-win.png
index 4d84df26a..4d84df26a 100644
--- a/image/test/unit/image2jpg32x32-win.png
+++ b/system/image/test/unit/image2jpg32x32-win.png
diff --git a/image/test/unit/image2jpg32x32.jpg b/system/image/test/unit/image2jpg32x32.jpg
index cf9a10a37..cf9a10a37 100644
--- a/image/test/unit/image2jpg32x32.jpg
+++ b/system/image/test/unit/image2jpg32x32.jpg
diff --git a/image/test/unit/image2jpg32x32.png b/system/image/test/unit/image2jpg32x32.png
index 723008771..723008771 100644
--- a/image/test/unit/image2jpg32x32.png
+++ b/system/image/test/unit/image2jpg32x32.png
diff --git a/image/test/unit/image3.ico b/system/image/test/unit/image3.ico
index d44438903..d44438903 100644
--- a/image/test/unit/image3.ico
+++ b/system/image/test/unit/image3.ico
diff --git a/image/test/unit/image3ico16x16.png b/system/image/test/unit/image3ico16x16.png
index e9e520cb6..e9e520cb6 100644
--- a/image/test/unit/image3ico16x16.png
+++ b/system/image/test/unit/image3ico16x16.png
diff --git a/image/test/unit/image3ico32x32.png b/system/image/test/unit/image3ico32x32.png
index 58497e3fa..58497e3fa 100644
--- a/image/test/unit/image3ico32x32.png
+++ b/system/image/test/unit/image3ico32x32.png
diff --git a/image/test/unit/image4.gif b/system/image/test/unit/image4.gif
index b1530bc81..b1530bc81 100644
--- a/image/test/unit/image4.gif
+++ b/system/image/test/unit/image4.gif
diff --git a/image/test/unit/image4gif16x16bmp24bpp.ico b/system/image/test/unit/image4gif16x16bmp24bpp.ico
index 890c81c27..890c81c27 100644
--- a/image/test/unit/image4gif16x16bmp24bpp.ico
+++ b/system/image/test/unit/image4gif16x16bmp24bpp.ico
diff --git a/image/test/unit/image4gif16x16bmp32bpp.ico b/system/image/test/unit/image4gif16x16bmp32bpp.ico
index f8a9eb8ad..f8a9eb8ad 100644
--- a/image/test/unit/image4gif16x16bmp32bpp.ico
+++ b/system/image/test/unit/image4gif16x16bmp32bpp.ico
diff --git a/image/test/unit/image4gif32x32bmp24bpp.ico b/system/image/test/unit/image4gif32x32bmp24bpp.ico
index 28092818d..28092818d 100644
--- a/image/test/unit/image4gif32x32bmp24bpp.ico
+++ b/system/image/test/unit/image4gif32x32bmp24bpp.ico
diff --git a/image/test/unit/image4gif32x32bmp32bpp.ico b/system/image/test/unit/image4gif32x32bmp32bpp.ico
index 0e2d28c82..0e2d28c82 100644
--- a/image/test/unit/image4gif32x32bmp32bpp.ico
+++ b/system/image/test/unit/image4gif32x32bmp32bpp.ico
diff --git a/image/test/unit/image_load_helpers.js b/system/image/test/unit/image_load_helpers.js
index e8d9a29f8..e8d9a29f8 100644
--- a/image/test/unit/image_load_helpers.js
+++ b/system/image/test/unit/image_load_helpers.js
diff --git a/image/test/unit/test_async_notification.js b/system/image/test/unit/test_async_notification.js
index 63d04b99b..63d04b99b 100644
--- a/image/test/unit/test_async_notification.js
+++ b/system/image/test/unit/test_async_notification.js
diff --git a/image/test/unit/test_async_notification_404.js b/system/image/test/unit/test_async_notification_404.js
index 4949d282d..4949d282d 100644
--- a/image/test/unit/test_async_notification_404.js
+++ b/system/image/test/unit/test_async_notification_404.js
diff --git a/image/test/unit/test_async_notification_animated.js b/system/image/test/unit/test_async_notification_animated.js
index bfe6e2d0d..bfe6e2d0d 100644
--- a/image/test/unit/test_async_notification_animated.js
+++ b/system/image/test/unit/test_async_notification_animated.js
diff --git a/image/test/unit/test_encoder_apng.js b/system/image/test/unit/test_encoder_apng.js
index e7b90c28b..e7b90c28b 100644
--- a/image/test/unit/test_encoder_apng.js
+++ b/system/image/test/unit/test_encoder_apng.js
diff --git a/image/test/unit/test_encoder_png.js b/system/image/test/unit/test_encoder_png.js
index 67beb840f..67beb840f 100644
--- a/image/test/unit/test_encoder_png.js
+++ b/system/image/test/unit/test_encoder_png.js
diff --git a/image/test/unit/test_imgtools.js b/system/image/test/unit/test_imgtools.js
index b9b8da82b..b9b8da82b 100644
--- a/image/test/unit/test_imgtools.js
+++ b/system/image/test/unit/test_imgtools.js
diff --git a/image/test/unit/test_moz_icon_uri.js b/system/image/test/unit/test_moz_icon_uri.js
index 5e697fb21..5e697fb21 100644
--- a/image/test/unit/test_moz_icon_uri.js
+++ b/system/image/test/unit/test_moz_icon_uri.js
diff --git a/image/test/unit/test_private_channel.js b/system/image/test/unit/test_private_channel.js
index 960d6d69b..960d6d69b 100644
--- a/image/test/unit/test_private_channel.js
+++ b/system/image/test/unit/test_private_channel.js
diff --git a/image/test/unit/xpcshell.ini b/system/image/test/unit/xpcshell.ini
index fea361bb5..fea361bb5 100644
--- a/image/test/unit/xpcshell.ini
+++ b/system/image/test/unit/xpcshell.ini
diff --git a/system/moz.build b/system/moz.build
index da4226e02..4a869c1ff 100644
--- a/system/moz.build
+++ b/system/moz.build
@@ -7,6 +7,7 @@ DIRS += [
   'docshell',
   'graphics',
   'hardware',
+  'image',
   'interface',
   'network',
   'security',
diff --git a/system/toolkit.mozbuild b/system/toolkit.mozbuild
index 5ea686e9d..712929c3b 100644
--- a/system/toolkit.mozbuild
+++ b/system/toolkit.mozbuild
@@ -48,7 +48,6 @@ if CONFIG['ENABLE_TESTS']:
 
 DIRS += [
     '/testing/gtest',
-    '/image',
     '/dom',
     '/editor',
     '/layout',
diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list
index 33e714029..60368f496 100644
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -38,7 +38,7 @@ include ../../editor/txmgr/tests/crashtests/crashtests.list
 
 include ../../system/graphics/tests/crashtests/crashtests.list
 
-include ../../image/test/crashtests/crashtests.list
+include ../../system/image/test/crashtests/crashtests.list
 
 include ../../intl/lwbrk/crashtests/crashtests.list
 include ../../intl/uconv/crashtests/crashtests.list