ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-07 08:08:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/odin-lang/Odin

Browse Source
This commit is contained in:
gingerBill
2022-06-11 15:13:13 +01:00
parent df5b693de8 ab98108441
commit f33228fd6e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/fmt/fmt.odin
+2 -2
View File
@@ -1903,7 +1903,7 @@ fmt_value :: proc(fi: ^Info, v: any, verb: rune) {
if ol, ok := fi.optional_len.?; ok { if ol, ok := fi.optional_len.?; ok {
n = min(n, ol) 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: case runtime.Type_Info_Dynamic_Array:
array := cast(^mem.Raw_Dynamic_Array)v.data array := cast(^mem.Raw_Dynamic_Array)v.data
@@ -1911,7 +1911,7 @@ fmt_value :: proc(fi: ^Info, v: any, verb: rune) {
if ol, ok := fi.optional_len.?; ok { if ol, ok := fi.optional_len.?; ok {
n = min(n, ol) 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: case runtime.Type_Info_Simd_Vector:
io.write_byte(fi.writer, '<', &fi.n) io.write_byte(fi.writer, '<', &fi.n)
tests/core/image/test_core_image.odin
+2 -1
View File
@@ -20,6 +20,7 @@ import "core:image/qoi"
import "core:bytes" import "core:bytes"
import "core:hash" import "core:hash"
import "core:fmt" import "core:fmt"
import "core:strings"
import "core:mem" import "core:mem"
import "core:os" import "core:os"
@@ -1463,7 +1464,7 @@ run_png_suite :: proc(t: ^testing.T, suite: []PNG_Test) -> (subtotal: int) {
context = runtime.default_context() context = runtime.default_context()
for file in suite { 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 img: ^png.Image
err: png.Error err: png.Error