mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

gg: image: return an optional instead of panic(); darwin: fix nsstring()

Browse Source
This commit is contained in:
Alexander Medvednikov
2020-08-22 17:09:22 +02:00
parent 0bdb096bfa
commit 9e12095111
9 changed files with 101 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vlib/stbi/stbi.v
View File

@ -28,7 +28,7 @@ fn init() {
set_flip_vertically_on_load(false)
}
pub fn load(path string) Image {
pub fn load(path string) ?Image {
ext := path.all_after_last('.')
mut res := Image {
ok: true
@ -38,12 +38,12 @@ pub fn load(path string) Image {
flag := if ext == 'png' { C.STBI_rgb_alpha } else { 0 }
res.data = C.stbi_load(path.str, &res.width, &res.height, &res.nr_channels, flag)
if isnil(res.data) {
panic('stbi image failed to load from "$path"')
return error('stbi image failed to load from "$path"')
}
return res
}
pub fn load_from_memory(buf byteptr, bufsize int) Image {
pub fn load_from_memory(buf byteptr, bufsize int) ?Image {
mut res := Image {
ok: true
data: 0
@ -51,7 +51,7 @@ pub fn load_from_memory(buf byteptr, bufsize int) Image {
flag := C.STBI_rgb_alpha
res.data = C.stbi_load_from_memory(buf, bufsize, &res.width, &res.height, &res.nr_channels, flag)
if isnil(res.data) {
panic('stbi image failed to load from memory')
return error('stbi image failed to load from memory')
}
return res
}