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

Rename load_from_slice to load_from_bytes across core

Browse Source
This commit is contained in:
gingerBill
2022-05-14 14:55:15 +01:00
parent e46d87b221
commit 9c1f270bd5
5 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/image/general_loader.odin
+3 -3
View File
@@ -14,11 +14,11 @@ register_loader :: proc(kind: Which_File_Type, loader: Loader_Proc) {
}
load :: proc{
load_from_slice,
load_from_bytes,
load_from_file,
}
load_from_slice :: proc(data: []u8, options := Options{}, allocator := context.allocator) -> (img: ^Image, err: Error) {
load_from_bytes :: proc(data: []byte, options := Options{}, allocator := context.allocator) -> (img: ^Image, err: Error) {
loader := _internal_loaders[which(data)]
if loader == nil {
return nil, .Unsupported_Format
@@ -31,7 +31,7 @@ load_from_file :: proc(filename: string, options := Options{}, allocator := cont
data, ok := os.read_entire_file(filename, allocator)
defer delete(data, allocator)
if ok {
return load_from_slice(data, options, allocator)
return load_from_bytes(data, options, allocator)
} else {
img = new(Image, allocator)
return img, .Unable_To_Read_File