wuqiyang312
/
u8g2-copy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

towards 2.20.11

This commit is contained in:
olikraus 2017-12-09 23:10:36 +01:00
parent 4398f247cf
commit cf46fec0f3
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/font/bdfconv/Makefile
View File

@ -68,6 +68,9 @@ lubr24: bdfconv
lurs24: bdfconv
./bdfconv -f 1 -m '32-255' -p 10 luRS24.bdf -o luRS24.c -n u8g2_font_luRS24 -d ../bdf/helvB12.bdf
siji: bdfconv
./bdfconv -v -f 1 -m '32-$$ffff' ./siji.bdf -o test.c -n test -d ../bdf/helvB12.bdf
# http://stackoverflow.com/questions/713397/what-is-a-minimal-set-of-unicode-characters-for-reasonable-japanese-support

4
tools/font/bdfconv/bdf_tga.c
View File

@ -109,6 +109,8 @@ void tga_set_pixel(uint16_t x, uint16_t y, uint8_t r, uint8_t g, uint8_t b)
if ( p[0] != 255 || p[1] != 255 || p[2] != 255 )
tga_pixel_intersection = 1;
//printf("tga_set_pixel %d %d\n", x, y);
*p++ = b;
*p++ = g;
*p++ = r;
@ -153,7 +155,7 @@ void tga_save(const char *name)
tga_write_word(fp, tga_used_height+1); /* height */
tga_write_byte(fp, 24); /* color depth */
tga_write_byte(fp, 0);
fwrite(tga_data, tga_width*3, tga_used_height+1, fp);
fwrite(tga_data + (tga_height - (tga_used_height+1))*tga_width*3 , tga_width*3, tga_used_height+1, fp);
tga_write_word(fp, 0);
tga_write_word(fp, 0);
tga_write_word(fp, 0);

8
tools/font/bdfconv/main.c
View File

@ -232,11 +232,14 @@ unsigned tga_draw_font(unsigned y, const char *fontname, bf_t *bf_desc_font, bf_
unsigned x, xmax;
xmax = 0;
bf_Log(bf, "Draw TGA, line height %d", tga_get_line_height(bf_desc_font, bf));
y += tga_draw_font_info( y, fontname, bf_desc_font, bf);
y += tga_get_line_height(bf_desc_font, bf)+1;
for( i = 0; i <= 0x0ffff; i+=16 )
{
x = tga_draw_font_line(y, i, bf_desc_font, bf);
@ -245,9 +248,12 @@ unsigned tga_draw_font(unsigned y, const char *fontname, bf_t *bf_desc_font, bf_
if ( xmax < x )
xmax = x;
y += tga_get_line_height(bf_desc_font, bf)+1;
//bf_Log(bf, "Draw TGA, encoding %04x, y %d", i, y);
}
}
bf_Log(bf, "Draw TGA, xmax %d", xmax);
tga_set_font(bf->target_data);
//tga_draw_string(0, y, "Woven silk pyjamas exchanged for blue quartz", 1, xmax);
@ -401,6 +407,8 @@ int main(int argc, char **argv)
bf_Log(bf, "Runtime test: %.2lf sec", (double)(clock()-c)/(double)CLOCKS_PER_SEC);
}
tga_set_pixel(1, 1, 0, 0, 0);
tga_save("bdf.tga");
}

2
tools/release/print_release.sh
View File

@ -1,2 +1,2 @@
# without 'v' prefix
echo -n "2.20.11"
echo -n "2.20.12"