diff --git a/library.json b/library.json index e1b2f03d1..31a87f814 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "lvgl", - "version": "7.7.1", + "version": "7.7.2", "keywords": "graphics, gui, embedded, tft, lvgl", "description": "Graphics library to create embedded GUI with easy-to-use graphical elements, beautiful visual effects and low memory footprint. It offers anti-aliasing, opacity, and animations using only one frame buffer.", "repository": { diff --git a/lvgl.h b/lvgl.h index 0f4e96983..faeda08a3 100644 --- a/lvgl.h +++ b/lvgl.h @@ -17,7 +17,7 @@ extern "C" { #define LVGL_VERSION_MAJOR 7 #define LVGL_VERSION_MINOR 7 #define LVGL_VERSION_PATCH 2 -#define LVGL_VERSION_INFO "dev" +#define LVGL_VERSION_INFO "" /********************* * INCLUDES diff --git a/src/lv_draw/lv_draw_triangle.c b/src/lv_draw/lv_draw_triangle.c index b9724f49a..8ffa343e1 100644 --- a/src/lv_draw/lv_draw_triangle.c +++ b/src/lv_draw/lv_draw_triangle.c @@ -115,7 +115,7 @@ void lv_draw_polygon(const lv_point_t points[], uint16_t point_cnt, const lv_are lv_coord_t dyr = points[i_next_right].y - points[y_min_i].y; bool inv = false; - if(dyl*dxr < dyr*dxl) inv = true; + if(dyl * dxr < dyr * dxl) inv = true; do { if(!inv) { diff --git a/src/lv_font/lv_font_fmt_txt.c b/src/lv_font/lv_font_fmt_txt.c index 7fefd4c4e..011f55e86 100644 --- a/src/lv_font/lv_font_fmt_txt.c +++ b/src/lv_font/lv_font_fmt_txt.c @@ -43,24 +43,24 @@ 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); #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 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 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 uint8_t rle_next(void); + 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 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 rle_init(const uint8_t * in, uint8_t bpp); + static inline uint8_t rle_next(void); #endif /* LV_USE_FONT_COMPRESSED */ /********************** * STATIC VARIABLES **********************/ #if LV_USE_FONT_COMPRESSED -static uint32_t rle_rdp; -static const uint8_t * rle_in; -static uint8_t rle_bpp; -static uint8_t rle_prev_v; -static uint8_t rle_cnt; -static rle_state_t rle_state; + static uint32_t rle_rdp; + static const uint8_t * rle_in; + static uint8_t rle_bpp; + static uint8_t rle_prev_v; + static uint8_t rle_cnt; + static rle_state_t rle_state; #endif /* LV_USE_FONT_COMPRESSED */ /********************** diff --git a/src/lv_widgets/lv_arc.c b/src/lv_widgets/lv_arc.c index dc7098020..5e27a29fa 100644 --- a/src/lv_widgets/lv_arc.c +++ b/src/lv_widgets/lv_arc.c @@ -785,7 +785,8 @@ static lv_res_t lv_arc_signal(lv_obj_t * arc, lv_signal_t sign, void * param) if(LV_MATH_ABS(delta_angle) > 180) { if(ext->min_close) angle = 0; else angle = deg_range; - } else { + } + else { if(angle < deg_range / 2) ext->min_close = 1; else ext->min_close = 0; } diff --git a/src/lv_widgets/lv_imgbtn.c b/src/lv_widgets/lv_imgbtn.c index 812f52b06..871ff7c0b 100644 --- a/src/lv_widgets/lv_imgbtn.c +++ b/src/lv_widgets/lv_imgbtn.c @@ -543,26 +543,26 @@ static lv_btn_state_t suggest_state(lv_obj_t * imgbtn, lv_btn_state_t state) lv_imgbtn_ext_t * ext = lv_obj_get_ext_attr(imgbtn); if(ext->img_src_mid[state] == NULL) { switch(state) { - case LV_BTN_STATE_PRESSED: - if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; - break; - case LV_BTN_STATE_CHECKED_RELEASED: - if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; - break; - case LV_BTN_STATE_CHECKED_PRESSED: - if(ext->img_src_mid[LV_BTN_STATE_CHECKED_RELEASED]) return LV_BTN_STATE_CHECKED_RELEASED; - if(ext->img_src_mid[LV_BTN_STATE_PRESSED]) return LV_BTN_STATE_PRESSED; - if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; - break; - case LV_BTN_STATE_DISABLED: - if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; - break; - case LV_BTN_STATE_CHECKED_DISABLED: - if(ext->img_src_mid[LV_BTN_STATE_CHECKED_RELEASED]) return LV_BTN_STATE_CHECKED_RELEASED; - if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; - break; - default: - break; + case LV_BTN_STATE_PRESSED: + if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; + break; + case LV_BTN_STATE_CHECKED_RELEASED: + if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; + break; + case LV_BTN_STATE_CHECKED_PRESSED: + if(ext->img_src_mid[LV_BTN_STATE_CHECKED_RELEASED]) return LV_BTN_STATE_CHECKED_RELEASED; + if(ext->img_src_mid[LV_BTN_STATE_PRESSED]) return LV_BTN_STATE_PRESSED; + if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; + break; + case LV_BTN_STATE_DISABLED: + if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; + break; + case LV_BTN_STATE_CHECKED_DISABLED: + if(ext->img_src_mid[LV_BTN_STATE_CHECKED_RELEASED]) return LV_BTN_STATE_CHECKED_RELEASED; + if(ext->img_src_mid[LV_BTN_STATE_RELEASED]) return LV_BTN_STATE_RELEASED; + break; + default: + break; } }