From c75dd143082879e7c6031faf039519cc40de9fee Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 11 Jun 2022 02:03:54 +0100 Subject: [PATCH 1/2] Fix typo --- core/fmt/fmt.odin | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/fmt/fmt.odin b/core/fmt/fmt.odin index 2a2875247..e14a3bda9 100644 --- a/core/fmt/fmt.odin +++ b/core/fmt/fmt.odin @@ -1811,7 +1811,7 @@ fmt_value :: proc(fi: ^Info, v: any, verb: rune) { if ol, ok := fi.optional_len.?; ok { n = min(n, ol) } - fmt_array(fi, v.data, n, info.elem_size, info.elem, verb) + fmt_array(fi, slice.data, n, info.elem_size, info.elem, verb) case runtime.Type_Info_Dynamic_Array: array := cast(^mem.Raw_Dynamic_Array)v.data @@ -1819,7 +1819,7 @@ fmt_value :: proc(fi: ^Info, v: any, verb: rune) { if ol, ok := fi.optional_len.?; ok { n = min(n, ol) } - fmt_array(fi, v.data, n, info.elem_size, info.elem, verb) + fmt_array(fi, array.data, n, info.elem_size, info.elem, verb) case runtime.Type_Info_Simd_Vector: io.write_byte(fi.writer, '<', &fi.n) From ab98108441aaf9d2abd49bb7ca8bec2e80554476 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sat, 11 Jun 2022 16:07:56 +0200 Subject: [PATCH 2/2] [image/png] Construct test paths differently. --- tests/core/image/test_core_image.odin | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/core/image/test_core_image.odin b/tests/core/image/test_core_image.odin index 9c9831199..171e4674d 100644 --- a/tests/core/image/test_core_image.odin +++ b/tests/core/image/test_core_image.odin @@ -20,6 +20,7 @@ import "core:image/qoi" import "core:bytes" import "core:hash" import "core:fmt" +import "core:strings" import "core:mem" import "core:os" @@ -1463,7 +1464,7 @@ run_png_suite :: proc(t: ^testing.T, suite: []PNG_Test) -> (subtotal: int) { context = runtime.default_context() for file in suite { - test_file := fmt.tprintf("%v/%v.png", TEST_SUITE_PATH, file.file) + test_file := strings.concatenate({TEST_SUITE_PATH, "/", file.file, ".png"}, context.temp_allocator) img: ^png.Image err: png.Error