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

ci: remove some tests from skip_with_werror in v test-self

Browse source
This commit is contained in:
Delyan Angelov 2021-04-14 12:47:24 +03:00
parent 980521824f
commit 3e297bced4
No known key found for this signature in database
GPG key ID: 66886C0F12D595ED
16 changed files with 59 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

14
vlib/fontstash/fontstash.v
View file

@ -51,7 +51,7 @@ pub fn (s &C.FONScontext) reset_atlas(width int, height int) int {
// Add fonts
[inline]
pub fn (s &C.FONScontext) get_font_by_name(name byteptr) int {
pub fn (s &C.FONScontext) get_font_by_name(name &char) int {
return C.fonsGetFontByName(s, name)
}
@ -61,7 +61,7 @@ pub fn (s &C.FONScontext) add_fallback_font(base int, fallback int) int {
}
[inline]
pub fn (s &C.FONScontext) add_font_mem(name byteptr, data byteptr, data_size int, free_data int) int {
pub fn (s &C.FONScontext) add_font_mem(name &char, data &byte, data_size int, free_data int) int {
return C.fonsAddFontMem(s, name, data, data_size, free_data)
}
@ -114,13 +114,13 @@ pub fn (s &C.FONScontext) set_font(font int) {
// Draw text
[inline]
pub fn (s &C.FONScontext) draw_text(x f32, y f32, str byteptr, end byteptr) f32 {
pub fn (s &C.FONScontext) draw_text(x f32, y f32, str &char, end &char) f32 {
return C.fonsDrawText(s, x, y, str, end)
}
// Measure text
[inline]
pub fn (s &C.FONScontext) text_bounds(x f32, y f32, str byteptr, end byteptr, bounds &f32) f32 {
pub fn (s &C.FONScontext) text_bounds(x f32, y f32, str &char, end &char, bounds &f32) f32 {
return C.fonsTextBounds(s, x, y, str, end, bounds)
}
@ -136,7 +136,7 @@ pub fn (s &C.FONScontext) vert_metrics(ascender &f32, descender &f32, lineh &f32
// Text iterator
[inline]
pub fn (s &C.FONScontext) text_iter_init(iter &C.FONStextIter, x f32, y f32, str byteptr, end byteptr) int {
pub fn (s &C.FONScontext) text_iter_init(iter &C.FONStextIter, x f32, y f32, str &char, end &char) int {
return C.fonsTextIterInit(s, iter, x, y, str, end)
}
@ -147,8 +147,8 @@ pub fn (s &C.FONScontext) text_iter_next(iter &C.FONStextIter, quad &C.FONSquad)
// Pull texture changes
[inline]
pub fn (s &C.FONScontext) get_texture_data(width &int, height &int) byteptr {
return C.fonsGetTextureData(s, width, height)
pub fn (s &C.FONScontext) get_texture_data(width &int, height &int) &byte {
return &byte(C.fonsGetTextureData(s, width, height))
}
[inline]

17
vlib/fontstash/fontstash_funcs.v
View file

@ -4,18 +4,21 @@ module fontstash
fn C.fonsCreateInternal(params &C.FONSparams) &C.FONScontext
fn C.fonsDeleteInternal(s &C.FONScontext)
fn C.fonsSetErrorCallback(s &C.FONScontext, callback fn(uptr voidptr, error int, val int), uptr voidptr)
fn C.fonsSetErrorCallback(s &C.FONScontext, callback fn (voidptr, int, int), uptr voidptr)
// Returns current atlas size.
fn C.fonsGetAtlasSize(s &C.FONScontext, width &int, height &int)
// Expands the atlas size.
fn C.fonsExpandAtlas(s &C.FONScontext, width int, height int) int
// Resets the whole stash.
fn C.fonsResetAtlas(s &C.FONScontext, width int, height int) int
// Add fonts
fn C.fonsGetFontByName(s &C.FONScontext, name byteptr) int
fn C.fonsGetFontByName(s &C.FONScontext, name &char) int
fn C.fonsAddFallbackFont(s &C.FONScontext, base int, fallback int) int
fn C.fonsAddFontMem(s &C.FONScontext, name byteptr, data byteptr, dataSize int, freeData int) int
fn C.fonsAddFontMem(s &C.FONScontext, name &char, data &byte, dataSize int, freeData int) int
// State handling
fn C.fonsPushState(s &C.FONScontext)
@ -31,19 +34,19 @@ fn C.fonsSetAlign(s &C.FONScontext, align int)
fn C.fonsSetFont(s &C.FONScontext, font int)
// Draw text
fn C.fonsDrawText(s &C.FONScontext, x f32, y f32, str byteptr, end byteptr) f32
fn C.fonsDrawText(s &C.FONScontext, x f32, y f32, str &char, end &char) f32
// Measure text
fn C.fonsTextBounds(s &C.FONScontext, x f32, y f32, str byteptr, end byteptr, bounds &f32) f32
fn C.fonsTextBounds(s &C.FONScontext, x f32, y f32, str &char, end &char, bounds &f32) f32
fn C.fonsLineBounds(s &C.FONScontext, y f32, miny &f32, maxy &f32)
fn C.fonsVertMetrics(s &C.FONScontext, ascender &f32, descender &f32, lineh &f32)
// Text iterator
fn C.fonsTextIterInit(s &C.FONScontext, iter &C.FONStextIter, x f32, y f32, str byteptr, end byteptr) int
fn C.fonsTextIterInit(s &C.FONScontext, iter &C.FONStextIter, x f32, y f32, str &char, end &char) int
fn C.fonsTextIterNext(s &C.FONScontext, iter &C.FONStextIter, quad &C.FONSquad) int
// Pull texture changes
fn C.fonsGetTextureData(s &C.FONScontext, width &int, height &int) byteptr
fn C.fonsGetTextureData(s &C.FONScontext, width &int, height &int) &char
fn C.fonsValidateTexture(s &C.FONScontext, dirty &int) int
// Draws the stash texture for debugging