test: Re-generate test images with recent tool/library versions

Converters and library versions used:
 convert                ImageMagick-6.9.12.64
 cjxl                   libjxl-0.7.0
 heif-enc               libheif-1.13.0
 opj2_compress          openjpeg2-2.5.0
 pnmtopnm,pamtoxvmini   netpbm-10.99.00
This commit is contained in:
Kim Woelders 2022-08-27 18:25:44 +02:00
parent 87bcf92524
commit 9f9779e698
16 changed files with 121 additions and 118 deletions

View File

@ -1,6 +1,9 @@
# Makefile for generation of the test images
# Some images are not reproduced exactly so therefore they are committed to git.
CONVERT = convert
CONVERT_BITMAP = $(CONVERT) -dither Floyd-Steinberg -colors 2
TYPES += argb
TYPES += bmp
TYPES += ff
@ -46,25 +49,25 @@ imgs_misc: $(ALL_MISC)
imlib2_conv $< $@
%.bmp: %.png
convert $< $@
$(CONVERT) $< $@
%.ff: %.png
imlib2_conv $< $@
%.gif: %.png
convert $< $@
$(CONVERT) $< $@
%.heif: %.png
heif-enc -o $@ $<
%.ico: %.png
convert $< $@
$(CONVERT) $< $@
%.jpg: %.png
convert $< $@
$(CONVERT) $< $@
%-gray.png: %.png
convert -colorspace Gray $< $@
$(CONVERT) -colorspace Gray $< $@
%.jp2: %.png
opj2_compress -i $< -o $@
@ -76,16 +79,16 @@ imgs_misc: $(ALL_MISC)
cjxl $< $@
%.ilbm: %.png
convert $< $@
$(CONVERT) $< $@
%.ppm: %.png
convert $< $@
$(CONVERT) $< $@
%.pgm: %.png
convert $< $@
$(CONVERT) $< $@
%.pbm: %.png
convert -dither Floyd-Steinberg $< $@
$(CONVERT_BITMAP) $< $@
%-P1.pbm: %.pbm
pnmtopnm -plain <$< >$@
@ -100,20 +103,20 @@ imgs_misc: $(ALL_MISC)
pamtoxvmini <$< >$@
%.tga: %.png
# convert $< $@
convert -flip $< $@ # Bug in convert?
# $(CONVERT) $< $@
$(CONVERT) -flip $< $@ # Bug in convert?
%.tiff: %.png
convert $< $@
$(CONVERT) $< $@
%.webp: %.png
convert $< $@
$(CONVERT) $< $@
%.xbm: %.png
convert -dither Floyd-Steinberg $< $@
$(CONVERT_BITMAP) $< $@
%.xpm: %.png
convert $< $@
$(CONVERT) $< $@
%.bz2: %
bzip2 -c $< > $@

View File

