mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-01-09 22:42:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add destroy with loader

Browse Source
This commit is contained in:
gingerBill
2022-05-14 15:06:55 +01:00
parent 4e080057fb
commit 3aa0a733f3
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/image/general_loader.odin
View File

@@ -4,13 +4,20 @@ import "core:mem"
import "core:os"
Loader_Proc :: #type proc(data: []byte, options: Options, allocator: mem.Allocator) -> (img: ^Image, err: Error)
Destroy_Proc :: #type proc(img: ^Image)
@(private)
_internal_loaders: [Which_File_Type]Loader_Proc
_internal_destroyers: [Which_File_Type]Destroy_Proc
register_loader :: proc(kind: Which_File_Type, loader: Loader_Proc) {
register :: proc(kind: Which_File_Type, loader: Loader_Proc, destroyer: Destroy_Proc) {
assert(loader != nil)
assert(destroyer != nil)
assert(_internal_loaders[kind] == nil)
_internal_loaders[kind] = loader
assert(_internal_destroyers[kind] == nil)
_internal_destroyers[kind] = destroyer
}
load :: proc{
@@ -33,7 +40,6 @@ load_from_file :: proc(filename: string, options := Options{}, allocator := cont
if ok {
return load_from_bytes(data, options, allocator)
} else {
img = new(Image, allocator)
return img, .Unable_To_Read_File
return nil, .Unable_To_Read_File
}
}

13
core/image/netpbm/netpbm.odin
View File

@@ -755,9 +755,12 @@ _register :: proc() {
loader :: proc(data: []byte, options: image.Options, allocator: mem.Allocator) -> (img: ^Image, err: Error) {
return load_from_bytes(data, allocator)
}
image.register_loader(.PBM, loader)
image.register_loader(.PGM, loader)
image.register_loader(.PPM, loader)
image.register_loader(.PAM, loader)
image.register_loader(.PFM, loader)
destroyer :: proc(img: ^Image) {
_ = destroy(img)
}
image.register(.PBM, loader, destroyer)
image.register(.PGM, loader, destroyer)
image.register(.PPM, loader, destroyer)
image.register(.PAM, loader, destroyer)
image.register(.PFM, loader, destroyer)
}

5
core/image/png/png.odin
View File

@@ -344,8 +344,7 @@ load_from_file :: proc(filename: string, options := Options{}, allocator := cont
if ok {
return load_from_bytes(data, options)
} else {
img = new(Image)
return img, .Unable_To_Read_File
return nil, .Unable_To_Read_File
}
}
@@ -1642,5 +1641,5 @@ load :: proc{load_from_file, load_from_bytes, load_from_context}
@(init, private)
_register :: proc() {
image.register_loader(.PNG, load_from_bytes)
image.register(.PNG, load_from_bytes, destroy)
}

5
core/image/qoi/qoi.odin
View File

@@ -198,8 +198,7 @@ load_from_file :: proc(filename: string, options := Options{}, allocator := cont
if ok {
return load_from_bytes(data, options)
} else {
img = new(Image)
return img, .Unable_To_Read_File
return nil, .Unable_To_Read_File
}
}
@@ -407,5 +406,5 @@ qoi_hash :: #force_inline proc(pixel: RGBA_Pixel) -> (index: u8) {
@(init, private)
_register :: proc() {
image.register_loader(.QOI, load_from_bytes)
image.register(.QOI, load_from_bytes, destroy)
}