github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

font update

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2019-05-11 07:58:37 +02:00
parent 18d59bef01
commit 7f30fb0058
2 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/lv_misc/lv_font.h
View File

@@ -101,14 +101,36 @@ typedef struct
const lv_font_kern_t * kern_table; const lv_font_kern_t * kern_table;
}lv_font_glyph_dsc_built_in_t; }lv_font_glyph_dsc_built_in_t;
typedef struct {
/* First Unicode character for this range */
uint32_t range_start;
/* Number of Unicode characters related to this range.
* Last Unicode character = range_start + range_length - 1*/
uint16_t range_length;
/* First glyph ID (array index of `glyph_dsc`) for this range */
uint16_t glyph_id_start;
/* NULL: the range is mapped continuously from `glyph_id_start`
* Else map the Unicode characters from `glyph_id_start` (relative to `range_start`)*/
uint16_t * unicode_list;
}lv_font_cmap_built_in_t;
/*Describe store additional data for fonts */ /*Describe store additional data for fonts */
typedef struct { typedef struct {
const uint8_t * glyph_bitmap; const uint8_t * glyph_bitmap;
const lv_font_glyph_dsc_built_in_t * glyph_dsc; const lv_font_glyph_dsc_built_in_t * glyph_dsc;
const uint16_t * unicode_list;
uint16_t glyph_cnt; /*Number of glyphs in the font. */ /* Map the glyphs to Unicode characters.
uint8_t bpp; /*Bit per pixel: 1, 2, 4 or 8*/ * Array of `lv_font_cmap_built_in_t` variables*/
const lv_font_cmap_built_in_t * cmaps;
/*Number of cmap tables*/
uint8_t cmap_num;
/*Bit per pixel: 1, 2, 4 or 8*/
uint8_t bpp;
}lv_font_dsc_built_in_t; }lv_font_dsc_built_in_t;
/********************** /**********************

28
src/lv_misc/lv_font_dummy.h
View File

@@ -101,14 +101,36 @@ typedef struct
const lv_font_kern_t * kern_table; const lv_font_kern_t * kern_table;
}lv_font_glyph_dsc_built_in_t; }lv_font_glyph_dsc_built_in_t;
typedef struct {
/* First Unicode character for this range */
uint32_t range_start;
/* Number of Unicode characters related to this range.
* Last Unicode character = range_start + range_length - 1*/
uint16_t range_length;
/* First glyph ID (array index of `glyph_dsc`) for this range */
uint16_t glyph_id_start;
/* NULL: the range is mapped continuously from `glyph_id_start`
* Else map the Unicode characters from `glyph_id_start` (relative to `range_start`)*/
uint16_t * unicode_list;
}lv_font_cmap_built_in_t;
/*Describe store additional data for fonts */ /*Describe store additional data for fonts */
typedef struct { typedef struct {
const uint8_t * glyph_bitmap; const uint8_t * glyph_bitmap;
const lv_font_glyph_dsc_built_in_t * glyph_dsc; const lv_font_glyph_dsc_built_in_t * glyph_dsc;
const uint16_t * unicode_list;
uint16_t glyph_cnt; /*Number of glyphs in the font. */ /* Map the glyphs to Unicode characters.
uint8_t bpp; /*Bit per pixel: 1, 2, 4 or 8*/ * Array of `lv_font_cmap_built_in_t` variables*/
const lv_font_cmap_built_in_t * cmaps;
/*Number of cmap tables*/
uint8_t cmap_num;
/*Bit per pixel: 1, 2, 4 or 8*/
uint8_t bpp;
}lv_font_dsc_built_in_t; }lv_font_dsc_built_in_t;
/********************** /**********************