@ -1,66 +1,66 @@
P1
64 64
0000000000000000000000000000111111110000000000000000000000000000
0000000000000000000000001111111111111111100000000000000000000000
0000000000000000000000000000111111111000000000000000000000000000
0000000000000000000000011111111111111111100000000000000000000000
0000000000000000000001111111111111111111111100000000000000000000
0000000000000000000111111010000000001111111111000000000000000000
0000000000000000011010000000000000000000111111110000000000000000
0000000000000001010100000000000000000000001111111100000000000000
0000000000000010100000000000000000000000000111111110000000000000
0000000000001101001000000000000000000000000011111111000000000000
0000000000010000010000000000000000000000000001111111110000000000
0000000000100010100010000000000000000000000101111111110000000000
0000000000000000101010101010101010101010101011111111111100000000
0000000010000101010101010101010101010101010101111111111100000000
0000000100100010111011101110111011101110111111111111111110000000
0000001000000101101110111011101110111011101011111111111111000000
0000000000010101111111111110111011101111111111111111111111100000
0000010010001011011111111111111111111101111111111111111111100000
0000000000101011111111111111111111111111111111111111111111110000
0000100000001111111111111111111111111111111111111111111111110000
0000000010110111111111111111111111111111111111111111111111111000
0001000001011111111111111111111111111111111111111111111111111000
0000000000111111111111111111111111111111111111111111111111111100
0000000101111111111111111111111111111111111111111111111111111100
0000000010111111111111111111111111111111111111111111111111111110
0000000000000000000111110101000000101111111111000000000000000000
0000000000000000011100000000000000000001111111110000000000000000
0000000000000001110010000000000000000000011111111100000000000000
0000000000000010001000000000000000000000000111111110000000000000
0000000000001010100000000000000000000000000011111111000000000000
0000000000010000010000000000000000000000000011111111110000000000
0000000000100101001010010000010010010001000101111111111000000000
0000000001000000101001001101001001001010101011111111111100000000
0000000010000101010110101010110110101010101101111111111100000000
0000000100001001011011110110101011110111110111111111111111000000
0000001000000101101101011011111111011101011111111111111111000000
0000000000100101111111111111011011111111111111111111111111100000
0000010000001011111111111111111111110111111111111111111111100000
0000000100101011111111111111111111111111111111111111111111110000
0000100001001111111111111111111111111111111111111111111111110000
0000000000110111111111111111111111111111111111111111111111111000
0001000010011111111111111111111111111111111111111111111111111000
0000000001111111111111111111111111111111111111111111111111111100
0010000100111111111111111111111111111111111111111111111111111100
0000000011111111111111111111111111111111111111111111111111111110
0000000001111111111111111111111111111111111111111111111111111110
0000001011111111111111111111111111111111111111111111111111111110
0100000010111111111111111111111111111111111111111111111111111110
0000000000000000000000000000000000000000000000000101010111111111
0000001011011111111110101010101010101000000111111111111111111111
0000001011111111111111111111111111111011111111111111111111111111
0000000101010101110101101101010110110101000011011111111111111111
0000000000000000000000000000000000000000000000000000001010111111
0000000100101010100100000000000000000000000100100101010101111111
0000101011111111111111111111111111111111111111111111111111111111
0001001010101101111011111111111101111110111011111111111111111111
0000000101010101001000000000000010000001000100001010101011101111
0000000010111111111111111111111111111111111111111111111111111110
0000000000000010000000000000000000000000000001010101111111111111
0000000101111111111111011010101010101000001110111111111111111111
0000011011011111111111111111111111111011110111111111111111111111
0000000010111011011101101010101011010101001011101111111111111111
0000000000000000000000000000000000000000000000000000000101111111
0000000101010010100000000000000000000000000000010101011010111111
0001010101101111111111111111111111111111111111111111111111111111
0000001010111110111110111011011010110110101111110111111111111111
0001000010001001000010000100100100100001010000010101010111111111
0000000000000000000000000000000000000000000000000000000000000011
0000000000100100100101000000000000001000010010100101101101010101
0001010111111111111111111111111111111111101111111111111010101011
0000001000101010101010101010101010010010110101011011111101010110
0000100010000000000000000000000000000000000000000000000000000010
0000000000101010010000000000000000000000000010010101010101000010
0000101010101101110111111101000001010111111101111111111010010100
0000010101111011111101010110100001011010010111011111110101000100
0000001010101111010101101011010101010101101101111011111010000100
0000010101111011111110110101010101010101010111011111110100001000
0000001010101110101010101010101010101010101010111111101000001000
0000001011011011101101010100010001000000000101101011100010010000
0000001010101111011010101001001010010000000001011111101000010000
0000000101111010101010100100100000100000000010110110100000100000
0000001011010111101010010010000010000000000001011011000000100000
0000000011111010101001000100100000000000000010101110000001000000
0000000001111111101010010000000000000000000000110101000000000000
0000000001101101010100100000000000000000000010101100000100000000
0000000000011111101010000000000000000000000000101010000000000000
0000000000011010110001000000000000000000000010101000001000000000
0000000000000111101100010000000000000000000000101000100000000000
0000000000000011010101000000000000000000000010100000000000000000
0000000000000000110100000000000000000000000100100010000000000000
0000000000000000011101000000000000000000000010001000000000000000
0000000000000000000010100000000000000000000000100000000000000000
0000000010100100101000100000000000001000000101001010101010001101
0001010101011111011111011111111111110111111101111111111010110011
0000001010101011101010101010100100101010100110101011111010100110
0001000000000000000000000000000000000000000000000000000000000010
0000000010101000000000000000000000000000000001010101010100001010
0000010101010111111111111101000000101011011111011011111010100100
0000100101111101101010101010100010101101101010111111010100000100
0000010101010111111111010110101010101010101011110111110101000100
0000001010111010101010101010101010101010101101111111111000001000
0000010101101111111101010101001001010100101010101101110010001000
0000000101011010100110101001010100010000000101111111010000011000
0000001010110111011010101010000010100000000010101011101000010000
0000000101011101101010100100101000000000000001011110100000100000
0000001011101011010101001001000000100000000010101011000000100000
0000000011011101010100100010001000000000000001011101000001000000
0000000001110111110101001000000000000000000010101010000010000000
0000000001111101001000000000000000000000000001010100000100000000
0000000000011111111010101000000000000000000100101010000000000000
0000000000001010100100000000000000000000000001010100010000000000
0000000000000111011010100000000000000000000000101000100000000000
0000000000000011101000000000000000000000000010100001000000000000
0000000000000000110110100000000000000000000000100000000000000000
0000000000000000011010000000000000000000000101001000000000000000
0000000000000000000101010000000000000000000000100000000000000000
0000000000000000000001010000000000000000001010000000000000000000
0000000000000000000000000100000000000000001000000000000000000000
0000000000000000000000000000000000000010100000000000000000000000
0000000000000000000000000100000000000000010000000000000000000000
0000000000000000000000000000000000000001000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,46 +1,46 @@
#define icon-64_width 64
#define icon-64_height 64
static char icon-64_bits[] = {
0x00, 0x00, 0x00, 0xF0, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
0x00, 0x00, 0x00, 0xF0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFF,
0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xFF, 0xFF, 0x0F, 0x00, 0x00,
0x00, 0x00, 0xF8, 0x05, 0xF0, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x16, 0x00,
0x00, 0xFF, 0x00, 0x00, 0x00, 0x80, 0x0A, 0x00, 0x00, 0xFC, 0x03, 0x00,
0x00, 0x40, 0x01, 0x00, 0x00, 0xF8, 0x07, 0x00, 0x00, 0xB0, 0x04, 0x00,
0x00, 0xF0, 0x0F, 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0xE0, 0x3F, 0x00,
0x00, 0x44, 0x11, 0x00, 0x00, 0xE8, 0x3F, 0x00, 0x00, 0x00, 0x55, 0x55,
0x55, 0xF5, 0xFF, 0x00, 0x00, 0xA1, 0xAA, 0xAA, 0xAA, 0xEA, 0xFF, 0x00,
0x80, 0x44, 0x77, 0x77, 0x77, 0xFF, 0xFF, 0x01, 0x40, 0xA0, 0xDD, 0xDD,
0xDD, 0xF5, 0xFF, 0x03, 0x00, 0xA8, 0xFF, 0x77, 0xF7, 0xFF, 0xFF, 0x07,
0x20, 0xD1, 0xFE, 0xFF, 0xBF, 0xFF, 0xFF, 0x07, 0x00, 0xD4, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0x0F, 0x10, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F,
0x00, 0xED, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F, 0x08, 0xFA, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0x1F, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F,
0x80, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F, 0x00, 0xFD, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0x7F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F,
0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x02, 0xFD, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xFF,
0x40, 0xFB, 0x5F, 0x55, 0x15, 0xF8, 0xFF, 0xFF, 0x40, 0xFF, 0xFF, 0xFF,
0xDF, 0xFF, 0xFF, 0xFF, 0x80, 0xAA, 0x6B, 0xAB, 0xAD, 0xB0, 0xFF, 0xFF,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xFD, 0x80, 0x54, 0x09, 0x00,
0x00, 0x48, 0xAA, 0xFE, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0x48, 0xB5, 0xF7, 0xFF, 0x7E, 0xF7, 0xFF, 0xFF, 0x80, 0xAA, 0x04, 0x00,
0x81, 0x08, 0x55, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0,
0x00, 0x24, 0x29, 0x00, 0x10, 0x52, 0xDA, 0xAA, 0xA8, 0xFF, 0xFF, 0xFF,
0xFF, 0xFD, 0x7F, 0xD5, 0x40, 0x54, 0x55, 0x55, 0x49, 0xAB, 0xFD, 0x6A,
0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x54, 0x02, 0x00,
0x00, 0x90, 0xAA, 0x42, 0x50, 0xB5, 0xFB, 0x0B, 0xEA, 0xEF, 0x7F, 0x29,
0xA0, 0xDE, 0xAF, 0x16, 0x5A, 0xBA, 0xBF, 0x22, 0x40, 0xF5, 0x6A, 0xAD,
0xAA, 0xED, 0x7D, 0x21, 0xA0, 0xDE, 0xDF, 0xAA, 0xAA, 0xBA, 0xBF, 0x10,
0x40, 0x75, 0x55, 0x55, 0x55, 0xD5, 0x5F, 0x10, 0x40, 0xDB, 0xAD, 0x22,
0x02, 0x68, 0x1D, 0x09, 0x40, 0xF5, 0x56, 0x49, 0x09, 0xA0, 0x5F, 0x08,
0x80, 0x5E, 0x55, 0x12, 0x04, 0xD0, 0x16, 0x04, 0x40, 0xEB, 0x95, 0x04,
0x01, 0xA0, 0x0D, 0x04, 0x00, 0x5F, 0x25, 0x12, 0x00, 0x50, 0x07, 0x02,
0x00, 0xFE, 0x95, 0x00, 0x00, 0xC0, 0x0A, 0x00, 0x00, 0xB6, 0x4A, 0x00,
0x00, 0x50, 0x83, 0x00, 0x00, 0xF8, 0x15, 0x00, 0x00, 0x40, 0x05, 0x00,
0x00, 0x58, 0x23, 0x00, 0x00, 0x50, 0x41, 0x00, 0x00, 0xE0, 0x8D, 0x00,
0x00, 0x40, 0x11, 0x00, 0x00, 0xC0, 0x2A, 0x00, 0x00, 0x50, 0x00, 0x00,
0x00, 0x00, 0x0B, 0x00, 0x00, 0x48, 0x04, 0x00, 0x00, 0x00, 0x2E, 0x00,
0x00, 0x10, 0x01, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x40, 0x00, 0x00,
0x00, 0x00, 0xF8, 0x0A, 0xF4, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00,
0x80, 0xFF, 0x00, 0x00, 0x00, 0x80, 0x13, 0x00, 0x00, 0xFE, 0x03, 0x00,
0x00, 0x40, 0x04, 0x00, 0x00, 0xF8, 0x07, 0x00, 0x00, 0x50, 0x01, 0x00,
0x00, 0xF0, 0x0F, 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0xF0, 0x3F, 0x00,
0x00, 0xA4, 0x94, 0x20, 0x89, 0xE8, 0x7F, 0x00, 0x00, 0x02, 0x25, 0x4B,
0x52, 0xF5, 0xFF, 0x00, 0x00, 0xA1, 0x5A, 0xB5, 0x55, 0xED, 0xFF, 0x00,
0x80, 0x90, 0xF6, 0x56, 0xEF, 0xFB, 0xFF, 0x03, 0x40, 0xA0, 0xAD, 0xFD,
0xBB, 0xFE, 0xFF, 0x03, 0x00, 0xA4, 0xFF, 0x6F, 0xFF, 0xFF, 0xFF, 0x07,
0x20, 0xD0, 0xFF, 0xFF, 0xEF, 0xFF, 0xFF, 0x07, 0x80, 0xD4, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0x0F, 0x10, 0xF2, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F,
0x00, 0xEC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F, 0x08, 0xF9, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0x1F, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F,
0x84, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F, 0x00, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0x7F, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F,
0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x00, 0xFD, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0x7F, 0x00, 0x40, 0x00, 0x00, 0x00, 0xA0, 0xFA, 0xFF,
0x80, 0xFE, 0xBF, 0x55, 0x15, 0xDC, 0xFF, 0xFF, 0x60, 0xFB, 0xFF, 0xFF,
0xDF, 0xFB, 0xFF, 0xFF, 0x00, 0xDD, 0x6E, 0x55, 0xAB, 0x74, 0xFF, 0xFF,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFE, 0x80, 0x4A, 0x01, 0x00,
0x00, 0x80, 0x6A, 0xFD, 0xA8, 0xF6, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0x40, 0x7D, 0xDF, 0x6D, 0x6D, 0xFD, 0xFE, 0xFF, 0x08, 0x91, 0x10, 0x92,
0x84, 0x82, 0xAA, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0,
0x00, 0x25, 0x45, 0x00, 0x10, 0x28, 0x55, 0xB1, 0xA8, 0xFA, 0xBE, 0xFF,
0xEF, 0xEF, 0x7F, 0xCD, 0x40, 0xD5, 0x55, 0x95, 0x54, 0x59, 0x7D, 0x65,
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x15, 0x00, 0x00,
0x00, 0xA0, 0xAA, 0x50, 0xA0, 0xEA, 0xFF, 0x0B, 0xD4, 0xBE, 0x7D, 0x25,
0x90, 0xBE, 0x55, 0x15, 0xB5, 0xD5, 0xAF, 0x20, 0xA0, 0xEA, 0xBF, 0x56,
0x55, 0xF5, 0xBE, 0x22, 0x40, 0x5D, 0x55, 0x55, 0x55, 0xED, 0x7F, 0x10,
0xA0, 0xF6, 0xAF, 0x4A, 0x2A, 0x55, 0x3B, 0x11, 0x80, 0x5A, 0x59, 0xA9,
0x08, 0xE8, 0x2F, 0x18, 0x40, 0xED, 0x56, 0x05, 0x05, 0x50, 0x5D, 0x08,
0x80, 0xBA, 0x55, 0x52, 0x00, 0xA0, 0x17, 0x04, 0x40, 0xD7, 0x2A, 0x09,
0x04, 0x50, 0x0D, 0x04, 0x00, 0xBB, 0x4A, 0x44, 0x00, 0xA0, 0x0B, 0x02,
0x00, 0xEE, 0x2B, 0x01, 0x00, 0x50, 0x05, 0x01, 0x00, 0xBE, 0x04, 0x00,
0x00, 0xA0, 0x82, 0x00, 0x00, 0xF8, 0x57, 0x01, 0x00, 0x48, 0x05, 0x00,
0x00, 0x50, 0x09, 0x00, 0x00, 0xA0, 0x22, 0x00, 0x00, 0xE0, 0x56, 0x00,
0x00, 0x40, 0x11, 0x00, 0x00, 0xC0, 0x05, 0x00, 0x00, 0x50, 0x08, 0x00,
0x00, 0x00, 0x5B, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x16, 0x00,
0x00, 0x28, 0x01, 0x00, 0x00, 0x00, 0xA8, 0x00, 0x00, 0x40, 0x00, 0x00,
0x00, 0x00, 0xA0, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00,
0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Binary file not shown.

View File

@ -33,7 +33,7 @@ static tii_t tii[] = {
#endif
{ "icon-64.gif", 4016720483 },
#ifdef BUILD_HEIF_LOADER
{ "icon-64.heif", 174609659 },
{ "icon-64.heif", 1346959048 },
#endif
{ "icon-64.ico", 1153555547 },
{ "icon-64.ilbm", 1153555547 },
@ -50,20 +50,20 @@ static tii_t tii[] = {
{ "xeyes-gray.j2k", 3377113384 },
#endif
#ifdef BUILD_JXL_LOADER
{ "icon-64.jxl", 712907299 },
{ "icon-64.jxl", 2534597492 },
#endif
{ "icon-64.png", 1153555547 },
{ "xeyes-gray.png", 3493264608 },
{ "icon-64.ppm", 1153555547 },
{ "icon-64.pgm", 140949526 },
{ "icon-64.pbm", 2153856013 },
{ "icon-64.pbm", 3936773892 },
{ "icon-64-P3.ppm", 1153555547 },
{ "icon-64-P2.pgm", 140949526 },
{ "icon-64-P1.pbm", 2153856013 },
{ "icon-64-P1.pbm", 3936773892 },
{ "icon-64.tga", 1153555547 },
{ "icon-64.tiff", 1153555547 },
{ "icon-64.webp", 1698406918 },
{ "icon-64.xbm", 2153856013 },
{ "icon-64.xbm", 3936773892 },
{ "icon-64.xpm", 4016720483 },
{ "icon-128.ico", 218415319 },