mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-13 14:32:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

vfmt: change all '$expr' to '${expr}' (#16428)

Browse source
This commit is contained in:
yuyi 2022-11-15 21:53:13 +08:00 • committed by GitHub
parent 56239b4a23
commit 017ace6ea7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
859 changed files with 7156 additions and 7135 deletions
Download patch file Download diff file Expand all files Collapse all files

14
vlib/stbi/stbi.c.v
View file

@ -12,14 +12,14 @@ fn trace_allocation(message string) {
[export: 'stbi__callback_malloc']
fn cb_malloc(s usize) voidptr {
res := unsafe { malloc(isize(s)) }
trace_allocation('> stbi__callback_malloc: $s => ${ptr_str(res)}')
trace_allocation('> stbi__callback_malloc: ${s} => ${ptr_str(res)}')
return res
}
[export: 'stbi__callback_realloc']
fn cb_realloc(p voidptr, s usize) voidptr {
res := unsafe { v_realloc(p, isize(s)) }
trace_allocation('> stbi__callback_realloc: ${ptr_str(p)} , $s => ${ptr_str(res)}')
trace_allocation('> stbi__callback_realloc: ${ptr_str(p)} , ${s} => ${ptr_str(res)}')
return res
}
@ -126,7 +126,7 @@ pub fn load(path string) !Image {
res.nr_channels = 4
}
if isnil(res.data) {
return error('stbi_image failed to load from "$path"')
return error('stbi_image failed to load from "${path}"')
}
return res
}
@ -162,21 +162,21 @@ fn C.stbi_write_jpg(filename &char, w int, h int, comp int, buffer &u8, quality
// row_stride_in_bytes is usually equal to: w * comp
pub fn stbi_write_png(path string, w int, h int, comp int, buf &u8, row_stride_in_bytes int) ! {
if 0 == C.stbi_write_png(&char(path.str), w, h, comp, buf, row_stride_in_bytes) {
return error('stbi_image failed to write png file to "$path"')
return error('stbi_image failed to write png file to "${path}"')
}
}
// stbi_write_png write on path a BMP file
pub fn stbi_write_bmp(path string, w int, h int, comp int, buf &u8) ! {
if 0 == C.stbi_write_bmp(&char(path.str), w, h, comp, buf) {
return error('stbi_image failed to write bmp file to "$path"')
return error('stbi_image failed to write bmp file to "${path}"')
}
}
// stbi_write_png write on path a TGA file
pub fn stbi_write_tga(path string, w int, h int, comp int, buf &u8) ! {
if 0 == C.stbi_write_tga(&char(path.str), w, h, comp, buf) {
return error('stbi_image failed to write tga file to "$path"')
return error('stbi_image failed to write tga file to "${path}"')
}
}
@ -185,7 +185,7 @@ pub fn stbi_write_tga(path string, w int, h int, comp int, buf &u8) ! {
// quality is between 1 and 100. Higher quality looks better but results in a bigger image.
pub fn stbi_write_jpg(path string, w int, h int, comp int, buf &u8, quality int) ! {
if 0 == C.stbi_write_jpg(&char(path.str), w, h, comp, buf, quality) {
return error('stbi_image failed to write jpg file to "$path"')
return error('stbi_image failed to write jpg file to "${path}"')
}
}

8
vlib/stbi/stbi_test.v
View file

@ -14,18 +14,18 @@ fn testsuite_end() {
fn test_stbi_read_write() {
vroot := @VEXEROOT
path := os.join_path(vroot, 'examples', 'assets', 'logo.png')
println('Source path: $path')
println('Source path: ${path}')
d_s := stbi.load(path) or { panic(err) }
println('Image source data:\n $d_s')
println('Image source data:\n ${d_s}')
out_path := os.join_path(tfolder, 'test.png')
println('Out path: $out_path')
println('Out path: ${out_path}')
stbi.stbi_write_png(out_path, d_s.width, d_s.height, 4, d_s.data, d_s.width * 4) or {
panic(err)
}
d_d := stbi.load(out_path) or { panic(err) }
println('Image dest data:\n $d_d')
println('Image dest data:\n ${d_d}')
assert d_s.width == d_d.width
assert d_s.height == d_d.height