From 36d22d82aa202bb199967e9512281e9a53db42c9 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 7 Apr 2024 21:33:14 +0200
Subject: Adding upstream version 115.7.0esr.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 image/test/reftest/ico/cur/pointer.cur             | Bin 0 -> 4286 bytes
 image/test/reftest/ico/cur/pointer.png             | Bin 0 -> 453 bytes
 image/test/reftest/ico/cur/reftest.list            |   4 ++
 image/test/reftest/ico/cur/wrapper.html            |  28 ++++++++
 .../ico-not-square-transparent-1bpp.ico            | Bin 0 -> 182 bytes
 .../ico-not-square-transparent-1bpp.png            | Bin 0 -> 241 bytes
 .../ico-bmp-1bpp/ico-partial-transparent-1bpp.ico  | Bin 0 -> 326 bytes
 .../ico-bmp-1bpp/ico-partial-transparent-1bpp.png  | Bin 0 -> 410 bytes
 .../ico/ico-bmp-1bpp/ico-size-15x15-1bpp.ico       | Bin 0 -> 190 bytes
 .../ico/ico-bmp-1bpp/ico-size-15x15-1bpp.png       | Bin 0 -> 220 bytes
 .../ico/ico-bmp-1bpp/ico-size-16x16-1bpp.ico       | Bin 0 -> 198 bytes
 .../ico/ico-bmp-1bpp/ico-size-16x16-1bpp.png       | Bin 0 -> 242 bytes
 .../ico/ico-bmp-1bpp/ico-size-17x17-1bpp.ico       | Bin 0 -> 206 bytes
 .../ico/ico-bmp-1bpp/ico-size-17x17-1bpp.png       | Bin 0 -> 247 bytes
 .../reftest/ico/ico-bmp-1bpp/ico-size-1x1-1bpp.ico | Bin 0 -> 78 bytes
 .../reftest/ico/ico-bmp-1bpp/ico-size-1x1-1bpp.png | Bin 0 -> 120 bytes
 .../ico/ico-bmp-1bpp/ico-size-256x256-1bpp.ico     | Bin 0 -> 16454 bytes
 .../ico/ico-bmp-1bpp/ico-size-256x256-1bpp.png     | Bin 0 -> 7673 bytes
 .../reftest/ico/ico-bmp-1bpp/ico-size-2x2-1bpp.ico | Bin 0 -> 86 bytes
 .../reftest/ico/ico-bmp-1bpp/ico-size-2x2-1bpp.png | Bin 0 -> 126 bytes
 .../ico/ico-bmp-1bpp/ico-size-31x31-1bpp.ico       | Bin 0 -> 318 bytes
 .../ico/ico-bmp-1bpp/ico-size-31x31-1bpp.png       | Bin 0 -> 447 bytes
 .../ico/ico-bmp-1bpp/ico-size-32x32-1bpp.ico       | Bin 0 -> 326 bytes
 .../ico/ico-bmp-1bpp/ico-size-32x32-1bpp.png       | Bin 0 -> 455 bytes
 .../ico/ico-bmp-1bpp/ico-size-33x33-1bpp.ico       | Bin 0 -> 598 bytes
 .../ico/ico-bmp-1bpp/ico-size-33x33-1bpp.png       | Bin 0 -> 489 bytes
 .../reftest/ico/ico-bmp-1bpp/ico-size-3x3-1bpp.ico | Bin 0 -> 94 bytes
 .../reftest/ico/ico-bmp-1bpp/ico-size-3x3-1bpp.png | Bin 0 -> 132 bytes
 .../reftest/ico/ico-bmp-1bpp/ico-size-4x4-1bpp.ico | Bin 0 -> 102 bytes
 .../reftest/ico/ico-bmp-1bpp/ico-size-4x4-1bpp.png | Bin 0 -> 135 bytes
 .../reftest/ico/ico-bmp-1bpp/ico-size-5x5-1bpp.ico | Bin 0 -> 110 bytes
 .../reftest/ico/ico-bmp-1bpp/ico-size-5x5-1bpp.png | Bin 0 -> 146 bytes
 .../reftest/ico/ico-bmp-1bpp/ico-size-6x6-1bpp.ico | Bin 0 -> 118 bytes
 .../reftest/ico/ico-bmp-1bpp/ico-size-6x6-1bpp.png | Bin 0 -> 149 bytes
 .../reftest/ico/ico-bmp-1bpp/ico-size-7x7-1bpp.ico | Bin 0 -> 126 bytes
 .../reftest/ico/ico-bmp-1bpp/ico-size-7x7-1bpp.png | Bin 0 -> 156 bytes
 .../reftest/ico/ico-bmp-1bpp/ico-size-8x8-1bpp.ico | Bin 0 -> 134 bytes
 .../reftest/ico/ico-bmp-1bpp/ico-size-8x8-1bpp.png | Bin 0 -> 161 bytes
 .../reftest/ico/ico-bmp-1bpp/ico-size-9x9-1bpp.ico | Bin 0 -> 142 bytes
 .../reftest/ico/ico-bmp-1bpp/ico-size-9x9-1bpp.png | Bin 0 -> 171 bytes
 .../ico/ico-bmp-1bpp/ico-transparent-1bpp.ico      | Bin 0 -> 3262 bytes
 .../ico/ico-bmp-1bpp/ico-transparent-1bpp.png      | Bin 0 -> 195 bytes
 image/test/reftest/ico/ico-bmp-1bpp/reftest.list   |  23 ++++++
 .../ico-not-square-transparent-24bpp.ico           | Bin 0 -> 1126 bytes
 .../ico-not-square-transparent-24bpp.png           | Bin 0 -> 514 bytes
 .../ico-partial-transparent-24bpp.ico              | Bin 0 -> 3262 bytes
 .../ico-partial-transparent-24bpp.png              | Bin 0 -> 1028 bytes
 .../ico/ico-bmp-24bpp/ico-size-15x15-24bpp.ico     | Bin 0 -> 842 bytes
 .../ico/ico-bmp-24bpp/ico-size-15x15-24bpp.png     | Bin 0 -> 809 bytes
 .../ico/ico-bmp-24bpp/ico-size-16x16-24bpp.ico     | Bin 0 -> 894 bytes
 .../ico/ico-bmp-24bpp/ico-size-16x16-24bpp.png     | Bin 0 -> 879 bytes
 .../ico/ico-bmp-24bpp/ico-size-17x17-24bpp.ico     | Bin 0 -> 1014 bytes
 .../ico/ico-bmp-24bpp/ico-size-17x17-24bpp.png     | Bin 0 -> 1000 bytes
 .../ico/ico-bmp-24bpp/ico-size-1x1-24bpp.ico       | Bin 0 -> 70 bytes
 .../ico/ico-bmp-24bpp/ico-size-1x1-24bpp.png       | Bin 0 -> 70 bytes
 .../ico/ico-bmp-24bpp/ico-size-256x256-24bpp.ico   | Bin 0 -> 204862 bytes
 .../ico/ico-bmp-24bpp/ico-size-256x256-24bpp.png   | Bin 0 -> 5480 bytes
 .../ico/ico-bmp-24bpp/ico-size-2x2-24bpp.ico       | Bin 0 -> 86 bytes
 .../ico/ico-bmp-24bpp/ico-size-2x2-24bpp.png       | Bin 0 -> 83 bytes
 .../ico/ico-bmp-24bpp/ico-size-31x31-24bpp.ico     | Bin 0 -> 3162 bytes
 .../ico/ico-bmp-24bpp/ico-size-31x31-24bpp.png     | Bin 0 -> 2936 bytes
 .../ico/ico-bmp-24bpp/ico-size-32x32-24bpp.ico     | Bin 0 -> 3262 bytes
 .../ico/ico-bmp-24bpp/ico-size-32x32-24bpp.png     | Bin 0 -> 3106 bytes
 .../ico/ico-bmp-24bpp/ico-size-33x33-24bpp.ico     | Bin 0 -> 3626 bytes
 .../ico/ico-bmp-24bpp/ico-size-33x33-24bpp.png     | Bin 0 -> 3303 bytes
 .../ico/ico-bmp-24bpp/ico-size-3x3-24bpp.ico       | Bin 0 -> 110 bytes
 .../ico/ico-bmp-24bpp/ico-size-3x3-24bpp.png       | Bin 0 -> 107 bytes
 .../ico/ico-bmp-24bpp/ico-size-4x4-24bpp.ico       | Bin 0 -> 126 bytes
 .../ico/ico-bmp-24bpp/ico-size-4x4-24bpp.png       | Bin 0 -> 136 bytes
 .../ico/ico-bmp-24bpp/ico-size-5x5-24bpp.ico       | Bin 0 -> 162 bytes
 .../ico/ico-bmp-24bpp/ico-size-5x5-24bpp.png       | Bin 0 -> 173 bytes
 .../ico/ico-bmp-24bpp/ico-size-6x6-24bpp.ico       | Bin 0 -> 206 bytes
 .../ico/ico-bmp-24bpp/ico-size-6x6-24bpp.png       | Bin 0 -> 218 bytes
 .../ico/ico-bmp-24bpp/ico-size-7x7-24bpp.ico       | Bin 0 -> 258 bytes
 .../ico/ico-bmp-24bpp/ico-size-7x7-24bpp.png       | Bin 0 -> 271 bytes
 .../ico/ico-bmp-24bpp/ico-size-8x8-24bpp.ico       | Bin 0 -> 286 bytes
 .../ico/ico-bmp-24bpp/ico-size-8x8-24bpp.png       | Bin 0 -> 313 bytes
 .../ico/ico-bmp-24bpp/ico-size-9x9-24bpp.ico       | Bin 0 -> 350 bytes
 .../ico/ico-bmp-24bpp/ico-size-9x9-24bpp.png       | Bin 0 -> 368 bytes
 .../ico/ico-bmp-24bpp/ico-transparent-24bpp.ico    | Bin 0 -> 3262 bytes
 .../ico/ico-bmp-24bpp/ico-transparent-24bpp.png    | Bin 0 -> 195 bytes
 image/test/reftest/ico/ico-bmp-24bpp/reftest.list  |  23 ++++++
 .../ico-not-square-transparent-32bpp.ico           | Bin 0 -> 1462 bytes
 .../ico-not-square-transparent-32bpp.png           | Bin 0 -> 533 bytes
 .../ico-partial-transparent-32bpp.ico              | Bin 0 -> 4286 bytes
 .../ico-partial-transparent-32bpp.png              | Bin 0 -> 1028 bytes
 .../ico/ico-bmp-32bpp/ico-size-15x15-32bpp.ico     | Bin 0 -> 1022 bytes
 .../ico/ico-bmp-32bpp/ico-size-15x15-32bpp.png     | Bin 0 -> 809 bytes
 .../ico/ico-bmp-32bpp/ico-size-16x16-32bpp.ico     | Bin 0 -> 1150 bytes
 .../ico/ico-bmp-32bpp/ico-size-16x16-32bpp.png     | Bin 0 -> 879 bytes
 .../ico/ico-bmp-32bpp/ico-size-17x17-32bpp.ico     | Bin 0 -> 1286 bytes
 .../ico/ico-bmp-32bpp/ico-size-17x17-32bpp.png     | Bin 0 -> 1000 bytes
 .../ico/ico-bmp-32bpp/ico-size-1x1-32bpp.ico       | Bin 0 -> 70 bytes
 .../ico/ico-bmp-32bpp/ico-size-1x1-32bpp.png       | Bin 0 -> 70 bytes
 .../ico/ico-bmp-32bpp/ico-size-256x256-32bpp.ico   | Bin 0 -> 270398 bytes
 .../ico/ico-bmp-32bpp/ico-size-256x256-32bpp.png   | Bin 0 -> 5480 bytes
 .../ico/ico-bmp-32bpp/ico-size-2x2-32bpp.ico       | Bin 0 -> 86 bytes
 .../ico/ico-bmp-32bpp/ico-size-2x2-32bpp.png       | Bin 0 -> 83 bytes
 .../ico/ico-bmp-32bpp/ico-size-31x31-32bpp.ico     | Bin 0 -> 4030 bytes
 .../ico/ico-bmp-32bpp/ico-size-31x31-32bpp.png     | Bin 0 -> 2936 bytes
 .../ico/ico-bmp-32bpp/ico-size-32x32-32bpp.ico     | Bin 0 -> 4286 bytes
 .../ico/ico-bmp-32bpp/ico-size-32x32-32bpp.png     | Bin 0 -> 3106 bytes
 .../ico/ico-bmp-32bpp/ico-size-33x33-32bpp.ico     | Bin 0 -> 4682 bytes
 .../ico/ico-bmp-32bpp/ico-size-33x33-32bpp.png     | Bin 0 -> 3303 bytes
 .../ico/ico-bmp-32bpp/ico-size-3x3-32bpp.ico       | Bin 0 -> 110 bytes
 .../ico/ico-bmp-32bpp/ico-size-3x3-32bpp.png       | Bin 0 -> 107 bytes
 .../ico/ico-bmp-32bpp/ico-size-4x4-32bpp.ico       | Bin 0 -> 142 bytes
 .../ico/ico-bmp-32bpp/ico-size-4x4-32bpp.png       | Bin 0 -> 136 bytes
 .../ico/ico-bmp-32bpp/ico-size-5x5-32bpp.ico       | Bin 0 -> 182 bytes
 .../ico/ico-bmp-32bpp/ico-size-5x5-32bpp.png       | Bin 0 -> 173 bytes
 .../ico/ico-bmp-32bpp/ico-size-6x6-32bpp.ico       | Bin 0 -> 230 bytes
 .../ico/ico-bmp-32bpp/ico-size-6x6-32bpp.png       | Bin 0 -> 218 bytes
 .../ico/ico-bmp-32bpp/ico-size-7x7-32bpp.ico       | Bin 0 -> 286 bytes
 .../ico/ico-bmp-32bpp/ico-size-7x7-32bpp.png       | Bin 0 -> 271 bytes
 .../ico/ico-bmp-32bpp/ico-size-8x8-32bpp.ico       | Bin 0 -> 350 bytes
 .../ico/ico-bmp-32bpp/ico-size-8x8-32bpp.png       | Bin 0 -> 313 bytes
 .../ico/ico-bmp-32bpp/ico-size-9x9-32bpp.ico       | Bin 0 -> 422 bytes
 .../ico/ico-bmp-32bpp/ico-size-9x9-32bpp.png       | Bin 0 -> 368 bytes
 .../ico/ico-bmp-32bpp/ico-transparent-32bpp.ico    | Bin 0 -> 4286 bytes
 .../ico/ico-bmp-32bpp/ico-transparent-32bpp.png    | Bin 0 -> 195 bytes
 image/test/reftest/ico/ico-bmp-32bpp/reftest.list  |  22 ++++++
 .../ico-not-square-transparent-4bpp.ico            | Bin 0 -> 350 bytes
 .../ico-not-square-transparent-4bpp.png            | Bin 0 -> 315 bytes
 .../ico-bmp-4bpp/ico-partial-transparent-4bpp.ico  | Bin 0 -> 766 bytes
 .../ico-bmp-4bpp/ico-partial-transparent-4bpp.png  | Bin 0 -> 556 bytes
 .../ico/ico-bmp-4bpp/ico-size-15x15-4bpp.ico       | Bin 0 -> 306 bytes
 .../ico/ico-bmp-4bpp/ico-size-15x15-4bpp.png       | Bin 0 -> 304 bytes
 .../ico/ico-bmp-4bpp/ico-size-16x16-4bpp.ico       | Bin 0 -> 318 bytes
 .../ico/ico-bmp-4bpp/ico-size-16x16-4bpp.png       | Bin 0 -> 323 bytes
 .../ico/ico-bmp-4bpp/ico-size-17x17-4bpp.ico       | Bin 0 -> 398 bytes
 .../ico/ico-bmp-4bpp/ico-size-17x17-4bpp.png       | Bin 0 -> 337 bytes
 .../reftest/ico/ico-bmp-4bpp/ico-size-1x1-4bpp.ico | Bin 0 -> 134 bytes
 .../reftest/ico/ico-bmp-4bpp/ico-size-1x1-4bpp.png | Bin 0 -> 120 bytes
 .../ico/ico-bmp-4bpp/ico-size-256x256-4bpp.ico     | Bin 0 -> 41086 bytes
 .../ico/ico-bmp-4bpp/ico-size-256x256-4bpp.png     | Bin 0 -> 16944 bytes
 .../reftest/ico/ico-bmp-4bpp/ico-size-2x2-4bpp.ico | Bin 0 -> 142 bytes
 .../reftest/ico/ico-bmp-4bpp/ico-size-2x2-4bpp.png | Bin 0 -> 128 bytes
 .../ico/ico-bmp-4bpp/ico-size-31x31-4bpp.ico       | Bin 0 -> 746 bytes
 .../ico/ico-bmp-4bpp/ico-size-31x31-4bpp.png       | Bin 0 -> 700 bytes
 .../ico/ico-bmp-4bpp/ico-size-32x32-4bpp.ico       | Bin 0 -> 766 bytes
 .../ico/ico-bmp-4bpp/ico-size-32x32-4bpp.png       | Bin 0 -> 763 bytes
 .../ico/ico-bmp-4bpp/ico-size-33x33-4bpp.ico       | Bin 0 -> 1050 bytes
 .../ico/ico-bmp-4bpp/ico-size-33x33-4bpp.png       | Bin 0 -> 778 bytes
 .../reftest/ico/ico-bmp-4bpp/ico-size-3x3-4bpp.ico | Bin 0 -> 150 bytes
 .../reftest/ico/ico-bmp-4bpp/ico-size-3x3-4bpp.png | Bin 0 -> 139 bytes
 .../reftest/ico/ico-bmp-4bpp/ico-size-4x4-4bpp.ico | Bin 0 -> 158 bytes
 .../reftest/ico/ico-bmp-4bpp/ico-size-4x4-4bpp.png | Bin 0 -> 147 bytes
 .../reftest/ico/ico-bmp-4bpp/ico-size-5x5-4bpp.ico | Bin 0 -> 166 bytes
 .../reftest/ico/ico-bmp-4bpp/ico-size-5x5-4bpp.png | Bin 0 -> 156 bytes
 .../reftest/ico/ico-bmp-4bpp/ico-size-6x6-4bpp.ico | Bin 0 -> 174 bytes
 .../reftest/ico/ico-bmp-4bpp/ico-size-6x6-4bpp.png | Bin 0 -> 163 bytes
 .../reftest/ico/ico-bmp-4bpp/ico-size-7x7-4bpp.ico | Bin 0 -> 182 bytes
 .../reftest/ico/ico-bmp-4bpp/ico-size-7x7-4bpp.png | Bin 0 -> 172 bytes
 .../reftest/ico/ico-bmp-4bpp/ico-size-8x8-4bpp.ico | Bin 0 -> 190 bytes
 .../reftest/ico/ico-bmp-4bpp/ico-size-8x8-4bpp.png | Bin 0 -> 188 bytes
 .../reftest/ico/ico-bmp-4bpp/ico-size-9x9-4bpp.ico | Bin 0 -> 234 bytes
 .../reftest/ico/ico-bmp-4bpp/ico-size-9x9-4bpp.png | Bin 0 -> 198 bytes
 .../ico/ico-bmp-4bpp/ico-transparent-4bpp.ico      | Bin 0 -> 3262 bytes
 .../ico/ico-bmp-4bpp/ico-transparent-4bpp.png      | Bin 0 -> 195 bytes
 image/test/reftest/ico/ico-bmp-4bpp/reftest.list   |  23 ++++++
 .../ico-not-square-transparent-8bpp.ico            | Bin 0 -> 1478 bytes
 .../ico-not-square-transparent-8bpp.png            | Bin 0 -> 514 bytes
 .../ico-bmp-8bpp/ico-partial-transparent-8bpp.ico  | Bin 0 -> 2238 bytes
 .../ico-bmp-8bpp/ico-partial-transparent-8bpp.png  | Bin 0 -> 983 bytes
 .../ico/ico-bmp-8bpp/ico-size-15x15-8bpp.ico       | Bin 0 -> 1386 bytes
 .../ico/ico-bmp-8bpp/ico-size-15x15-8bpp.png       | Bin 0 -> 809 bytes
 .../ico/ico-bmp-8bpp/ico-size-16x16-8bpp.ico       | Bin 0 -> 1406 bytes
 .../ico/ico-bmp-8bpp/ico-size-16x16-8bpp.png       | Bin 0 -> 903 bytes
 .../ico/ico-bmp-8bpp/ico-size-17x17-8bpp.ico       | Bin 0 -> 1494 bytes
 .../ico/ico-bmp-8bpp/ico-size-17x17-8bpp.png       | Bin 0 -> 964 bytes
 .../reftest/ico/ico-bmp-8bpp/ico-size-1x1-8bpp.ico | Bin 0 -> 1094 bytes
 .../reftest/ico/ico-bmp-8bpp/ico-size-1x1-8bpp.png | Bin 0 -> 70 bytes
 .../ico/ico-bmp-8bpp/ico-size-256x256-8bpp.ico     | Bin 0 -> 74814 bytes
 .../ico/ico-bmp-8bpp/ico-size-256x256-8bpp.png     | Bin 0 -> 22443 bytes
 .../reftest/ico/ico-bmp-8bpp/ico-size-2x2-8bpp.ico | Bin 0 -> 1102 bytes
 .../reftest/ico/ico-bmp-8bpp/ico-size-2x2-8bpp.png | Bin 0 -> 83 bytes
 .../ico/ico-bmp-8bpp/ico-size-31x31-8bpp.ico       | Bin 0 -> 2238 bytes
 .../ico/ico-bmp-8bpp/ico-size-31x31-8bpp.png       | Bin 0 -> 1546 bytes
 .../ico/ico-bmp-8bpp/ico-size-32x32-8bpp.ico       | Bin 0 -> 2238 bytes
 .../ico/ico-bmp-8bpp/ico-size-32x32-8bpp.png       | Bin 0 -> 1530 bytes
 .../ico/ico-bmp-8bpp/ico-size-33x33-8bpp.ico       | Bin 0 -> 2538 bytes
 .../ico/ico-bmp-8bpp/ico-size-33x33-8bpp.png       | Bin 0 -> 1632 bytes
 .../reftest/ico/ico-bmp-8bpp/ico-size-3x3-8bpp.ico | Bin 0 -> 1110 bytes
 .../reftest/ico/ico-bmp-8bpp/ico-size-3x3-8bpp.png | Bin 0 -> 107 bytes
 .../reftest/ico/ico-bmp-8bpp/ico-size-4x4-8bpp.ico | Bin 0 -> 1118 bytes
 .../reftest/ico/ico-bmp-8bpp/ico-size-4x4-8bpp.png | Bin 0 -> 136 bytes
 .../reftest/ico/ico-bmp-8bpp/ico-size-5x5-8bpp.ico | Bin 0 -> 1146 bytes
 .../reftest/ico/ico-bmp-8bpp/ico-size-5x5-8bpp.png | Bin 0 -> 173 bytes
 .../reftest/ico/ico-bmp-8bpp/ico-size-6x6-8bpp.ico | Bin 0 -> 1158 bytes
 .../reftest/ico/ico-bmp-8bpp/ico-size-6x6-8bpp.png | Bin 0 -> 218 bytes
 .../reftest/ico/ico-bmp-8bpp/ico-size-7x7-8bpp.ico | Bin 0 -> 1170 bytes
 .../reftest/ico/ico-bmp-8bpp/ico-size-7x7-8bpp.png | Bin 0 -> 271 bytes
 .../reftest/ico/ico-bmp-8bpp/ico-size-8x8-8bpp.ico | Bin 0 -> 286 bytes
 .../reftest/ico/ico-bmp-8bpp/ico-size-8x8-8bpp.png | Bin 0 -> 313 bytes
 .../reftest/ico/ico-bmp-8bpp/ico-size-9x9-8bpp.ico | Bin 0 -> 1230 bytes
 .../reftest/ico/ico-bmp-8bpp/ico-size-9x9-8bpp.png | Bin 0 -> 368 bytes
 .../ico/ico-bmp-8bpp/ico-transparent-8bpp.ico      | Bin 0 -> 3262 bytes
 .../ico/ico-bmp-8bpp/ico-transparent-8bpp.png      | Bin 0 -> 195 bytes
 image/test/reftest/ico/ico-bmp-8bpp/reftest.list   |  23 ++++++
 image/test/reftest/ico/ico-bmp-corrupted/16x16.png | Bin 0 -> 879 bytes
 .../reftest/ico/ico-bmp-corrupted/invalid-bpp.ico  | Bin 0 -> 86 bytes
 .../ico-bmp-corrupted/invalid-compression-RLE4.ico | Bin 0 -> 86 bytes
 .../ico-bmp-corrupted/invalid-compression-RLE8.ico | Bin 0 -> 86 bytes
 .../ico/ico-bmp-corrupted/invalid-compression.ico  | Bin 0 -> 830 bytes
 .../reftest/ico/ico-bmp-corrupted/reftest.list     |  10 +++
 .../reftest/ico/ico-bmp-corrupted/wrapper.html     |  80 +++++++++++++++++++++
 image/test/reftest/ico/ico-mixed/mixed-bmp-png.ico | Bin 0 -> 17542 bytes
 image/test/reftest/ico/ico-mixed/mixed-bmp-png.png | Bin 0 -> 629 bytes
 .../test/reftest/ico/ico-mixed/mixed-bmp-png32.png | Bin 0 -> 940 bytes
 .../test/reftest/ico/ico-mixed/mixed-bmp-png48.png | Bin 0 -> 1332 bytes
 image/test/reftest/ico/ico-mixed/reftest.list      |   3 +
 .../reftest/ico/ico-png/corrupted_x00n0g01.ico     | Bin 0 -> 71 bytes
 .../reftest/ico/ico-png/corrupted_xxcrn0g04.ico    | Bin 0 -> 283 bytes
 .../reftest/ico/ico-png/ico-size-15x15-png.ico     | Bin 0 -> 831 bytes
 .../reftest/ico/ico-png/ico-size-15x15-png.png     | Bin 0 -> 809 bytes
 .../reftest/ico/ico-png/ico-size-16x16-png.ico     | Bin 0 -> 901 bytes
 .../reftest/ico/ico-png/ico-size-16x16-png.png     | Bin 0 -> 879 bytes
 .../reftest/ico/ico-png/ico-size-17x17-png.ico     | Bin 0 -> 1022 bytes
 .../reftest/ico/ico-png/ico-size-17x17-png.png     | Bin 0 -> 1000 bytes
 .../test/reftest/ico/ico-png/ico-size-1x1-png.ico  | Bin 0 -> 92 bytes
 .../test/reftest/ico/ico-png/ico-size-1x1-png.png  | Bin 0 -> 70 bytes
 .../reftest/ico/ico-png/ico-size-256x256-png.ico   | Bin 0 -> 5934 bytes
 .../reftest/ico/ico-png/ico-size-256x256-png.png   | Bin 0 -> 5912 bytes
 .../test/reftest/ico/ico-png/ico-size-2x2-png.ico  | Bin 0 -> 105 bytes
 .../test/reftest/ico/ico-png/ico-size-2x2-png.png  | Bin 0 -> 83 bytes
 .../reftest/ico/ico-png/ico-size-31x31-png.ico     | Bin 0 -> 2958 bytes
 .../reftest/ico/ico-png/ico-size-31x31-png.png     | Bin 0 -> 2936 bytes
 .../reftest/ico/ico-png/ico-size-32x32-png.ico     | Bin 0 -> 3128 bytes
 .../reftest/ico/ico-png/ico-size-32x32-png.png     | Bin 0 -> 3106 bytes
 .../reftest/ico/ico-png/ico-size-33x33-png.ico     | Bin 0 -> 3325 bytes
 .../reftest/ico/ico-png/ico-size-33x33-png.png     | Bin 0 -> 3303 bytes
 .../test/reftest/ico/ico-png/ico-size-3x3-png.ico  | Bin 0 -> 129 bytes
 .../test/reftest/ico/ico-png/ico-size-3x3-png.png  | Bin 0 -> 107 bytes
 .../test/reftest/ico/ico-png/ico-size-4x4-png.ico  | Bin 0 -> 158 bytes
 .../test/reftest/ico/ico-png/ico-size-4x4-png.png  | Bin 0 -> 136 bytes
 .../test/reftest/ico/ico-png/ico-size-5x5-png.ico  | Bin 0 -> 195 bytes
 .../test/reftest/ico/ico-png/ico-size-5x5-png.png  | Bin 0 -> 173 bytes
 .../test/reftest/ico/ico-png/ico-size-6x6-png.ico  | Bin 0 -> 240 bytes
 .../test/reftest/ico/ico-png/ico-size-6x6-png.png  | Bin 0 -> 218 bytes
 .../test/reftest/ico/ico-png/ico-size-7x7-png.ico  | Bin 0 -> 293 bytes
 .../test/reftest/ico/ico-png/ico-size-7x7-png.png  | Bin 0 -> 271 bytes
 .../test/reftest/ico/ico-png/ico-size-8x8-png.ico  | Bin 0 -> 335 bytes
 .../test/reftest/ico/ico-png/ico-size-8x8-png.png  | Bin 0 -> 313 bytes
 .../test/reftest/ico/ico-png/ico-size-9x9-png.ico  | Bin 0 -> 390 bytes
 .../test/reftest/ico/ico-png/ico-size-9x9-png.png  | Bin 0 -> 368 bytes
 image/test/reftest/ico/ico-png/reftest.list        |  29 ++++++++
 image/test/reftest/ico/ico-png/tmp.ico             | Bin 0 -> 1150 bytes
 image/test/reftest/ico/ico-png/transparent-png.ico | Bin 0 -> 1150 bytes
 image/test/reftest/ico/ico-png/transparent-png.png | Bin 0 -> 699 bytes
 image/test/reftest/ico/ico-png/wrapper.html        |  28 ++++++++
 image/test/reftest/ico/ico-png/x00n0g01.png        | Bin 0 -> 49 bytes
 image/test/reftest/ico/ico-png/xcrn0g04.png        | Bin 0 -> 261 bytes
 image/test/reftest/ico/reftest.list                |  11 +++
 253 files changed, 307 insertions(+)
 create mode 100644 image/test/reftest/ico/cur/pointer.cur
 create mode 100644 image/test/reftest/ico/cur/pointer.png
 create mode 100644 image/test/reftest/ico/cur/reftest.list
 create mode 100644 image/test/reftest/ico/cur/wrapper.html
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-not-square-transparent-1bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-not-square-transparent-1bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-partial-transparent-1bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-partial-transparent-1bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-15x15-1bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-15x15-1bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-16x16-1bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-16x16-1bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-17x17-1bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-17x17-1bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-1x1-1bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-1x1-1bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-256x256-1bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-256x256-1bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-2x2-1bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-2x2-1bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-31x31-1bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-31x31-1bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-32x32-1bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-32x32-1bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-33x33-1bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-33x33-1bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-3x3-1bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-3x3-1bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-4x4-1bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-4x4-1bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-5x5-1bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-5x5-1bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-6x6-1bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-6x6-1bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-7x7-1bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-7x7-1bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-8x8-1bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-8x8-1bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-9x9-1bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-size-9x9-1bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-transparent-1bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/ico-transparent-1bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-1bpp/reftest.list
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-not-square-transparent-24bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-not-square-transparent-24bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-partial-transparent-24bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-partial-transparent-24bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-15x15-24bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-15x15-24bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-16x16-24bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-16x16-24bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-17x17-24bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-17x17-24bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-1x1-24bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-1x1-24bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-256x256-24bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-256x256-24bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-2x2-24bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-2x2-24bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-31x31-24bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-31x31-24bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-32x32-24bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-32x32-24bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-33x33-24bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-33x33-24bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-3x3-24bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-3x3-24bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-4x4-24bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-4x4-24bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-5x5-24bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-5x5-24bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-6x6-24bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-6x6-24bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-7x7-24bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-7x7-24bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-8x8-24bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-8x8-24bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-9x9-24bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-size-9x9-24bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-transparent-24bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/ico-transparent-24bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-24bpp/reftest.list
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-not-square-transparent-32bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-not-square-transparent-32bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-partial-transparent-32bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-partial-transparent-32bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-15x15-32bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-15x15-32bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-16x16-32bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-16x16-32bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-17x17-32bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-17x17-32bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-1x1-32bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-1x1-32bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-256x256-32bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-256x256-32bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-2x2-32bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-2x2-32bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-31x31-32bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-31x31-32bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-32x32-32bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-32x32-32bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-33x33-32bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-33x33-32bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-3x3-32bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-3x3-32bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-4x4-32bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-4x4-32bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-5x5-32bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-5x5-32bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-6x6-32bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-6x6-32bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-7x7-32bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-7x7-32bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-8x8-32bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-8x8-32bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-9x9-32bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-size-9x9-32bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-transparent-32bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/ico-transparent-32bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-32bpp/reftest.list
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-not-square-transparent-4bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-not-square-transparent-4bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-partial-transparent-4bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-partial-transparent-4bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-15x15-4bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-15x15-4bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-16x16-4bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-16x16-4bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-17x17-4bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-17x17-4bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-1x1-4bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-1x1-4bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-256x256-4bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-256x256-4bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-2x2-4bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-2x2-4bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-31x31-4bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-31x31-4bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-32x32-4bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-32x32-4bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-33x33-4bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-33x33-4bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-3x3-4bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-3x3-4bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-4x4-4bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-4x4-4bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-5x5-4bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-5x5-4bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-6x6-4bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-6x6-4bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-7x7-4bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-7x7-4bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-8x8-4bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-8x8-4bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-9x9-4bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-size-9x9-4bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-transparent-4bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/ico-transparent-4bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-4bpp/reftest.list
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-not-square-transparent-8bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-not-square-transparent-8bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-partial-transparent-8bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-partial-transparent-8bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-15x15-8bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-15x15-8bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-16x16-8bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-16x16-8bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-17x17-8bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-17x17-8bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-1x1-8bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-1x1-8bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-256x256-8bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-256x256-8bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-2x2-8bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-2x2-8bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-31x31-8bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-31x31-8bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-32x32-8bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-32x32-8bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-33x33-8bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-33x33-8bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-3x3-8bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-3x3-8bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-4x4-8bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-4x4-8bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-5x5-8bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-5x5-8bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-6x6-8bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-6x6-8bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-7x7-8bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-7x7-8bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-8x8-8bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-8x8-8bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-9x9-8bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-size-9x9-8bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-transparent-8bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/ico-transparent-8bpp.png
 create mode 100644 image/test/reftest/ico/ico-bmp-8bpp/reftest.list
 create mode 100644 image/test/reftest/ico/ico-bmp-corrupted/16x16.png
 create mode 100644 image/test/reftest/ico/ico-bmp-corrupted/invalid-bpp.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-corrupted/invalid-compression-RLE4.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-corrupted/invalid-compression-RLE8.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-corrupted/invalid-compression.ico
 create mode 100644 image/test/reftest/ico/ico-bmp-corrupted/reftest.list
 create mode 100644 image/test/reftest/ico/ico-bmp-corrupted/wrapper.html
 create mode 100644 image/test/reftest/ico/ico-mixed/mixed-bmp-png.ico
 create mode 100644 image/test/reftest/ico/ico-mixed/mixed-bmp-png.png
 create mode 100644 image/test/reftest/ico/ico-mixed/mixed-bmp-png32.png
 create mode 100644 image/test/reftest/ico/ico-mixed/mixed-bmp-png48.png
 create mode 100644 image/test/reftest/ico/ico-mixed/reftest.list
 create mode 100644 image/test/reftest/ico/ico-png/corrupted_x00n0g01.ico
 create mode 100644 image/test/reftest/ico/ico-png/corrupted_xxcrn0g04.ico
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-15x15-png.ico
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-15x15-png.png
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-16x16-png.ico
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-16x16-png.png
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-17x17-png.ico
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-17x17-png.png
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-1x1-png.ico
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-1x1-png.png
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-256x256-png.ico
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-256x256-png.png
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-2x2-png.ico
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-2x2-png.png
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-31x31-png.ico
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-31x31-png.png
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-32x32-png.ico
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-32x32-png.png
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-33x33-png.ico
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-33x33-png.png
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-3x3-png.ico
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-3x3-png.png
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-4x4-png.ico
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-4x4-png.png
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-5x5-png.ico
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-5x5-png.png
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-6x6-png.ico
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-6x6-png.png
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-7x7-png.ico
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-7x7-png.png
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-8x8-png.ico
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-8x8-png.png
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-9x9-png.ico
 create mode 100644 image/test/reftest/ico/ico-png/ico-size-9x9-png.png
 create mode 100644 image/test/reftest/ico/ico-png/reftest.list
 create mode 100644 image/test/reftest/ico/ico-png/tmp.ico
 create mode 100644 image/test/reftest/ico/ico-png/transparent-png.ico
 create mode 100644 image/test/reftest/ico/ico-png/transparent-png.png
 create mode 100644 image/test/reftest/ico/ico-png/wrapper.html
 create mode 100644 image/test/reftest/ico/ico-png/x00n0g01.png
 create mode 100644 image/test/reftest/ico/ico-png/xcrn0g04.png
 create mode 100644 image/test/reftest/ico/reftest.list

