vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

ci: fix failing ttf_test.v after making `char` unavailable for variable names

pull/12550/head
Delyan Angelov 2021-11-22 18:28:25 +02:00
parent 42b97ef888
commit bd9564e38b
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
vlib/x/ttf/render_bmp.v
View File

@ -473,23 +473,23 @@ pub fn (mut bmp BitMap) get_chars_bbox(in_string string) []int {
mut i := 0 mut i := 0
for i < in_string.len { for i < in_string.len {
mut char := u16(in_string[i]) mut chr := u16(in_string[i])
// draw the space // draw the space
if int(char) == 32 { if int(chr) == 32 {
w += int(space_cw * bmp.space_cw) w += int(space_cw * bmp.space_cw)
i++ i++
continue continue
} }
// manage unicode chars like latin greek etc // manage unicode chars like latin greek etc
c_len := ((0xe5000000 >> ((char >> 3) & 0x1e)) & 3) + 1 c_len := ((0xe5000000 >> ((chr >> 3) & 0x1e)) & 3) + 1
if c_len > 1 { if c_len > 1 {
tmp_char := utf8.get_uchar(in_string, i) tmp_char := utf8.get_uchar(in_string, i)
// dprintln("tmp_char: ${tmp_char.hex()}") // dprintln("tmp_char: ${tmp_char.hex()}")
char = u16(tmp_char) chr = u16(tmp_char)
} }
c_index := bmp.tf.map_code(int(char)) c_index := bmp.tf.map_code(int(chr))
// Glyph not found // Glyph not found
if c_index == 0 { if c_index == 0 {
w += int(space_cw * bmp.space_cw) w += int(space_cw * bmp.space_cw)
@ -500,8 +500,8 @@ pub fn (mut bmp BitMap) get_chars_bbox(in_string string) []int {
ax, ay := bmp.tf.next_kern(c_index) ax, ay := bmp.tf.next_kern(c_index)
// dprintln("char_index: $c_index ax: $ax ay: $ay") // dprintln("char_index: $c_index ax: $ax ay: $ay")
// cw, lsb := bmp.tf.get_horizontal_metrics(u16(char)) // cw, lsb := bmp.tf.get_horizontal_metrics(u16(chr))
// dprintln("metrics: [${u16(char):c}] cw:$cw lsb:$lsb") // dprintln("metrics: [${u16(chr):c}] cw:$cw lsb:$lsb")
//----- Calc Glyph transformations ----- //----- Calc Glyph transformations -----
mut x0 := w + int(ax * bmp.scale) mut x0 := w + int(ax * bmp.scale)
@ -544,23 +544,23 @@ pub fn (mut bmp BitMap) get_bbox(in_string string) (int, int) {
mut i := 0 mut i := 0
for i < in_string.len { for i < in_string.len {
mut char := u16(in_string[i]) mut chr := u16(in_string[i])
// draw the space // draw the space
if int(char) == 32 { if int(chr) == 32 {
w += int(space_cw * bmp.space_cw) w += int(space_cw * bmp.space_cw)
i++ i++
continue continue
} }
// manage unicode chars like latin greek etc // manage unicode chars like latin greek etc
c_len := ((0xe5000000 >> ((char >> 3) & 0x1e)) & 3) + 1 c_len := ((0xe5000000 >> ((chr >> 3) & 0x1e)) & 3) + 1
if c_len > 1 { if c_len > 1 {
tmp_char := utf8.get_uchar(in_string, i) tmp_char := utf8.get_uchar(in_string, i)
// dprintln("tmp_char: ${tmp_char.hex()}") // dprintln("tmp_char: ${tmp_char.hex()}")
char = u16(tmp_char) chr = u16(tmp_char)
} }
c_index := bmp.tf.map_code(int(char)) c_index := bmp.tf.map_code(int(chr))
// Glyph not found // Glyph not found
if c_index == 0 { if c_index == 0 {
w += int(space_cw * bmp.space_cw) w += int(space_cw * bmp.space_cw)
@ -570,8 +570,8 @@ pub fn (mut bmp BitMap) get_bbox(in_string string) (int, int) {
ax, ay := bmp.tf.next_kern(c_index) ax, ay := bmp.tf.next_kern(c_index)
// dprintln("char_index: $c_index ax: $ax ay: $ay") // dprintln("char_index: $c_index ax: $ax ay: $ay")
// cw, lsb := bmp.tf.get_horizontal_metrics(u16(char)) // cw, lsb := bmp.tf.get_horizontal_metrics(u16(chr))
// dprintln("metrics: [${u16(char):c}] cw:$cw lsb:$lsb") // dprintln("metrics: [${u16(chr):c}] cw:$cw lsb:$lsb")
//----- Calc Glyph transformations ----- //----- Calc Glyph transformations -----
mut x0 := w + int(ax * bmp.scale) mut x0 := w + int(ax * bmp.scale)
@ -639,23 +639,23 @@ pub fn (mut bmp BitMap) draw_text(in_string string) (int, int) {
mut i := 0 mut i := 0
for i < in_string.len { for i < in_string.len {
mut char := u16(in_string[i]) mut chr := u16(in_string[i])
// draw the space // draw the space
if int(char) == 32 { if int(chr) == 32 {
w += int(space_cw * bmp.space_cw) w += int(space_cw * bmp.space_cw)
i++ i++
continue continue
} }
// manage unicode chars like latin greek etc // manage unicode chars like latin greek etc
c_len := ((0xe5000000 >> ((char >> 3) & 0x1e)) & 3) + 1 c_len := ((0xe5000000 >> ((chr >> 3) & 0x1e)) & 3) + 1
if c_len > 1 { if c_len > 1 {
tmp_char := utf8.get_uchar(in_string, i) tmp_char := utf8.get_uchar(in_string, i)
// dprintln("tmp_char: ${tmp_char.hex()}") // dprintln("tmp_char: ${tmp_char.hex()}")
char = u16(tmp_char) chr = u16(tmp_char)
} }
c_index := bmp.tf.map_code(int(char)) c_index := bmp.tf.map_code(int(chr))
// Glyph not found // Glyph not found
if c_index == 0 { if c_index == 0 {
bmp.draw_notdef_glyph(w, int(space_cw * bmp.space_cw)) bmp.draw_notdef_glyph(w, int(space_cw * bmp.space_cw))
@ -667,9 +667,9 @@ pub fn (mut bmp BitMap) draw_text(in_string string) (int, int) {
ax, ay := bmp.tf.next_kern(c_index) ax, ay := bmp.tf.next_kern(c_index)
// dprintln("char_index: $c_index ax: $ax ay: $ay") // dprintln("char_index: $c_index ax: $ax ay: $ay")
cw, _ := bmp.tf.get_horizontal_metrics(u16(char)) cw, _ := bmp.tf.get_horizontal_metrics(u16(chr))
// cw, lsb := bmp.tf.get_horizontal_metrics(u16(char)) // cw, lsb := bmp.tf.get_horizontal_metrics(u16(chr))
// dprintln("metrics: [${u16(char):c}] cw:$cw lsb:$lsb") // dprintln("metrics: [${u16(chr):c}] cw:$cw lsb:$lsb")
//----- Draw_Glyph transformations ----- //----- Draw_Glyph transformations -----
mut x0 := w + int(ax * bmp.scale) mut x0 := w + int(ax * bmp.scale)