Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-21 06:53:01 +08:00
Code Issues Projects Releases Wiki Activity

Revert "font: add const to lv_font_fmt_txt_dsc_t"

Browse Source 
This reverts commit 8361a9c23d40981d87adc01d43b2b3226753b407.
This commit is contained in:
Gabor Kiss-Vamosi 2019-07-29 15:42:54 +02:00
parent 8361a9c23d
commit ff853105d9
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lv_font/lv_font.h
View File

@ -65,7 +65,7 @@ typedef struct _lv_font_struct
/*Pointer to the font in a font pack (must have the same line height)*/ /*Pointer to the font in a font pack (must have the same line height)*/
uint8_t line_height; /**< The real line height where any text fits*/ uint8_t line_height; /**< The real line height where any text fits*/
uint8_t base_line; /**< Base line measured from the top of the line_height*/ uint8_t base_line; /**< Base line measured from the top of the line_height*/
const void * dsc; /**< Store implementation specific data here*/ void * dsc; /**< Store implementation specific data here*/
#if LV_USE_USER_DATA #if LV_USE_USER_DATA
lv_font_user_data_t user_data; /**< Custom user data for font. */ lv_font_user_data_t user_data; /**< Custom user data for font. */
#endif #endif

2
src/lv_font/lv_font_roboto_12.c
View File

@ -1677,7 +1677,7 @@ static const lv_font_fmt_txt_kern_pair_t kern_pairs =
*--------------------*/ *--------------------*/
/*Store all the custom data of the font*/ /*Store all the custom data of the font*/
static const lv_font_fmt_txt_dsc_t font_dsc = { static lv_font_fmt_txt_dsc_t font_dsc = {
.glyph_bitmap = gylph_bitmap, .glyph_bitmap = gylph_bitmap,
.glyph_dsc = glyph_dsc, .glyph_dsc = glyph_dsc,
.cmaps = cmaps, .cmaps = cmaps,

2
src/lv_font/lv_font_roboto_16.c
View File

@ -2117,7 +2117,7 @@ static const lv_font_fmt_txt_kern_pair_t kern_pairs =
*--------------------*/ *--------------------*/
/*Store all the custom data of the font*/ /*Store all the custom data of the font*/
static const lv_font_fmt_txt_dsc_t font_dsc = { static lv_font_fmt_txt_dsc_t font_dsc = {
.glyph_bitmap = gylph_bitmap, .glyph_bitmap = gylph_bitmap,
.glyph_dsc = glyph_dsc, .glyph_dsc = glyph_dsc,
.cmaps = cmaps, .cmaps = cmaps,

2
src/lv_font/lv_font_roboto_22.c
View File

@ -2993,7 +2993,7 @@ static const lv_font_fmt_txt_kern_pair_t kern_pairs =
*--------------------*/ *--------------------*/
/*Store all the custom data of the font*/ /*Store all the custom data of the font*/
static const lv_font_fmt_txt_dsc_t font_dsc = { static lv_font_fmt_txt_dsc_t font_dsc = {
.glyph_bitmap = gylph_bitmap, .glyph_bitmap = gylph_bitmap,
.glyph_dsc = glyph_dsc, .glyph_dsc = glyph_dsc,
.cmaps = cmaps, .cmaps = cmaps,

2
src/lv_font/lv_font_roboto_28.c
View File

@ -4068,7 +4068,7 @@ static const lv_font_fmt_txt_kern_pair_t kern_pairs =
*--------------------*/ *--------------------*/
/*Store all the custom data of the font*/ /*Store all the custom data of the font*/
static const lv_font_fmt_txt_dsc_t font_dsc = { static lv_font_fmt_txt_dsc_t font_dsc = {
.glyph_bitmap = gylph_bitmap, .glyph_bitmap = gylph_bitmap,
.glyph_dsc = glyph_dsc, .glyph_dsc = glyph_dsc,
.cmaps = cmaps, .cmaps = cmaps,

2
src/lv_font/lv_font_unscii_8.c
View File

@ -433,7 +433,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
*--------------------*/ *--------------------*/
/*Store all the custom data of the font*/ /*Store all the custom data of the font*/
static const lv_font_fmt_txt_dsc_t font_dsc = { static lv_font_fmt_txt_dsc_t font_dsc = {
.glyph_bitmap = gylph_bitmap, .glyph_bitmap = gylph_bitmap,
.glyph_dsc = glyph_dsc, .glyph_dsc = glyph_dsc,
.cmaps = cmaps, .cmaps = cmaps,