1
0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-21 06:53:01 +08:00

Merge b19fb8620f9d59d86580e380796f78d52b5a373f into dev

This commit is contained in:
github-actions[bot] 2020-11-06 08:51:06 +00:00 committed by GitHub
commit 8a489b3a8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -42,22 +42,26 @@ static int32_t unicode_list_compare(const void * ref, const void * element);
static int32_t kern_pair_8_compare(const void * ref, const void * element); static int32_t kern_pair_8_compare(const void * ref, const void * element);
static int32_t kern_pair_16_compare(const void * ref, const void * element); static int32_t kern_pair_16_compare(const void * ref, const void * element);
#if LV_USE_FONT_COMPRESSED
static void decompress(const uint8_t * in, uint8_t * out, lv_coord_t w, lv_coord_t h, uint8_t bpp, bool prefilter); static void decompress(const uint8_t * in, uint8_t * out, lv_coord_t w, lv_coord_t h, uint8_t bpp, bool prefilter);
static inline void decompress_line(uint8_t * out, lv_coord_t w); static inline void decompress_line(uint8_t * out, lv_coord_t w);
static inline uint8_t get_bits(const uint8_t * in, uint32_t bit_pos, uint8_t len); static inline uint8_t get_bits(const uint8_t * in, uint32_t bit_pos, uint8_t len);
static inline void bits_write(uint8_t * out, uint32_t bit_pos, uint8_t val, uint8_t len); static inline void bits_write(uint8_t * out, uint32_t bit_pos, uint8_t val, uint8_t len);
static inline void rle_init(const uint8_t * in, uint8_t bpp); static inline void rle_init(const uint8_t * in, uint8_t bpp);
static inline uint8_t rle_next(void); static inline uint8_t rle_next(void);
#endif /* LV_USE_FONT_COMPRESSED */
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
**********************/ **********************/
#if LV_USE_FONT_COMPRESSED
static uint32_t rle_rdp; static uint32_t rle_rdp;
static const uint8_t * rle_in; static const uint8_t * rle_in;
static uint8_t rle_bpp; static uint8_t rle_bpp;
static uint8_t rle_prev_v; static uint8_t rle_prev_v;
static uint8_t rle_cnt; static uint8_t rle_cnt;
static rle_state_t rle_state; static rle_state_t rle_state;
#endif /* LV_USE_FONT_COMPRESSED */
/********************** /**********************
* GLOBAL PROTOTYPES * GLOBAL PROTOTYPES
@ -338,6 +342,7 @@ static int32_t kern_pair_16_compare(const void * ref, const void * element)
else return (int32_t) ref16_p[1] - element16_p[1]; else return (int32_t) ref16_p[1] - element16_p[1];
} }
#if LV_USE_FONT_COMPRESSED
/** /**
* The compress a glyph's bitmap * The compress a glyph's bitmap
* @param in the compressed bitmap * @param in the compressed bitmap
@ -567,6 +572,7 @@ static inline uint8_t rle_next(void)
return ret; return ret;
} }
#endif /* LV_USE_FONT_COMPRESSED */
/** Code Comparator. /** Code Comparator.
* *