(limited to 'image/test/reftest/ico')

diff --git a/image/test/reftest/ico/cur/pointer.cur b/image/test/reftest/ico/cur/pointer.cur
new file mode 100644
index 0000000000..025ebaed1f
Binary files /dev/null and b/image/test/reftest/ico/cur/pointer.cur differ
diff --git a/image/test/reftest/ico/cur/pointer.png b/image/test/reftest/ico/cur/pointer.png
new file mode 100644
index 0000000000..84ad8f3fbd
Binary files /dev/null and b/image/test/reftest/ico/cur/pointer.png differ
diff --git a/image/test/reftest/ico/cur/reftest.list b/image/test/reftest/ico/cur/reftest.list
new file mode 100644
index 0000000000..635136506b
--- /dev/null
+++ b/image/test/reftest/ico/cur/reftest.list
@@ -0,0 +1,4 @@
+# ICO BMP and PNG mixed tests
+
+== wrapper.html?pointer.cur wrapper.html?pointer.png
+
diff --git a/image/test/reftest/ico/cur/wrapper.html b/image/test/reftest/ico/cur/wrapper.html
new file mode 100644
index 0000000000..45b5167754
--- /dev/null
+++ b/image/test/reftest/ico/cur/wrapper.html
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<head>
+<title>Image reftest wrapper</title>
+<style type="text/css">
+  #image1 { background-color: rgb(10, 100, 250); }
+</style>
+<script>
+  // The image is loaded async after the page loads
+  // wait for it to finish loading
+  function onImageLoad() { 
+    document.documentElement.removeAttribute("class");
+  };
+</script>
+</head>
+<body>
+<!-- non-empty alt to avoid the broken image icon -->
+<img id="image1" alt=" ">
+<script>
+  // Use as "wrapper.html?image.png
+  var imgURL = document.location.search.substr(1);
+  document.images[0].onload = onImageLoad;
+  document.images[0].onerror = onImageLoad;
+  document.images[0].src = imgURL;
+</script>
+</body>
+</html>
+
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-not-square-transparent-1bpp.ico b/image/test/reftest/ico/ico-bmp-1bpp/ico-not-square-transparent-1bpp.ico
new file mode 100644
index 0000000000..0f51d504af
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-not-square-transparent-1bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-not-square-transparent-1bpp.png b/image/test/reftest/ico/ico-bmp-1bpp/ico-not-square-transparent-1bpp.png
new file mode 100644
index 0000000000..152b30d716
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-not-square-transparent-1bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-partial-transparent-1bpp.ico b/image/test/reftest/ico/ico-bmp-1bpp/ico-partial-transparent-1bpp.ico
new file mode 100644
index 0000000000..def2a4ece7
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-partial-transparent-1bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-partial-transparent-1bpp.png b/image/test/reftest/ico/ico-bmp-1bpp/ico-partial-transparent-1bpp.png
new file mode 100644
index 0000000000..064a68bb2e
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-partial-transparent-1bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-15x15-1bpp.ico b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-15x15-1bpp.ico
new file mode 100644
index 0000000000..b68cf0ef0d
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-15x15-1bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-15x15-1bpp.png b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-15x15-1bpp.png
new file mode 100644
index 0000000000..956c78ece6
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-15x15-1bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-16x16-1bpp.ico b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-16x16-1bpp.ico
new file mode 100644
index 0000000000..d96a4a0e1d
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-16x16-1bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-16x16-1bpp.png b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-16x16-1bpp.png
new file mode 100644
index 0000000000..90088351fa
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-16x16-1bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-17x17-1bpp.ico b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-17x17-1bpp.ico
new file mode 100644
index 0000000000..4f10ad13c0
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-17x17-1bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-17x17-1bpp.png b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-17x17-1bpp.png
new file mode 100644
index 0000000000..9a294696c4
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-17x17-1bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-1x1-1bpp.ico b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-1x1-1bpp.ico
new file mode 100644
index 0000000000..5af8bef61a
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-1x1-1bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-1x1-1bpp.png b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-1x1-1bpp.png
new file mode 100644
index 0000000000..7a07a124ea
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-1x1-1bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-256x256-1bpp.ico b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-256x256-1bpp.ico
new file mode 100644
index 0000000000..63d95e3b7c
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-256x256-1bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-256x256-1bpp.png b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-256x256-1bpp.png
new file mode 100644
index 0000000000..0a23d8c8ee
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-256x256-1bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-2x2-1bpp.ico b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-2x2-1bpp.ico
new file mode 100644
index 0000000000..09c140f1b1
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-2x2-1bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-2x2-1bpp.png b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-2x2-1bpp.png
new file mode 100644
index 0000000000..3b09f80769
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-2x2-1bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-31x31-1bpp.ico b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-31x31-1bpp.ico
new file mode 100644
index 0000000000..bbfc3165ab
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-31x31-1bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-31x31-1bpp.png b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-31x31-1bpp.png
new file mode 100644
index 0000000000..d1fe6ddeee
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-31x31-1bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-32x32-1bpp.ico b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-32x32-1bpp.ico
new file mode 100644
index 0000000000..279ecb8358
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-32x32-1bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-32x32-1bpp.png b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-32x32-1bpp.png
new file mode 100644
index 0000000000..078d3dc5d0
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-32x32-1bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-33x33-1bpp.ico b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-33x33-1bpp.ico
new file mode 100644
index 0000000000..fa1862c1ca
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-33x33-1bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-33x33-1bpp.png b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-33x33-1bpp.png
new file mode 100644
index 0000000000..e64e12b2aa
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-33x33-1bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-3x3-1bpp.ico b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-3x3-1bpp.ico
new file mode 100644
index 0000000000..733b1f12bc
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-3x3-1bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-3x3-1bpp.png b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-3x3-1bpp.png
new file mode 100644
index 0000000000..b8519a8749
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-3x3-1bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-4x4-1bpp.ico b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-4x4-1bpp.ico
new file mode 100644
index 0000000000..ba3097cecd
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-4x4-1bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-4x4-1bpp.png b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-4x4-1bpp.png
new file mode 100644
index 0000000000..3977b54548
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-4x4-1bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-5x5-1bpp.ico b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-5x5-1bpp.ico
new file mode 100644
index 0000000000..52e32df27b
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-5x5-1bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-5x5-1bpp.png b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-5x5-1bpp.png
new file mode 100644
index 0000000000..caa9246b67
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-5x5-1bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-6x6-1bpp.ico b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-6x6-1bpp.ico
new file mode 100644
index 0000000000..c29651400f
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-6x6-1bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-6x6-1bpp.png b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-6x6-1bpp.png
new file mode 100644
index 0000000000..30e1b0249d
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-6x6-1bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-7x7-1bpp.ico b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-7x7-1bpp.ico
new file mode 100644
index 0000000000..8ce9915c44
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-7x7-1bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-7x7-1bpp.png b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-7x7-1bpp.png
new file mode 100644
index 0000000000..9dbaae84cb
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-7x7-1bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-8x8-1bpp.ico b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-8x8-1bpp.ico
new file mode 100644
index 0000000000..485dff028a
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-8x8-1bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-8x8-1bpp.png b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-8x8-1bpp.png
new file mode 100644
index 0000000000..2201388408
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-8x8-1bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-9x9-1bpp.ico b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-9x9-1bpp.ico
new file mode 100644
index 0000000000..38f34ec50a
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-9x9-1bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-size-9x9-1bpp.png b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-9x9-1bpp.png
new file mode 100644
index 0000000000..7fe1b548b8
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-size-9x9-1bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-transparent-1bpp.ico b/image/test/reftest/ico/ico-bmp-1bpp/ico-transparent-1bpp.ico
new file mode 100644
index 0000000000..8e361306c5
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-transparent-1bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/ico-transparent-1bpp.png b/image/test/reftest/ico/ico-bmp-1bpp/ico-transparent-1bpp.png
new file mode 100644
index 0000000000..062152e3b1
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-1bpp/ico-transparent-1bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-1bpp/reftest.list b/image/test/reftest/ico/ico-bmp-1bpp/reftest.list
new file mode 100644
index 0000000000..1b9ca1348a
--- /dev/null
+++ b/image/test/reftest/ico/ico-bmp-1bpp/reftest.list
@@ -0,0 +1,23 @@
+# ICO BMP 1BPP tests
+
+# Images of various sizes
+== ico-size-1x1-1bpp.ico   ico-size-1x1-1bpp.png
+== ico-size-2x2-1bpp.ico   ico-size-2x2-1bpp.png
+== ico-size-3x3-1bpp.ico   ico-size-3x3-1bpp.png
+== ico-size-4x4-1bpp.ico   ico-size-4x4-1bpp.png
+== ico-size-5x5-1bpp.ico   ico-size-5x5-1bpp.png
+== ico-size-6x6-1bpp.ico   ico-size-6x6-1bpp.png
+== ico-size-7x7-1bpp.ico   ico-size-7x7-1bpp.png
+== ico-size-8x8-1bpp.ico   ico-size-8x8-1bpp.png
+== ico-size-9x9-1bpp.ico   ico-size-9x9-1bpp.png
+== ico-size-15x15-1bpp.ico ico-size-15x15-1bpp.png
+== ico-size-16x16-1bpp.ico ico-size-16x16-1bpp.png
+== ico-size-17x17-1bpp.ico ico-size-17x17-1bpp.png
+== ico-size-31x31-1bpp.ico ico-size-31x31-1bpp.png
+== ico-size-32x32-1bpp.ico ico-size-32x32-1bpp.png
+== ico-size-33x33-1bpp.ico ico-size-33x33-1bpp.png
+== ico-size-256x256-1bpp.ico ico-size-256x256-1bpp.png
+== ico-partial-transparent-1bpp.ico ico-partial-transparent-1bpp.png
+== ico-transparent-1bpp.ico ico-transparent-1bpp.png
+== ico-not-square-transparent-1bpp.ico ico-not-square-transparent-1bpp.png
+
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-not-square-transparent-24bpp.ico b/image/test/reftest/ico/ico-bmp-24bpp/ico-not-square-transparent-24bpp.ico
new file mode 100644
index 0000000000..16d6584ef8
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-not-square-transparent-24bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-not-square-transparent-24bpp.png b/image/test/reftest/ico/ico-bmp-24bpp/ico-not-square-transparent-24bpp.png
new file mode 100644
index 0000000000..a881048b96
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-not-square-transparent-24bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-partial-transparent-24bpp.ico b/image/test/reftest/ico/ico-bmp-24bpp/ico-partial-transparent-24bpp.ico
new file mode 100644
index 0000000000..ab0dc4bce1
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-partial-transparent-24bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-partial-transparent-24bpp.png b/image/test/reftest/ico/ico-bmp-24bpp/ico-partial-transparent-24bpp.png
new file mode 100644
index 0000000000..0363210c74
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-partial-transparent-24bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-15x15-24bpp.ico b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-15x15-24bpp.ico
new file mode 100644
index 0000000000..8721b0d169
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-15x15-24bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-15x15-24bpp.png b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-15x15-24bpp.png
new file mode 100644
index 0000000000..e1287430d0
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-15x15-24bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-16x16-24bpp.ico b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-16x16-24bpp.ico
new file mode 100644
index 0000000000..04e4736189
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-16x16-24bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-16x16-24bpp.png b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-16x16-24bpp.png
new file mode 100644
index 0000000000..c04869e728
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-16x16-24bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-17x17-24bpp.ico b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-17x17-24bpp.ico
new file mode 100644
index 0000000000..308ccb7a61
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-17x17-24bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-17x17-24bpp.png b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-17x17-24bpp.png
new file mode 100644
index 0000000000..00fb8e4f37
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-17x17-24bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-1x1-24bpp.ico b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-1x1-24bpp.ico
new file mode 100644
index 0000000000..e2bf90c093
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-1x1-24bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-1x1-24bpp.png b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-1x1-24bpp.png
new file mode 100644
index 0000000000..c05f5fef89
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-1x1-24bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-256x256-24bpp.ico b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-256x256-24bpp.ico
new file mode 100644
index 0000000000..c3977400a4
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-256x256-24bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-256x256-24bpp.png b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-256x256-24bpp.png
new file mode 100644
index 0000000000..84bfada761
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-256x256-24bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-2x2-24bpp.ico b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-2x2-24bpp.ico
new file mode 100644
index 0000000000..dba180a07a
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-2x2-24bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-2x2-24bpp.png b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-2x2-24bpp.png
new file mode 100644
index 0000000000..e512d3f9b4
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-2x2-24bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-31x31-24bpp.ico b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-31x31-24bpp.ico
new file mode 100644
index 0000000000..aa67502f61
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-31x31-24bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-31x31-24bpp.png b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-31x31-24bpp.png
new file mode 100644
index 0000000000..e4a8642514
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-31x31-24bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-32x32-24bpp.ico b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-32x32-24bpp.ico
new file mode 100644
index 0000000000..a85b871c5e
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-32x32-24bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-32x32-24bpp.png b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-32x32-24bpp.png
new file mode 100644
index 0000000000..3a6fbe8ee9
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-32x32-24bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-33x33-24bpp.ico b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-33x33-24bpp.ico
new file mode 100644
index 0000000000..a5c49374de
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-33x33-24bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-33x33-24bpp.png b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-33x33-24bpp.png
new file mode 100644
index 0000000000..72ef7eb636
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-33x33-24bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-3x3-24bpp.ico b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-3x3-24bpp.ico
new file mode 100644
index 0000000000..8a0b9433f4
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-3x3-24bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-3x3-24bpp.png b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-3x3-24bpp.png
new file mode 100644
index 0000000000..cb42ec4f87
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-3x3-24bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-4x4-24bpp.ico b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-4x4-24bpp.ico
new file mode 100644
index 0000000000..feb3f11e16
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-4x4-24bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-4x4-24bpp.png b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-4x4-24bpp.png
new file mode 100644
index 0000000000..e6afafd89a
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-4x4-24bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-5x5-24bpp.ico b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-5x5-24bpp.ico
new file mode 100644
index 0000000000..d607ca5724
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-5x5-24bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-5x5-24bpp.png b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-5x5-24bpp.png
new file mode 100644
index 0000000000..a844aff76d
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-5x5-24bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-6x6-24bpp.ico b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-6x6-24bpp.ico
new file mode 100644
index 0000000000..62a231602c
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-6x6-24bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-6x6-24bpp.png b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-6x6-24bpp.png
new file mode 100644
index 0000000000..415c2d9c6a
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-6x6-24bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-7x7-24bpp.ico b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-7x7-24bpp.ico
new file mode 100644
index 0000000000..d884ecfd77
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-7x7-24bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-7x7-24bpp.png b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-7x7-24bpp.png
new file mode 100644
index 0000000000..ab2f892747
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-7x7-24bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-8x8-24bpp.ico b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-8x8-24bpp.ico
new file mode 100644
index 0000000000..782ae220df
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-8x8-24bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-8x8-24bpp.png b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-8x8-24bpp.png
new file mode 100644
index 0000000000..fe2ff40a1d
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-8x8-24bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-9x9-24bpp.ico b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-9x9-24bpp.ico
new file mode 100644
index 0000000000..97992643b6
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-9x9-24bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-size-9x9-24bpp.png b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-9x9-24bpp.png
new file mode 100644
index 0000000000..18ab4b25de
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-size-9x9-24bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-transparent-24bpp.ico b/image/test/reftest/ico/ico-bmp-24bpp/ico-transparent-24bpp.ico
new file mode 100644
index 0000000000..8e361306c5
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-transparent-24bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/ico-transparent-24bpp.png b/image/test/reftest/ico/ico-bmp-24bpp/ico-transparent-24bpp.png
new file mode 100644
index 0000000000..062152e3b1
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-24bpp/ico-transparent-24bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-24bpp/reftest.list b/image/test/reftest/ico/ico-bmp-24bpp/reftest.list
new file mode 100644
index 0000000000..8772936603
--- /dev/null
+++ b/image/test/reftest/ico/ico-bmp-24bpp/reftest.list
@@ -0,0 +1,23 @@
+# ICO BMP 24BPP tests
+
+# Images of various sizes
+== ico-size-1x1-24bpp.ico   ico-size-1x1-24bpp.png
+== ico-size-2x2-24bpp.ico   ico-size-2x2-24bpp.png
+== ico-size-3x3-24bpp.ico   ico-size-3x3-24bpp.png
+== ico-size-4x4-24bpp.ico   ico-size-4x4-24bpp.png
+== ico-size-5x5-24bpp.ico   ico-size-5x5-24bpp.png
+== ico-size-6x6-24bpp.ico   ico-size-6x6-24bpp.png
+== ico-size-7x7-24bpp.ico   ico-size-7x7-24bpp.png
+== ico-size-8x8-24bpp.ico   ico-size-8x8-24bpp.png
+== ico-size-9x9-24bpp.ico   ico-size-9x9-24bpp.png
+== ico-size-15x15-24bpp.ico ico-size-15x15-24bpp.png
+== ico-size-16x16-24bpp.ico ico-size-16x16-24bpp.png
+== ico-size-17x17-24bpp.ico ico-size-17x17-24bpp.png
+== ico-size-31x31-24bpp.ico ico-size-31x31-24bpp.png
+== ico-size-32x32-24bpp.ico ico-size-32x32-24bpp.png
+== ico-size-33x33-24bpp.ico ico-size-33x33-24bpp.png
+== ico-size-256x256-24bpp.ico ico-size-256x256-24bpp.png
+== ico-partial-transparent-24bpp.ico ico-partial-transparent-24bpp.png
+== ico-transparent-24bpp.ico ico-transparent-24bpp.png
+== ico-not-square-transparent-24bpp.ico ico-not-square-transparent-24bpp.png
+
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-not-square-transparent-32bpp.ico b/image/test/reftest/ico/ico-bmp-32bpp/ico-not-square-transparent-32bpp.ico
new file mode 100644
index 0000000000..dd0299c413
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-not-square-transparent-32bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-not-square-transparent-32bpp.png b/image/test/reftest/ico/ico-bmp-32bpp/ico-not-square-transparent-32bpp.png
new file mode 100644
index 0000000000..befc665552
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-not-square-transparent-32bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-partial-transparent-32bpp.ico b/image/test/reftest/ico/ico-bmp-32bpp/ico-partial-transparent-32bpp.ico
new file mode 100644
index 0000000000..8ad62f7d0e
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-partial-transparent-32bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-partial-transparent-32bpp.png b/image/test/reftest/ico/ico-bmp-32bpp/ico-partial-transparent-32bpp.png
new file mode 100644
index 0000000000..226ad6494f
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-partial-transparent-32bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-15x15-32bpp.ico b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-15x15-32bpp.ico
new file mode 100644
index 0000000000..1f1b6b51ce
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-15x15-32bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-15x15-32bpp.png b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-15x15-32bpp.png
new file mode 100644
index 0000000000..e1287430d0
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-15x15-32bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-16x16-32bpp.ico b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-16x16-32bpp.ico
new file mode 100644
index 0000000000..7a8f01529d
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-16x16-32bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-16x16-32bpp.png b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-16x16-32bpp.png
new file mode 100644
index 0000000000..c04869e728
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-16x16-32bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-17x17-32bpp.ico b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-17x17-32bpp.ico
new file mode 100644
index 0000000000..b92860be4f
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-17x17-32bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-17x17-32bpp.png b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-17x17-32bpp.png
new file mode 100644
index 0000000000..00fb8e4f37
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-17x17-32bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-1x1-32bpp.ico b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-1x1-32bpp.ico
new file mode 100644
index 0000000000..5ad60c575c
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-1x1-32bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-1x1-32bpp.png b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-1x1-32bpp.png
new file mode 100644
index 0000000000..c05f5fef89
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-1x1-32bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-256x256-32bpp.ico b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-256x256-32bpp.ico
new file mode 100644
index 0000000000..f8b530ef0b
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-256x256-32bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-256x256-32bpp.png b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-256x256-32bpp.png
new file mode 100644
index 0000000000..84bfada761
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-256x256-32bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-2x2-32bpp.ico b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-2x2-32bpp.ico
new file mode 100644
index 0000000000..e5b2bf7e76
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-2x2-32bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-2x2-32bpp.png b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-2x2-32bpp.png
new file mode 100644
index 0000000000..e512d3f9b4
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-2x2-32bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-31x31-32bpp.ico b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-31x31-32bpp.ico
new file mode 100644
index 0000000000..ddcbde85f4
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-31x31-32bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-31x31-32bpp.png b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-31x31-32bpp.png
new file mode 100644
index 0000000000..e4a8642514
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-31x31-32bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-32x32-32bpp.ico b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-32x32-32bpp.ico
new file mode 100644
index 0000000000..a89c016485
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-32x32-32bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-32x32-32bpp.png b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-32x32-32bpp.png
new file mode 100644
index 0000000000..3a6fbe8ee9
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-32x32-32bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-33x33-32bpp.ico b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-33x33-32bpp.ico
new file mode 100644
index 0000000000..cda9133f8b
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-33x33-32bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-33x33-32bpp.png b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-33x33-32bpp.png
new file mode 100644
index 0000000000..72ef7eb636
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-33x33-32bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-3x3-32bpp.ico b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-3x3-32bpp.ico
new file mode 100644
index 0000000000..3894ccf212
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-3x3-32bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-3x3-32bpp.png b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-3x3-32bpp.png
new file mode 100644
index 0000000000..cb42ec4f87
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-3x3-32bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-4x4-32bpp.ico b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-4x4-32bpp.ico
new file mode 100644
index 0000000000..828494c668
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-4x4-32bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-4x4-32bpp.png b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-4x4-32bpp.png
new file mode 100644
index 0000000000..e6afafd89a
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-4x4-32bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-5x5-32bpp.ico b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-5x5-32bpp.ico
new file mode 100644
index 0000000000..4f0a2bcc72
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-5x5-32bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-5x5-32bpp.png b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-5x5-32bpp.png
new file mode 100644
index 0000000000..a844aff76d
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-5x5-32bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-6x6-32bpp.ico b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-6x6-32bpp.ico
new file mode 100644
index 0000000000..5524769e60
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-6x6-32bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-6x6-32bpp.png b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-6x6-32bpp.png
new file mode 100644
index 0000000000..415c2d9c6a
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-6x6-32bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-7x7-32bpp.ico b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-7x7-32bpp.ico
new file mode 100644
index 0000000000..6aeebb898d
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-7x7-32bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-7x7-32bpp.png b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-7x7-32bpp.png
new file mode 100644
index 0000000000..ab2f892747
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-7x7-32bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-8x8-32bpp.ico b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-8x8-32bpp.ico
new file mode 100644
index 0000000000..824c744a20
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-8x8-32bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-8x8-32bpp.png b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-8x8-32bpp.png
new file mode 100644
index 0000000000..fe2ff40a1d
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-8x8-32bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-9x9-32bpp.ico b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-9x9-32bpp.ico
new file mode 100644
index 0000000000..cf1f6e9c88
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-9x9-32bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-size-9x9-32bpp.png b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-9x9-32bpp.png
new file mode 100644
index 0000000000..18ab4b25de
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-size-9x9-32bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-transparent-32bpp.ico b/image/test/reftest/ico/ico-bmp-32bpp/ico-transparent-32bpp.ico
new file mode 100644
index 0000000000..151b7cb361
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-transparent-32bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/ico-transparent-32bpp.png b/image/test/reftest/ico/ico-bmp-32bpp/ico-transparent-32bpp.png
new file mode 100644
index 0000000000..062152e3b1
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-32bpp/ico-transparent-32bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-32bpp/reftest.list b/image/test/reftest/ico/ico-bmp-32bpp/reftest.list
new file mode 100644
index 0000000000..e05355a2bf
--- /dev/null
+++ b/image/test/reftest/ico/ico-bmp-32bpp/reftest.list
@@ -0,0 +1,22 @@
+# ICO BMP 32BPP tests
+
+# Images of various sizes
+== ico-size-1x1-32bpp.ico   ico-size-1x1-32bpp.png
+== ico-size-2x2-32bpp.ico   ico-size-2x2-32bpp.png
+== ico-size-3x3-32bpp.ico   ico-size-3x3-32bpp.png
+== ico-size-4x4-32bpp.ico   ico-size-4x4-32bpp.png
+== ico-size-5x5-32bpp.ico   ico-size-5x5-32bpp.png
+== ico-size-6x6-32bpp.ico   ico-size-6x6-32bpp.png
+== ico-size-7x7-32bpp.ico   ico-size-7x7-32bpp.png
+== ico-size-8x8-32bpp.ico   ico-size-8x8-32bpp.png
+== ico-size-9x9-32bpp.ico   ico-size-9x9-32bpp.png
+== ico-size-15x15-32bpp.ico ico-size-15x15-32bpp.png
+== ico-size-16x16-32bpp.ico ico-size-16x16-32bpp.png
+== ico-size-17x17-32bpp.ico ico-size-17x17-32bpp.png
+== ico-size-31x31-32bpp.ico ico-size-31x31-32bpp.png
+== ico-size-32x32-32bpp.ico ico-size-32x32-32bpp.png
+== ico-size-33x33-32bpp.ico ico-size-33x33-32bpp.png
+== ico-size-256x256-32bpp.ico ico-size-256x256-32bpp.png
+== ico-partial-transparent-32bpp.ico ico-partial-transparent-32bpp.png
+== ico-transparent-32bpp.ico ico-transparent-32bpp.png
+== ico-not-square-transparent-32bpp.ico ico-not-square-transparent-32bpp.png
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-not-square-transparent-4bpp.ico b/image/test/reftest/ico/ico-bmp-4bpp/ico-not-square-transparent-4bpp.ico
new file mode 100644
index 0000000000..d502d2ef6b
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-not-square-transparent-4bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-not-square-transparent-4bpp.png b/image/test/reftest/ico/ico-bmp-4bpp/ico-not-square-transparent-4bpp.png
new file mode 100644
index 0000000000..3e556ad293
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-not-square-transparent-4bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-partial-transparent-4bpp.ico b/image/test/reftest/ico/ico-bmp-4bpp/ico-partial-transparent-4bpp.ico
new file mode 100644
index 0000000000..7bd3b8a69f
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-partial-transparent-4bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-partial-transparent-4bpp.png b/image/test/reftest/ico/ico-bmp-4bpp/ico-partial-transparent-4bpp.png
new file mode 100644
index 0000000000..9ff0ce41f7
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-partial-transparent-4bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-15x15-4bpp.ico b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-15x15-4bpp.ico
new file mode 100644
index 0000000000..de5c49e2a6
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-15x15-4bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-15x15-4bpp.png b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-15x15-4bpp.png
new file mode 100644
index 0000000000..5d4a3f9534
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-15x15-4bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-16x16-4bpp.ico b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-16x16-4bpp.ico
new file mode 100644
index 0000000000..b856b3f376
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-16x16-4bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-16x16-4bpp.png b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-16x16-4bpp.png
new file mode 100644
index 0000000000..d45d63f539
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-16x16-4bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-17x17-4bpp.ico b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-17x17-4bpp.ico
new file mode 100644
index 0000000000..44e055d2f7
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-17x17-4bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-17x17-4bpp.png b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-17x17-4bpp.png
new file mode 100644
index 0000000000..bf48903299
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-17x17-4bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-1x1-4bpp.ico b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-1x1-4bpp.ico
new file mode 100644
index 0000000000..fd46c328d5
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-1x1-4bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-1x1-4bpp.png b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-1x1-4bpp.png
new file mode 100644
index 0000000000..d41dd645b7
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-1x1-4bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-256x256-4bpp.ico b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-256x256-4bpp.ico
new file mode 100644
index 0000000000..6d28edaa8f
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-256x256-4bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-256x256-4bpp.png b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-256x256-4bpp.png
new file mode 100644
index 0000000000..3acdef8303
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-256x256-4bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-2x2-4bpp.ico b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-2x2-4bpp.ico
new file mode 100644
index 0000000000..7dc4afde68
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-2x2-4bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-2x2-4bpp.png b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-2x2-4bpp.png
new file mode 100644
index 0000000000..b2d6050415
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-2x2-4bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-31x31-4bpp.ico b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-31x31-4bpp.ico
new file mode 100644
index 0000000000..0471332d6b
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-31x31-4bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-31x31-4bpp.png b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-31x31-4bpp.png
new file mode 100644
index 0000000000..cb12a3448d
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-31x31-4bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-32x32-4bpp.ico b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-32x32-4bpp.ico
new file mode 100644
index 0000000000..ef005dc5bf
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-32x32-4bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-32x32-4bpp.png b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-32x32-4bpp.png
new file mode 100644
index 0000000000..58d867d120
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-32x32-4bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-33x33-4bpp.ico b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-33x33-4bpp.ico
new file mode 100644
index 0000000000..4c71963a49
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-33x33-4bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-33x33-4bpp.png b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-33x33-4bpp.png
new file mode 100644
index 0000000000..064fde198c
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-33x33-4bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-3x3-4bpp.ico b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-3x3-4bpp.ico
new file mode 100644
index 0000000000..aaa6350e96
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-3x3-4bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-3x3-4bpp.png b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-3x3-4bpp.png
new file mode 100644
index 0000000000..e34114d5c9
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-3x3-4bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-4x4-4bpp.ico b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-4x4-4bpp.ico
new file mode 100644
index 0000000000..767bebed41
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-4x4-4bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-4x4-4bpp.png b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-4x4-4bpp.png
new file mode 100644
index 0000000000..3efa555620
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-4x4-4bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-5x5-4bpp.ico b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-5x5-4bpp.ico
new file mode 100644
index 0000000000..309b6fe5b0
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-5x5-4bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-5x5-4bpp.png b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-5x5-4bpp.png
new file mode 100644
index 0000000000..02ebf57a51
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-5x5-4bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-6x6-4bpp.ico b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-6x6-4bpp.ico
new file mode 100644
index 0000000000..255fda6a84
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-6x6-4bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-6x6-4bpp.png b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-6x6-4bpp.png
new file mode 100644
index 0000000000..1f5769d09c
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-6x6-4bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-7x7-4bpp.ico b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-7x7-4bpp.ico
new file mode 100644
index 0000000000..1a39634526
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-7x7-4bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-7x7-4bpp.png b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-7x7-4bpp.png
new file mode 100644
index 0000000000..59a1b98b52
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-7x7-4bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-8x8-4bpp.ico b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-8x8-4bpp.ico
new file mode 100644
index 0000000000..40bc9f8937
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-8x8-4bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-8x8-4bpp.png b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-8x8-4bpp.png
new file mode 100644
index 0000000000..cf44f59676
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-8x8-4bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-9x9-4bpp.ico b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-9x9-4bpp.ico
new file mode 100644
index 0000000000..bda12f32b9
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-9x9-4bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-size-9x9-4bpp.png b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-9x9-4bpp.png
new file mode 100644
index 0000000000..2e07364135
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-size-9x9-4bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-transparent-4bpp.ico b/image/test/reftest/ico/ico-bmp-4bpp/ico-transparent-4bpp.ico
new file mode 100644
index 0000000000..8e361306c5
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-transparent-4bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/ico-transparent-4bpp.png b/image/test/reftest/ico/ico-bmp-4bpp/ico-transparent-4bpp.png
new file mode 100644
index 0000000000..062152e3b1
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-4bpp/ico-transparent-4bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-4bpp/reftest.list b/image/test/reftest/ico/ico-bmp-4bpp/reftest.list
new file mode 100644
index 0000000000..6caac4ac86
--- /dev/null
+++ b/image/test/reftest/ico/ico-bmp-4bpp/reftest.list
@@ -0,0 +1,23 @@
+# ICO BMP 4BPP tests
+
+# Images of various sizes
+== ico-size-1x1-4bpp.ico   ico-size-1x1-4bpp.png
+== ico-size-2x2-4bpp.ico   ico-size-2x2-4bpp.png
+== ico-size-3x3-4bpp.ico   ico-size-3x3-4bpp.png
+== ico-size-4x4-4bpp.ico   ico-size-4x4-4bpp.png
+== ico-size-5x5-4bpp.ico   ico-size-5x5-4bpp.png
+== ico-size-6x6-4bpp.ico   ico-size-6x6-4bpp.png
+== ico-size-7x7-4bpp.ico   ico-size-7x7-4bpp.png
+== ico-size-8x8-4bpp.ico   ico-size-8x8-4bpp.png
+== ico-size-9x9-4bpp.ico   ico-size-9x9-4bpp.png
+== ico-size-15x15-4bpp.ico ico-size-15x15-4bpp.png
+== ico-size-16x16-4bpp.ico ico-size-16x16-4bpp.png
+== ico-size-17x17-4bpp.ico ico-size-17x17-4bpp.png
+== ico-size-31x31-4bpp.ico ico-size-31x31-4bpp.png
+== ico-size-32x32-4bpp.ico ico-size-32x32-4bpp.png
+== ico-size-33x33-4bpp.ico ico-size-33x33-4bpp.png
+== ico-size-256x256-4bpp.ico ico-size-256x256-4bpp.png
+== ico-partial-transparent-4bpp.ico ico-partial-transparent-4bpp.png
+== ico-transparent-4bpp.ico ico-transparent-4bpp.png
+== ico-not-square-transparent-4bpp.ico ico-not-square-transparent-4bpp.png
+
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-not-square-transparent-8bpp.ico b/image/test/reftest/ico/ico-bmp-8bpp/ico-not-square-transparent-8bpp.ico
new file mode 100644
index 0000000000..d28b9a04ec
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-not-square-transparent-8bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-not-square-transparent-8bpp.png b/image/test/reftest/ico/ico-bmp-8bpp/ico-not-square-transparent-8bpp.png
new file mode 100644
index 0000000000..36a4eb5122
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-not-square-transparent-8bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-partial-transparent-8bpp.ico b/image/test/reftest/ico/ico-bmp-8bpp/ico-partial-transparent-8bpp.ico
new file mode 100644
index 0000000000..9074caa401
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-partial-transparent-8bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-partial-transparent-8bpp.png b/image/test/reftest/ico/ico-bmp-8bpp/ico-partial-transparent-8bpp.png
new file mode 100644
index 0000000000..6f990f2572
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-partial-transparent-8bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-15x15-8bpp.ico b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-15x15-8bpp.ico
new file mode 100644
index 0000000000..f3f3a13530
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-15x15-8bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-15x15-8bpp.png b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-15x15-8bpp.png
new file mode 100644
index 0000000000..e1287430d0
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-15x15-8bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-16x16-8bpp.ico b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-16x16-8bpp.ico
new file mode 100644
index 0000000000..24c20e23ec
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-16x16-8bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-16x16-8bpp.png b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-16x16-8bpp.png
new file mode 100644
index 0000000000..2e66b2e5f9
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-16x16-8bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-17x17-8bpp.ico b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-17x17-8bpp.ico
new file mode 100644
index 0000000000..7fa66b9b21
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-17x17-8bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-17x17-8bpp.png b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-17x17-8bpp.png
new file mode 100644
index 0000000000..4d11d7561c
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-17x17-8bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-1x1-8bpp.ico b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-1x1-8bpp.ico
new file mode 100644
index 0000000000..3cf3320eae
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-1x1-8bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-1x1-8bpp.png b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-1x1-8bpp.png
new file mode 100644
index 0000000000..c05f5fef89
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-1x1-8bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-256x256-8bpp.ico b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-256x256-8bpp.ico
new file mode 100644
index 0000000000..524b6f7c8e
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-256x256-8bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-256x256-8bpp.png b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-256x256-8bpp.png
new file mode 100644
index 0000000000..f367468c95
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-256x256-8bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-2x2-8bpp.ico b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-2x2-8bpp.ico
new file mode 100644
index 0000000000..95d8375a00
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-2x2-8bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-2x2-8bpp.png b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-2x2-8bpp.png
new file mode 100644
index 0000000000..e512d3f9b4
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-2x2-8bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-31x31-8bpp.ico b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-31x31-8bpp.ico
new file mode 100644
index 0000000000..7806754474
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-31x31-8bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-31x31-8bpp.png b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-31x31-8bpp.png
new file mode 100644
index 0000000000..84bf61078c
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-31x31-8bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-32x32-8bpp.ico b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-32x32-8bpp.ico
new file mode 100644
index 0000000000..d21cc5b967
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-32x32-8bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-32x32-8bpp.png b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-32x32-8bpp.png
new file mode 100644
index 0000000000..349fd4df24
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-32x32-8bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-33x33-8bpp.ico b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-33x33-8bpp.ico
new file mode 100644
index 0000000000..1b419b2632
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-33x33-8bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-33x33-8bpp.png b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-33x33-8bpp.png
new file mode 100644
index 0000000000..a4c100649a
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-33x33-8bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-3x3-8bpp.ico b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-3x3-8bpp.ico
new file mode 100644
index 0000000000..869f74fcdc
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-3x3-8bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-3x3-8bpp.png b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-3x3-8bpp.png
new file mode 100644
index 0000000000..cb42ec4f87
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-3x3-8bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-4x4-8bpp.ico b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-4x4-8bpp.ico
new file mode 100644
index 0000000000..3967563727
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-4x4-8bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-4x4-8bpp.png b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-4x4-8bpp.png
new file mode 100644
index 0000000000..e6afafd89a
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-4x4-8bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-5x5-8bpp.ico b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-5x5-8bpp.ico
new file mode 100644
index 0000000000..92814e3661
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-5x5-8bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-5x5-8bpp.png b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-5x5-8bpp.png
new file mode 100644
index 0000000000..a844aff76d
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-5x5-8bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-6x6-8bpp.ico b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-6x6-8bpp.ico
new file mode 100644
index 0000000000..1af478a8a8
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-6x6-8bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-6x6-8bpp.png b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-6x6-8bpp.png
new file mode 100644
index 0000000000..415c2d9c6a
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-6x6-8bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-7x7-8bpp.ico b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-7x7-8bpp.ico
new file mode 100644
index 0000000000..1c70820ebd
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-7x7-8bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-7x7-8bpp.png b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-7x7-8bpp.png
new file mode 100644
index 0000000000..ab2f892747
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-7x7-8bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-8x8-8bpp.ico b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-8x8-8bpp.ico
new file mode 100644
index 0000000000..782ae220df
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-8x8-8bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-8x8-8bpp.png b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-8x8-8bpp.png
new file mode 100644
index 0000000000..fe2ff40a1d
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-8x8-8bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-9x9-8bpp.ico b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-9x9-8bpp.ico
new file mode 100644
index 0000000000..6825372b4a
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-9x9-8bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-size-9x9-8bpp.png b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-9x9-8bpp.png
new file mode 100644
index 0000000000..18ab4b25de
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-size-9x9-8bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-transparent-8bpp.ico b/image/test/reftest/ico/ico-bmp-8bpp/ico-transparent-8bpp.ico
new file mode 100644
index 0000000000..8e361306c5
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-transparent-8bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/ico-transparent-8bpp.png b/image/test/reftest/ico/ico-bmp-8bpp/ico-transparent-8bpp.png
new file mode 100644
index 0000000000..062152e3b1
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-8bpp/ico-transparent-8bpp.png differ
diff --git a/image/test/reftest/ico/ico-bmp-8bpp/reftest.list b/image/test/reftest/ico/ico-bmp-8bpp/reftest.list
new file mode 100644
index 0000000000..5a6b543238
--- /dev/null
+++ b/image/test/reftest/ico/ico-bmp-8bpp/reftest.list
@@ -0,0 +1,23 @@
+# ICO BMP 8BPP tests
+
+# Images of various sizes
+== ico-size-1x1-8bpp.ico   ico-size-1x1-8bpp.png
+== ico-size-2x2-8bpp.ico   ico-size-2x2-8bpp.png
+== ico-size-3x3-8bpp.ico   ico-size-3x3-8bpp.png
+== ico-size-4x4-8bpp.ico   ico-size-4x4-8bpp.png
+== ico-size-5x5-8bpp.ico   ico-size-5x5-8bpp.png
+== ico-size-6x6-8bpp.ico   ico-size-6x6-8bpp.png
+== ico-size-7x7-8bpp.ico   ico-size-7x7-8bpp.png
+== ico-size-8x8-8bpp.ico   ico-size-8x8-8bpp.png
+== ico-size-9x9-8bpp.ico   ico-size-9x9-8bpp.png
+== ico-size-15x15-8bpp.ico ico-size-15x15-8bpp.png
+== ico-size-16x16-8bpp.ico ico-size-16x16-8bpp.png
+== ico-size-17x17-8bpp.ico ico-size-17x17-8bpp.png
+== ico-size-31x31-8bpp.ico ico-size-31x31-8bpp.png
+== ico-size-32x32-8bpp.ico ico-size-32x32-8bpp.png
+== ico-size-33x33-8bpp.ico ico-size-33x33-8bpp.png
+== ico-size-256x256-8bpp.ico ico-size-256x256-8bpp.png
+== ico-partial-transparent-8bpp.ico ico-partial-transparent-8bpp.png
+== ico-transparent-8bpp.ico ico-transparent-8bpp.png
+== ico-not-square-transparent-8bpp.ico ico-not-square-transparent-8bpp.png
+
diff --git a/image/test/reftest/ico/ico-bmp-corrupted/16x16.png b/image/test/reftest/ico/ico-bmp-corrupted/16x16.png
new file mode 100644
index 0000000000..c04869e728
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-corrupted/16x16.png differ
diff --git a/image/test/reftest/ico/ico-bmp-corrupted/invalid-bpp.ico b/image/test/reftest/ico/ico-bmp-corrupted/invalid-bpp.ico
new file mode 100644
index 0000000000..1189e4c040
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-corrupted/invalid-bpp.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression-RLE4.ico b/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression-RLE4.ico
new file mode 100644
index 0000000000..8fd0a5d658
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression-RLE4.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression-RLE8.ico b/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression-RLE8.ico
new file mode 100644
index 0000000000..1f185ca620
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression-RLE8.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression.ico b/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression.ico
new file mode 100644
index 0000000000..a49a783c5f
Binary files /dev/null and b/image/test/reftest/ico/ico-bmp-corrupted/invalid-compression.ico differ
diff --git a/image/test/reftest/ico/ico-bmp-corrupted/reftest.list b/image/test/reftest/ico/ico-bmp-corrupted/reftest.list
new file mode 100644
index 0000000000..2467b1323e
--- /dev/null
+++ b/image/test/reftest/ico/ico-bmp-corrupted/reftest.list
@@ -0,0 +1,10 @@
+# ICOs containing corrupted BMP tests
+
+# Invalid value for bits per pixel (BPP) - detected when decoding the header.
+== wrapper.html?invalid-bpp.ico about:blank
+# Invalid BPP values for RLE4 - detected when decoding the image data.
+== wrapper.html?invalid-compression-RLE4.ico about:blank
+# Invalid BPP values for RLE8 - detected when decoding the image data.
+== wrapper.html?invalid-compression-RLE8.ico about:blank
+# Invalid compression value - detected when decoding the image data.
+== wrapper.html?invalid-compression.ico about:blank
diff --git a/image/test/reftest/ico/ico-bmp-corrupted/wrapper.html b/image/test/reftest/ico/ico-bmp-corrupted/wrapper.html
new file mode 100644
index 0000000000..943bc75bf2
--- /dev/null
+++ b/image/test/reftest/ico/ico-bmp-corrupted/wrapper.html
@@ -0,0 +1,80 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<head>
+<title>Image reftest wrapper</title>
+<style type="text/css">
+  #image1 { background-color: rgb(10, 100, 250); }
+</style>
+<script>
+  var gImg;
+
+  function runAfterAsyncEvents(aCallback) {
+    function handlePostMessage(aEvent) {
+      if (aEvent.data == 'next') {
+        window.removeEventListener('message', handlePostMessage);
+        aCallback();
+      }
+    }
+
+    window.addEventListener('message', handlePostMessage);
+
+    // We'll receive the 'message' event after everything else that's currently in
+    // the event queue (which is a stronger guarantee than setTimeout, because
+    // setTimeout events may be coalesced). This lets us ensure that we run
+    // aCallback *after* any asynchronous events are delivered.
+    window.postMessage('next', '*');
+  }
+
+  // The image is loaded async after the page loads
+  // wait for it to finish loading
+  function onImageLoad() { 
+    // Use a canvas to force the image to get sync decoded.
+    var canvas = document.createElement('canvas');
+    var ctx = canvas.getContext('2d');
+
+    try {
+      ctx.drawImage(gImg, 0, 0);
+    } catch (e) {
+    }
+
+    // Continue after pumping the event loop.
+    runAfterAsyncEvents(step2);
+  }
+
+  function step2() {
+    // Only now, once the image has already been sync decoded, do we load it in
+    // the <img> element we're going to snapshot. That's because for some of the
+    // tests that use wrapper.html, an error is only detected when decoding the
+    // actual image data - i.e., the error isn't detected in the header. The
+    // precise time when we detect the error, unfortunately, affects how we draw
+    // the image. This will be fixed in bug 1182531, and then we can simplify this
+    // code.
+
+    var finalImg = document.getElementById('image1');
+    finalImg.onload = finalImg.onerror = step3;
+    finalImg.src = gImg.src;
+  }
+
+  function step3() {
+    // We're ready to take the snapshot, but pump the event loop first just to
+    // be sure that everything has settled down.
+    runAfterAsyncEvents(takeSnapshot);
+  }
+
+  function takeSnapshot() {
+    document.documentElement.removeAttribute("class");
+  }
+</script>
+</head>
+<body>
+<!-- non-empty alt to avoid the broken image icon -->
+<img id="image1" alt=" ">
+<script>
+  // Use as "wrapper.html?image.png
+  gImg = document.createElement('img');
+  gImg.onload = gImg.onerror = onImageLoad;
+  gImg.src = document.location.search.substr(1);
+</script>
+</body>
+</html>
+
diff --git a/image/test/reftest/ico/ico-mixed/mixed-bmp-png.ico b/image/test/reftest/ico/ico-mixed/mixed-bmp-png.ico
new file mode 100644
index 0000000000..32e2c4995c
Binary files /dev/null and b/image/test/reftest/ico/ico-mixed/mixed-bmp-png.ico differ
diff --git a/image/test/reftest/ico/ico-mixed/mixed-bmp-png.png b/image/test/reftest/ico/ico-mixed/mixed-bmp-png.png
new file mode 100644
index 0000000000..b6aee74092
Binary files /dev/null and b/image/test/reftest/ico/ico-mixed/mixed-bmp-png.png differ
diff --git a/image/test/reftest/ico/ico-mixed/mixed-bmp-png32.png b/image/test/reftest/ico/ico-mixed/mixed-bmp-png32.png
new file mode 100644
index 0000000000..a058991272
Binary files /dev/null and b/image/test/reftest/ico/ico-mixed/mixed-bmp-png32.png differ
diff --git a/image/test/reftest/ico/ico-mixed/mixed-bmp-png48.png b/image/test/reftest/ico/ico-mixed/mixed-bmp-png48.png
new file mode 100644
index 0000000000..61bea5c804
Binary files /dev/null and b/image/test/reftest/ico/ico-mixed/mixed-bmp-png48.png differ
diff --git a/image/test/reftest/ico/ico-mixed/reftest.list b/image/test/reftest/ico/ico-mixed/reftest.list
new file mode 100644
index 0000000000..36134e40ab
--- /dev/null
+++ b/image/test/reftest/ico/ico-mixed/reftest.list
@@ -0,0 +1,3 @@
+# ICO BMP and PNG mixed tests
+
+== mixed-bmp-png.ico mixed-bmp-png48.png
diff --git a/image/test/reftest/ico/ico-png/corrupted_x00n0g01.ico b/image/test/reftest/ico/ico-png/corrupted_x00n0g01.ico
new file mode 100644
index 0000000000..18b97b0b7e
Binary files /dev/null and b/image/test/reftest/ico/ico-png/corrupted_x00n0g01.ico differ
diff --git a/image/test/reftest/ico/ico-png/corrupted_xxcrn0g04.ico b/image/test/reftest/ico/ico-png/corrupted_xxcrn0g04.ico
new file mode 100644
index 0000000000..3fa5285c5b
Binary files /dev/null and b/image/test/reftest/ico/ico-png/corrupted_xxcrn0g04.ico differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-15x15-png.ico b/image/test/reftest/ico/ico-png/ico-size-15x15-png.ico
new file mode 100644
index 0000000000..e67644a890
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-15x15-png.ico differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-15x15-png.png b/image/test/reftest/ico/ico-png/ico-size-15x15-png.png
new file mode 100644
index 0000000000..e1287430d0
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-15x15-png.png differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-16x16-png.ico b/image/test/reftest/ico/ico-png/ico-size-16x16-png.ico
new file mode 100644
index 0000000000..442ab4dc80
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-16x16-png.ico differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-16x16-png.png b/image/test/reftest/ico/ico-png/ico-size-16x16-png.png
new file mode 100644
index 0000000000..c04869e728
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-16x16-png.png differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-17x17-png.ico b/image/test/reftest/ico/ico-png/ico-size-17x17-png.ico
new file mode 100644
index 0000000000..f135385d7e
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-17x17-png.ico differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-17x17-png.png b/image/test/reftest/ico/ico-png/ico-size-17x17-png.png
new file mode 100644
index 0000000000..00fb8e4f37
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-17x17-png.png differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-1x1-png.ico b/image/test/reftest/ico/ico-png/ico-size-1x1-png.ico
new file mode 100644
index 0000000000..8eb80c7db2
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-1x1-png.ico differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-1x1-png.png b/image/test/reftest/ico/ico-png/ico-size-1x1-png.png
new file mode 100644
index 0000000000..c05f5fef89
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-1x1-png.png differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-256x256-png.ico b/image/test/reftest/ico/ico-png/ico-size-256x256-png.ico
new file mode 100644
index 0000000000..ecb88edf3c
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-256x256-png.ico differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-256x256-png.png b/image/test/reftest/ico/ico-png/ico-size-256x256-png.png
new file mode 100644
index 0000000000..2d2f52d6c1
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-256x256-png.png differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-2x2-png.ico b/image/test/reftest/ico/ico-png/ico-size-2x2-png.ico
new file mode 100644
index 0000000000..5799953c98
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-2x2-png.ico differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-2x2-png.png b/image/test/reftest/ico/ico-png/ico-size-2x2-png.png
new file mode 100644
index 0000000000..e512d3f9b4
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-2x2-png.png differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-31x31-png.ico b/image/test/reftest/ico/ico-png/ico-size-31x31-png.ico
new file mode 100644
index 0000000000..2e9fbd8f9c
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-31x31-png.ico differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-31x31-png.png b/image/test/reftest/ico/ico-png/ico-size-31x31-png.png
new file mode 100644
index 0000000000..e4a8642514
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-31x31-png.png differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-32x32-png.ico b/image/test/reftest/ico/ico-png/ico-size-32x32-png.ico
new file mode 100644
index 0000000000..af97a86630
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-32x32-png.ico differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-32x32-png.png b/image/test/reftest/ico/ico-png/ico-size-32x32-png.png
new file mode 100644
index 0000000000..3a6fbe8ee9
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-32x32-png.png differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-33x33-png.ico b/image/test/reftest/ico/ico-png/ico-size-33x33-png.ico
new file mode 100644
index 0000000000..2509c8c1f2
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-33x33-png.ico differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-33x33-png.png b/image/test/reftest/ico/ico-png/ico-size-33x33-png.png
new file mode 100644
index 0000000000..72ef7eb636
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-33x33-png.png differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-3x3-png.ico b/image/test/reftest/ico/ico-png/ico-size-3x3-png.ico
new file mode 100644
index 0000000000..d2cd649c84
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-3x3-png.ico differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-3x3-png.png b/image/test/reftest/ico/ico-png/ico-size-3x3-png.png
new file mode 100644
index 0000000000..cb42ec4f87
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-3x3-png.png differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-4x4-png.ico b/image/test/reftest/ico/ico-png/ico-size-4x4-png.ico
new file mode 100644
index 0000000000..60180aad5e
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-4x4-png.ico differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-4x4-png.png b/image/test/reftest/ico/ico-png/ico-size-4x4-png.png
new file mode 100644
index 0000000000..e6afafd89a
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-4x4-png.png differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-5x5-png.ico b/image/test/reftest/ico/ico-png/ico-size-5x5-png.ico
new file mode 100644
index 0000000000..089c0c8858
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-5x5-png.ico differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-5x5-png.png b/image/test/reftest/ico/ico-png/ico-size-5x5-png.png
new file mode 100644
index 0000000000..a844aff76d
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-5x5-png.png differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-6x6-png.ico b/image/test/reftest/ico/ico-png/ico-size-6x6-png.ico
new file mode 100644
index 0000000000..2ee75d25ab
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-6x6-png.ico differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-6x6-png.png b/image/test/reftest/ico/ico-png/ico-size-6x6-png.png
new file mode 100644
index 0000000000..415c2d9c6a
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-6x6-png.png differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-7x7-png.ico b/image/test/reftest/ico/ico-png/ico-size-7x7-png.ico
new file mode 100644
index 0000000000..ade9a3ecde
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-7x7-png.ico differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-7x7-png.png b/image/test/reftest/ico/ico-png/ico-size-7x7-png.png
new file mode 100644
index 0000000000..ab2f892747
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-7x7-png.png differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-8x8-png.ico b/image/test/reftest/ico/ico-png/ico-size-8x8-png.ico
new file mode 100644
index 0000000000..a0a150bad6
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-8x8-png.ico differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-8x8-png.png b/image/test/reftest/ico/ico-png/ico-size-8x8-png.png
new file mode 100644
index 0000000000..fe2ff40a1d
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-8x8-png.png differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-9x9-png.ico b/image/test/reftest/ico/ico-png/ico-size-9x9-png.ico
new file mode 100644
index 0000000000..a53357b449
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-9x9-png.ico differ
diff --git a/image/test/reftest/ico/ico-png/ico-size-9x9-png.png b/image/test/reftest/ico/ico-png/ico-size-9x9-png.png
new file mode 100644
index 0000000000..18ab4b25de
Binary files /dev/null and b/image/test/reftest/ico/ico-png/ico-size-9x9-png.png differ
diff --git a/image/test/reftest/ico/ico-png/reftest.list b/image/test/reftest/ico/ico-png/reftest.list
new file mode 100644
index 0000000000..002d0e4f32
--- /dev/null
+++ b/image/test/reftest/ico/ico-png/reftest.list
@@ -0,0 +1,29 @@
+# ICO PNG tests
+
+# Images of various sizes
+== ico-size-1x1-png.ico   ico-size-1x1-png.png
+== ico-size-2x2-png.ico   ico-size-2x2-png.png
+== ico-size-3x3-png.ico   ico-size-3x3-png.png
+== ico-size-4x4-png.ico   ico-size-4x4-png.png
+== ico-size-5x5-png.ico   ico-size-5x5-png.png
+== ico-size-6x6-png.ico   ico-size-6x6-png.png
+== ico-size-7x7-png.ico   ico-size-7x7-png.png
+== ico-size-8x8-png.ico   ico-size-8x8-png.png
+== ico-size-9x9-png.ico   ico-size-9x9-png.png
+== ico-size-15x15-png.ico ico-size-15x15-png.png
+== ico-size-16x16-png.ico ico-size-16x16-png.png
+== ico-size-17x17-png.ico ico-size-17x17-png.png
+== ico-size-31x31-png.ico ico-size-31x31-png.png
+== ico-size-32x32-png.ico ico-size-32x32-png.png
+== ico-size-33x33-png.ico ico-size-33x33-png.png
+== ico-size-256x256-png.ico ico-size-256x256-png.png
+
+# Corrupted files so no image should be loaded
+# x00n0g01 - empty 0x0 grayscale file
+== wrapper.html?x00n0g01.ico about:blank
+# xcrn0g04 - added cr bytes
+== wrapper.html?xcrn0g04.ico about:blank
+
+# Test ICO PNG transparency
+== transparent-png.ico transparent-png.png
+
diff --git a/image/test/reftest/ico/ico-png/tmp.ico b/image/test/reftest/ico/ico-png/tmp.ico
new file mode 100644
index 0000000000..5723a2e776
Binary files /dev/null and b/image/test/reftest/ico/ico-png/tmp.ico differ
diff --git a/image/test/reftest/ico/ico-png/transparent-png.ico b/image/test/reftest/ico/ico-png/transparent-png.ico
new file mode 100644
index 0000000000..cc8a4a31db
Binary files /dev/null and b/image/test/reftest/ico/ico-png/transparent-png.ico differ
diff --git a/image/test/reftest/ico/ico-png/transparent-png.png b/image/test/reftest/ico/ico-png/transparent-png.png
new file mode 100644
index 0000000000..29e3a24359
Binary files /dev/null and b/image/test/reftest/ico/ico-png/transparent-png.png differ
diff --git a/image/test/reftest/ico/ico-png/wrapper.html b/image/test/reftest/ico/ico-png/wrapper.html
new file mode 100644
index 0000000000..45b5167754
--- /dev/null
+++ b/image/test/reftest/ico/ico-png/wrapper.html
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<head>
+<title>Image reftest wrapper</title>
+<style type="text/css">
+  #image1 { background-color: rgb(10, 100, 250); }
+</style>
+<script>
+  // The image is loaded async after the page loads
+  // wait for it to finish loading
+  function onImageLoad() { 
+    document.documentElement.removeAttribute("class");
+  };
+</script>
+</head>
+<body>
+<!-- non-empty alt to avoid the broken image icon -->
+<img id="image1" alt=" ">
+<script>
+  // Use as "wrapper.html?image.png
+  var imgURL = document.location.search.substr(1);
+  document.images[0].onload = onImageLoad;
+  document.images[0].onerror = onImageLoad;
+  document.images[0].src = imgURL;
+</script>
+</body>
+</html>
+
diff --git a/image/test/reftest/ico/ico-png/x00n0g01.png b/image/test/reftest/ico/ico-png/x00n0g01.png
new file mode 100644
index 0000000000..db3a5fda7e
Binary files /dev/null and b/image/test/reftest/ico/ico-png/x00n0g01.png differ
diff --git a/image/test/reftest/ico/ico-png/xcrn0g04.png b/image/test/reftest/ico/ico-png/xcrn0g04.png
new file mode 100644
index 0000000000..5bce9f3ada
Binary files /dev/null and b/image/test/reftest/ico/ico-png/xcrn0g04.png differ
diff --git a/image/test/reftest/ico/reftest.list b/image/test/reftest/ico/reftest.list
new file mode 100644
index 0000000000..22ed9b4fe7
--- /dev/null
+++ b/image/test/reftest/ico/reftest.list
@@ -0,0 +1,11 @@
+# ICO tests
+
+include ico-bmp-1bpp/reftest.list
+include ico-bmp-4bpp/reftest.list
+include ico-bmp-8bpp/reftest.list
+include ico-bmp-24bpp/reftest.list
+include ico-bmp-32bpp/reftest.list
+include ico-bmp-corrupted/reftest.list
+include ico-png/reftest.list
+include ico-mixed/reftest.list
+include cur/reftest.list
-- 
cgit v1.2.3