diff --git a/example/stb-imagedumper/stb-imagedumper.c b/example/stb-imagedumper/stb-imagedumper.c index ff187e24..8783c883 100644 --- a/example/stb-imagedumper/stb-imagedumper.c +++ b/example/stb-imagedumper/stb-imagedumper.c @@ -230,15 +230,15 @@ const uint8_t g_src_ptr__mona_lisa_21_32_th[] = { }; const size_t g_src_len__mona_lisa_21_32_th = 24; -const uint8_t g_src_ptr__mona_lisa_21_32_r0_handsum[] = { +const uint8_t g_src_ptr__mona_lisa_21_32_c3q0_handsum[] = { 0xfe, 0xd7, 0x9a, 0x76, 0x8b, 0x9a, 0x76, 0x58, 0x88, 0x99, 0x68, 0xb6, 0x79, 0xaa, 0xa6, 0x86, 0x99, 0x97, 0x63, 0x7b, 0x89, 0x98, 0xb9, 0x59, 0x79, 0x28, 0xb8, 0x88, 0x8a, 0x89, 0x8a, 0x99, 0x98, 0x77, 0x94, 0x98, 0x79, 0x88, 0x88, 0x88, 0x97, 0x79, 0x87, 0x77, 0x88, 0x88, 0x88, 0x98, }; -const size_t g_src_len__mona_lisa_21_32_r0_handsum = 48; +const size_t g_src_len__mona_lisa_21_32_c3q0_handsum = 48; -const uint8_t g_src_ptr__mona_lisa_21_32_r3_handsum[] = { +const uint8_t g_src_ptr__mona_lisa_21_32_c3q3_handsum[] = { 0xfe, 0xd7, 0xfa, 0x87, 0x76, 0x68, 0x87, 0x75, 0x89, 0x77, 0x8c, 0xb7, 0xc7, 0x9b, 0x78, 0x64, 0x5a, 0x98, 0xb4, 0x79, 0xe6, 0x75, 0x57, 0x8a, 0x84, 0x88, 0x03, 0x86, 0x7a, 0x68, 0x87, 0x76, 0x68, 0xf4, 0x55, 0xe2, @@ -253,7 +253,7 @@ const uint8_t g_src_ptr__mona_lisa_21_32_r3_handsum[] = { 0xba, 0x86, 0x58, 0x8a, 0x9a, 0xa8, 0x89, 0x9a, 0xa7, 0x79, 0xa9, 0xc8, 0x99, 0x8b, 0x87, }; -const size_t g_src_len__mona_lisa_21_32_r3_handsum = 147; +const size_t g_src_len__mona_lisa_21_32_c3q3_handsum = 147; const uint8_t g_src_ptr__mona_lisa_21_32_etc2_pkm[] = { 0x50, 0x4b, 0x4d, 0x20, 0x32, 0x30, 0x00, 0x01, 0x00, 0x18, 0x00, 0x20, @@ -1110,14 +1110,14 @@ main(int argc, char** argv) { g_src_len__mona_lisa_21_32_th, }, { - "«demo»/mona-lisa.21x32.r0.handsum", - g_src_ptr__mona_lisa_21_32_r0_handsum, - g_src_len__mona_lisa_21_32_r0_handsum, + "«demo»/mona-lisa.21x32.c3q0.handsum", + g_src_ptr__mona_lisa_21_32_c3q0_handsum, + g_src_len__mona_lisa_21_32_c3q0_handsum, }, { - "«demo»/mona-lisa.21x32.r3.handsum", - g_src_ptr__mona_lisa_21_32_r3_handsum, - g_src_len__mona_lisa_21_32_r3_handsum, + "«demo»/mona-lisa.21x32.c3q3.handsum", + g_src_ptr__mona_lisa_21_32_c3q3_handsum, + g_src_len__mona_lisa_21_32_c3q3_handsum, }, { "«demo»/mona-lisa.21x32.etc2.pkm", diff --git a/test/c/std/handsum.c b/test/c/std/handsum.c index 063b84cf..004cc844 100644 --- a/test/c/std/handsum.c +++ b/test/c/std/handsum.c @@ -66,7 +66,7 @@ the first "./a.out" with "./a.out -bench". Combine these changes with the // ---------------- Handsum Tests const char* // -test_wuffs_handsum_decode_interface_g0() { +test_wuffs_handsum_decode_interface_c1q0() { CHECK_FOCUS(__func__); wuffs_handsum__decoder dec; CHECK_STATUS("initialize", @@ -75,11 +75,11 @@ test_wuffs_handsum_decode_interface_g0() { WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); return do_test__wuffs_base__image_decoder( wuffs_handsum__decoder__upcast_as__wuffs_base__image_decoder(&dec), - "test/data/bricks-gray.g0.handsum", 0, SIZE_MAX, 16, 12, 0xFF040404); + "test/data/bricks-gray.c1q0.handsum", 0, SIZE_MAX, 16, 12, 0xFF040404); } const char* // -test_wuffs_handsum_decode_interface_r1() { +test_wuffs_handsum_decode_interface_c1q2() { CHECK_FOCUS(__func__); wuffs_handsum__decoder dec; CHECK_STATUS("initialize", @@ -88,11 +88,11 @@ test_wuffs_handsum_decode_interface_r1() { WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); return do_test__wuffs_base__image_decoder( wuffs_handsum__decoder__upcast_as__wuffs_base__image_decoder(&dec), - "test/data/bricks-color.r1.handsum", 0, SIZE_MAX, 16, 12, 0xFF313D58); + "test/data/bricks-gray.c1q2.handsum", 0, SIZE_MAX, 16, 12, 0xFF101010); } const char* // -test_wuffs_handsum_decode_interface_g2() { +test_wuffs_handsum_decode_interface_c3q1() { CHECK_FOCUS(__func__); wuffs_handsum__decoder dec; CHECK_STATUS("initialize", @@ -101,11 +101,11 @@ test_wuffs_handsum_decode_interface_g2() { WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); return do_test__wuffs_base__image_decoder( wuffs_handsum__decoder__upcast_as__wuffs_base__image_decoder(&dec), - "test/data/bricks-gray.g2.handsum", 0, SIZE_MAX, 16, 12, 0xFF101010); + "test/data/bricks-color.c3q1.handsum", 0, SIZE_MAX, 16, 12, 0xFF313D58); } const char* // -test_wuffs_handsum_decode_interface_r3() { +test_wuffs_handsum_decode_interface_c3q3() { CHECK_FOCUS(__func__); wuffs_handsum__decoder dec; CHECK_STATUS("initialize", @@ -114,7 +114,7 @@ test_wuffs_handsum_decode_interface_r3() { WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); return do_test__wuffs_base__image_decoder( wuffs_handsum__decoder__upcast_as__wuffs_base__image_decoder(&dec), - "test/data/bricks-color.r3.handsum", 0, SIZE_MAX, 16, 12, 0xFF0B337D); + "test/data/bricks-color.c3q3.handsum", 0, SIZE_MAX, 16, 12, 0xFF0B337D); } const char* // @@ -158,7 +158,7 @@ test_wuffs_handsum_decode_frame_config() { wuffs_base__io_buffer src = ((wuffs_base__io_buffer){ .data = g_src_slice_u8, }); - CHECK_STRING(read_file(&src, "test/data/mona-lisa.21x32.r3.handsum")); + CHECK_STRING(read_file(&src, "test/data/mona-lisa.21x32.c3q3.handsum")); CHECK_STATUS("decode_frame_config #0", wuffs_handsum__decoder__decode_frame_config(&dec, &fc, &src)); @@ -203,10 +203,10 @@ test_wuffs_handsum_decode_frame_config() { proc g_tests[] = { test_wuffs_handsum_decode_frame_config, - test_wuffs_handsum_decode_interface_g0, - test_wuffs_handsum_decode_interface_r1, - test_wuffs_handsum_decode_interface_g2, - test_wuffs_handsum_decode_interface_r3, + test_wuffs_handsum_decode_interface_c1q0, + test_wuffs_handsum_decode_interface_c1q2, + test_wuffs_handsum_decode_interface_c3q1, + test_wuffs_handsum_decode_interface_c3q3, test_wuffs_handsum_decode_truncated_input, #ifdef WUFFS_MIMIC diff --git a/test/data/bricks-color.r0.handsum b/test/data/bricks-color.c3q0.handsum similarity index 100% rename from test/data/bricks-color.r0.handsum rename to test/data/bricks-color.c3q0.handsum diff --git a/test/data/bricks-color.r1.handsum b/test/data/bricks-color.c3q1.handsum similarity index 100% rename from test/data/bricks-color.r1.handsum rename to test/data/bricks-color.c3q1.handsum diff --git a/test/data/bricks-color.r2.handsum b/test/data/bricks-color.c3q2.handsum similarity index 100% rename from test/data/bricks-color.r2.handsum rename to test/data/bricks-color.c3q2.handsum diff --git a/test/data/bricks-color.r3.handsum b/test/data/bricks-color.c3q3.handsum similarity index 100% rename from test/data/bricks-color.r3.handsum rename to test/data/bricks-color.c3q3.handsum diff --git a/test/data/bricks-gray.g0.handsum b/test/data/bricks-gray.c1q0.handsum similarity index 100% rename from test/data/bricks-gray.g0.handsum rename to test/data/bricks-gray.c1q0.handsum diff --git a/test/data/bricks-gray.g1.handsum b/test/data/bricks-gray.c1q1.handsum similarity index 100% rename from test/data/bricks-gray.g1.handsum rename to test/data/bricks-gray.c1q1.handsum diff --git a/test/data/bricks-gray.g2.handsum b/test/data/bricks-gray.c1q2.handsum similarity index 100% rename from test/data/bricks-gray.g2.handsum rename to test/data/bricks-gray.c1q2.handsum diff --git a/test/data/bricks-gray.g3.handsum b/test/data/bricks-gray.c1q3.handsum similarity index 100% rename from test/data/bricks-gray.g3.handsum rename to test/data/bricks-gray.c1q3.handsum diff --git a/test/data/bricks-gray.r3.handsum b/test/data/bricks-gray.c3q3.handsum similarity index 100% rename from test/data/bricks-gray.r3.handsum rename to test/data/bricks-gray.c3q3.handsum diff --git a/test/data/mona-lisa.21x32.r0.handsum b/test/data/mona-lisa.21x32.c3q0.handsum similarity index 100% rename from test/data/mona-lisa.21x32.r0.handsum rename to test/data/mona-lisa.21x32.c3q0.handsum diff --git a/test/data/mona-lisa.21x32.r3.handsum b/test/data/mona-lisa.21x32.c3q3.handsum similarity index 100% rename from test/data/mona-lisa.21x32.r3.handsum rename to test/data/mona-lisa.21x32.c3q3.handsum diff --git a/test/nia-checksums-of-data.txt b/test/nia-checksums-of-data.txt index f760dfe8..63f43d46 100644 --- a/test/nia-checksums-of-data.txt +++ b/test/nia-checksums-of-data.txt @@ -52,6 +52,10 @@ OK. 27a6e456 test/data/artificial-thumbhash/VggKDYAW6lZvdYd6d2iZh_p4GE_k.th OK. d9ce0e57 test/data/artificial-thumbhash/YJqGPQw7sFlslqhFafSE-Q6oJ1h2iHB2Rw.png OK. 4965134c test/data/artificial-thumbhash/YJqGPQw7sFlslqhFafSE-Q6oJ1h2iHB2Rw.th OK. 076cb375 test/data/bricks-color.bmp +OK. 1bb2c55a test/data/bricks-color.c3q0.handsum +OK. 74bb07e1 test/data/bricks-color.c3q1.handsum +OK. 43dd4660 test/data/bricks-color.c3q2.handsum +OK. 79b8bd57 test/data/bricks-color.c3q3.handsum OK. bdbbfadb test/data/bricks-color.etc1.pkm OK. 41e6110e test/data/bricks-color.etc1s.pkm OK. 5670f263 test/data/bricks-color.etc2.pkm @@ -60,10 +64,6 @@ OK. 076cb375 test/data/bricks-color.lossless.webp OK. 9d451b1c test/data/bricks-color.lossy.webp OK. 076cb375 test/data/bricks-color.png OK. 076cb375 test/data/bricks-color.qoi -OK. 1bb2c55a test/data/bricks-color.r0.handsum -OK. 74bb07e1 test/data/bricks-color.r1.handsum -OK. 43dd4660 test/data/bricks-color.r2.handsum -OK. 79b8bd57 test/data/bricks-color.r3.handsum OK. 076cb375 test/data/bricks-color.tga OK. f36c2e80 test/data/bricks-dither.bmp OK. f36c2e80 test/data/bricks-dither.gif @@ -71,17 +71,17 @@ OK. f36c2e80 test/data/bricks-dither.lossless.webp OK. f36c2e80 test/data/bricks-dither.no-ancillary.png OK. f36c2e80 test/data/bricks-dither.png OK. c2bce675 test/data/bricks-gray.bmp -OK. 00db551d test/data/bricks-gray.g0.handsum -OK. 5c979d98 test/data/bricks-gray.g1.handsum -OK. 23430f55 test/data/bricks-gray.g2.handsum -OK. 6065d955 test/data/bricks-gray.g3.handsum +OK. 00db551d test/data/bricks-gray.c1q0.handsum +OK. 5c979d98 test/data/bricks-gray.c1q1.handsum +OK. 23430f55 test/data/bricks-gray.c1q2.handsum +OK. 6065d955 test/data/bricks-gray.c1q3.handsum +OK. 6065d955 test/data/bricks-gray.c3q3.handsum OK. c2bce675 test/data/bricks-gray.gif OK. 3a2478ad test/data/bricks-gray.jpeg OK. c2bce675 test/data/bricks-gray.lossless.webp OK. 9d451b1c test/data/bricks-gray.lossy.webp OK. c2bce675 test/data/bricks-gray.no-ancillary.png OK. c2bce675 test/data/bricks-gray.png -OK. 6065d955 test/data/bricks-gray.r3.handsum OK. c2bce675 test/data/bricks-gray.tga OK. 7aebfe6c test/data/bricks-nodither.bmp OK. 7aebfe6c test/data/bricks-nodither.gif @@ -137,6 +137,8 @@ OK. dcbb225a test/data/hippopotamus.ppm OK. ed4b78fc test/data/hippopotamus.regular.gif OK. dcbb225a test/data/hippopotamus.regular.png BAD e4c5926b test/data/hippopotamus.regular.truncated.png +OK. 57441dc9 test/data/mona-lisa.21x32.c3q0.handsum +OK. 39d18fce test/data/mona-lisa.21x32.c3q3.handsum OK. f6bb81e2 test/data/mona-lisa.21x32.etc2.pkm OK. 012ce4cf test/data/mona-lisa.21x32.lossless.webp OK. 012ce4cf test/data/mona-lisa.21x32.png @@ -147,8 +149,6 @@ OK. e8aeb873 test/data/mona-lisa.21x32.q50.lossy.webp OK. 059ecb80 test/data/mona-lisa.21x32.q90.jpeg OK. e8aeb873 test/data/mona-lisa.21x32.q90.lossy.webp OK. 012ce4cf test/data/mona-lisa.21x32.qoi -OK. 57441dc9 test/data/mona-lisa.21x32.r0.handsum -OK. 39d18fce test/data/mona-lisa.21x32.r3.handsum OK. 12fc69a5 test/data/mona-lisa.21x32.th OK. 2dccfe56 test/data/muybridge-frame-000.wbmp OK. db2733f5 test/data/muybridge.apng