From 5234a0ca299cf8a099982db66045741fa6bac26b Mon Sep 17 00:00:00 2001 From: Brendan Hansen Date: Tue, 8 Dec 2020 12:00:19 -0600 Subject: [PATCH] small update with onyx changes --- src/font.onyx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/font.onyx b/src/font.onyx index 1ebb872..458a222 100644 --- a/src/font.onyx +++ b/src/font.onyx @@ -42,11 +42,11 @@ binary_reader_create :: proc (data: [] u8, initial_pos := 0) -> BinaryReader { #private_file read_u32 :: proc (use br: ^BinaryReader) -> u32 { // Encoding is big endian - ret := 0; - ret |= ~~read_u8(br) << 24; - ret |= ~~read_u8(br) << 16; - ret |= ~~read_u8(br) << 8; - ret |= ~~read_u8(br); + ret: u32 = 0; + ret |= cast(u32) read_u8(br) << 24; + ret |= cast(u32) read_u8(br) << 16; + ret |= cast(u32) read_u8(br) << 8; + ret |= cast(u32) read_u8(br); return ret; } @@ -247,7 +247,7 @@ ttf_lookup_glyph_offset :: proc (use ttf: ^TrueTypeFont, glyph_index: i32) -> u3 case #default { old = seek(^reader, loca_table_info.offset + glyph_index * 2); - return 2 * ~~read_u16(^reader) + glyf_table_info.offset; + return 2 * cast(u32) read_u16(^reader) + glyf_table_info.offset; } } @@ -785,8 +785,8 @@ ttf_calc_table_checksum :: proc (reader: ^BinaryReader, offset: u32, length: u32 #private_file string_to_beu32 :: proc (s: string) -> u32 { - return (~~s[0] << 24) - | (~~s[1] << 16) - | (~~s[2] << 8) - | (~~s[3]); + return (cast(u32) s[0] << 24) + | (cast(u32) s[1] << 16) + | (cast(u32) s[2] << 8) + | (cast(u32) s[3]); } -- 2.25.1