diff --git a/src/font/lv_font_fmt_txt.h b/src/font/lv_font_fmt_txt.h index a3d27bc09..672c4358c 100644 --- a/src/font/lv_font_fmt_txt.h +++ b/src/font/lv_font_fmt_txt.h @@ -227,10 +227,6 @@ const uint8_t * lv_font_get_bitmap_fmt_txt(const lv_font_t * font, uint32_t unic bool lv_font_get_glyph_dsc_fmt_txt(const lv_font_t * font, lv_font_glyph_dsc_t * dsc_out, uint32_t unicode_letter, uint32_t unicode_letter_next); -/** - * Free the allocated memories. - */ -void _lv_font_clean_up_fmt_txt(void); /********************** * MACROS diff --git a/src/misc/lv_anim_timeline.c b/src/misc/lv_anim_timeline.c index 9d26300fb..af871348e 100644 --- a/src/misc/lv_anim_timeline.c +++ b/src/misc/lv_anim_timeline.c @@ -19,18 +19,7 @@ * TYPEDEFS **********************/ -/*Data of anim_timeline_dsc*/ -typedef struct { - lv_anim_t anim; - uint32_t start_time; -} lv_anim_timeline_dsc_t; -/*Data of anim_timeline*/ -struct _lv_anim_timeline_t { - lv_anim_timeline_dsc_t * anim_dsc; /**< Dynamically allocated anim dsc array*/ - uint32_t anim_dsc_cnt; /**< The length of anim dsc array*/ - bool reverse; /**< Reverse playback*/ -}; /********************** * STATIC PROTOTYPES diff --git a/src/misc/lv_anim_timeline.h b/src/misc/lv_anim_timeline.h index d4dd0fcf3..5339fa8a5 100644 --- a/src/misc/lv_anim_timeline.h +++ b/src/misc/lv_anim_timeline.h @@ -23,9 +23,18 @@ extern "C" { * TYPEDEFS **********************/ -struct _lv_anim_timeline_t; +/*Data of anim_timeline_dsc*/ +typedef struct { + lv_anim_t anim; + uint32_t start_time; +} lv_anim_timeline_dsc_t; -typedef struct _lv_anim_timeline_t lv_anim_timeline_t; +/*Data of anim_timeline*/ +typedef struct { + lv_anim_timeline_dsc_t * anim_dsc; /**< Dynamically allocated anim dsc array*/ + uint32_t anim_dsc_cnt; /**< The length of anim dsc array*/ + bool reverse; /**< Reverse playback*/ +} lv_anim_timeline_t; /********************** * GLOBAL PROTOTYPES diff --git a/src/misc/lv_event.c b/src/misc/lv_event.c index 333828017..7fc68b664 100644 --- a/src/misc/lv_event.c +++ b/src/misc/lv_event.c @@ -18,11 +18,6 @@ /********************** * TYPEDEFS **********************/ -struct _lv_event_dsc_t { - lv_event_cb_t cb; - void * user_data; - uint32_t filter; -}; /********************** * STATIC PROTOTYPES diff --git a/src/misc/lv_event.h b/src/misc/lv_event.h index c8a88d2fd..2d891b5c5 100644 --- a/src/misc/lv_event.h +++ b/src/misc/lv_event.h @@ -25,9 +25,17 @@ extern "C" { /********************** * TYPEDEFS **********************/ +struct _lv_event_t; + +typedef void (*lv_event_cb_t)(struct _lv_event_t * e); + + +typedef struct { + lv_event_cb_t cb; + void * user_data; + uint32_t filter; +} lv_event_dsc_t; -struct _lv_event_dsc_t; -typedef struct _lv_event_dsc_t lv_event_dsc_t; /** * Type of event being sent to the object. @@ -131,7 +139,6 @@ typedef struct _lv_event_t { * Events are used to notify the user of some action being taken on the object. * For details, see ::lv_event_t. */ -typedef void (*lv_event_cb_t)(lv_event_t * e); /********************** * GLOBAL PROTOTYPES