From c1205ad4895f37fef386352bbd7f2b6b54df0afc Mon Sep 17 00:00:00 2001 From: David Truan Date: Wed, 26 Mar 2025 10:15:22 +0100 Subject: [PATCH] fix(dave2d): Fix DAVE2D compilation (#7998) --- Kconfig | 4 ++-- env_support/cmake/version.cmake | 4 ++-- library.json | 2 +- library.properties | 2 +- lv_conf_template.h | 2 +- lv_version.h | 4 ++-- src/draw/renesas/dave2d/lv_draw_dave2d.c | 1 + src/draw/renesas/dave2d/lv_draw_dave2d.h | 9 +++++++++ src/draw/renesas/dave2d/lv_draw_dave2d_arc.c | 2 ++ src/draw/renesas/dave2d/lv_draw_dave2d_border.c | 2 ++ src/draw/renesas/dave2d/lv_draw_dave2d_fill.c | 2 ++ src/draw/renesas/dave2d/lv_draw_dave2d_image.c | 3 +++ src/draw/renesas/dave2d/lv_draw_dave2d_label.c | 3 +++ src/draw/renesas/dave2d/lv_draw_dave2d_line.c | 2 ++ src/draw/renesas/dave2d/lv_draw_dave2d_mask_rectangle.c | 2 ++ src/draw/renesas/dave2d/lv_draw_dave2d_triangle.c | 2 ++ 16 files changed, 37 insertions(+), 9 deletions(-) diff --git a/Kconfig b/Kconfig index 06d77a8ce7..00a8250759 100644 --- a/Kconfig +++ b/Kconfig @@ -1,4 +1,4 @@ -# Kconfig file for LVGL v9.2.2 +# Kconfig file for LVGL v9.2.3 menu "LVGL configuration" @@ -1492,7 +1492,7 @@ menu "LVGL configuration" default 2 # LVGL_VERSION_MINOR config LVGL_VERSION_PATCH int - default 2 # LVGL_VERSION_PATCH + default 3 # LVGL_VERSION_PATCH endmenu menu "Devices" diff --git a/env_support/cmake/version.cmake b/env_support/cmake/version.cmake index 16769717a8..bb877f4861 100644 --- a/env_support/cmake/version.cmake +++ b/env_support/cmake/version.cmake @@ -1,7 +1,7 @@ set(LVGL_VERSION_MAJOR "9") set(LVGL_VERSION_MINOR "2") -set(LVGL_VERSION_PATCH "2") -set(LVGL_VERSION_INFO "") +set(LVGL_VERSION_PATCH "3") +set(LVGL_VERSION_INFO "dev") set(LVGL_VERSION ${LVGL_VERSION_MAJOR}.${LVGL_VERSION_MINOR}.${LVGL_VERSION_PATCH}) # This is a CMake variable set(ENV{LVGL_VERSION} ${LVGL_VERSION}) # This is exported Environmental variable diff --git a/library.json b/library.json index 16d635c767..f72e999c87 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "lvgl", - "version": "9.2.2", + "version": "9.2.3", "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/library.properties b/library.properties index 79a170e8fb..d28f871dc0 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=lvgl -version=9.2.2 +version=9.2.3 author=kisvegabor maintainer=kisvegabor,embeddedt,pete-pjb sentence=Full-featured Graphics Library for Embedded Systems diff --git a/lv_conf_template.h b/lv_conf_template.h index 99e4aee667..965d5ba9fc 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -1,6 +1,6 @@ /** * @file lv_conf.h - * Configuration file for v9.2.2 + * Configuration file for v9.2.3-dev */ /* diff --git a/lv_version.h b/lv_version.h index 5767c66c5d..98416cc9a8 100644 --- a/lv_version.h +++ b/lv_version.h @@ -8,7 +8,7 @@ #define LVGL_VERSION_MAJOR 9 #define LVGL_VERSION_MINOR 2 -#define LVGL_VERSION_PATCH 2 -#define LVGL_VERSION_INFO "" +#define LVGL_VERSION_PATCH 3 +#define LVGL_VERSION_INFO "dev" #endif /* LVGL_VERSION_H */ diff --git a/src/draw/renesas/dave2d/lv_draw_dave2d.c b/src/draw/renesas/dave2d/lv_draw_dave2d.c index 039b147a7f..08a814c1af 100644 --- a/src/draw/renesas/dave2d/lv_draw_dave2d.c +++ b/src/draw/renesas/dave2d/lv_draw_dave2d.c @@ -9,6 +9,7 @@ #include "lv_draw_dave2d.h" #if LV_USE_DRAW_DAVE2D #include "../../lv_draw_buf_private.h" +#include "../../../misc/lv_area_private.h" /********************* * DEFINES diff --git a/src/draw/renesas/dave2d/lv_draw_dave2d.h b/src/draw/renesas/dave2d/lv_draw_dave2d.h index 186f57a75f..2deaeb420a 100644 --- a/src/draw/renesas/dave2d/lv_draw_dave2d.h +++ b/src/draw/renesas/dave2d/lv_draw_dave2d.h @@ -13,11 +13,20 @@ extern "C" { /********************* * INCLUDES *********************/ + #include "../../../lv_conf_internal.h" #if LV_USE_DRAW_DAVE2D #include "../../lv_draw.h" +#include "../../lv_draw_private.h" #include "hal_data.h" #include "lv_draw_dave2d_utils.h" +#include "../../lv_draw_rect.h" +#include "../../lv_draw_line.h" +#include "../../lv_draw_arc.h" +#include "../../lv_draw_label.h" +#include "../../lv_draw_image.h" +#include "../../lv_draw_triangle.h" +#include "../../lv_draw_buf.h" /********************* * DEFINES diff --git a/src/draw/renesas/dave2d/lv_draw_dave2d_arc.c b/src/draw/renesas/dave2d/lv_draw_dave2d_arc.c index 03775387a3..71e03affc1 100644 --- a/src/draw/renesas/dave2d/lv_draw_dave2d_arc.c +++ b/src/draw/renesas/dave2d/lv_draw_dave2d_arc.c @@ -1,6 +1,8 @@ #include "lv_draw_dave2d.h" #if LV_USE_DRAW_DAVE2D +#include "../../../misc/lv_area_private.h" + void lv_draw_dave2d_arc(lv_draw_dave2d_unit_t * u, const lv_draw_arc_dsc_t * dsc, const lv_area_t * coords) { diff --git a/src/draw/renesas/dave2d/lv_draw_dave2d_border.c b/src/draw/renesas/dave2d/lv_draw_dave2d_border.c index 6033251df2..e402e7ff83 100644 --- a/src/draw/renesas/dave2d/lv_draw_dave2d_border.c +++ b/src/draw/renesas/dave2d/lv_draw_dave2d_border.c @@ -1,6 +1,8 @@ #include "lv_draw_dave2d.h" #if LV_USE_DRAW_DAVE2D +#include "../../../misc/lv_area_private.h" + static void dave2d_draw_border_complex(lv_draw_dave2d_unit_t * draw_unit, const lv_area_t * outer_area, const lv_area_t * inner_area, int32_t rout, int32_t rin, lv_color_t color, lv_opa_t opa); diff --git a/src/draw/renesas/dave2d/lv_draw_dave2d_fill.c b/src/draw/renesas/dave2d/lv_draw_dave2d_fill.c index e2ffcd9fe9..546dac318e 100644 --- a/src/draw/renesas/dave2d/lv_draw_dave2d_fill.c +++ b/src/draw/renesas/dave2d/lv_draw_dave2d_fill.c @@ -1,6 +1,8 @@ #include "lv_draw_dave2d.h" #if LV_USE_DRAW_DAVE2D +#include "../../../misc/lv_area_private.h" + void lv_draw_dave2d_fill(lv_draw_dave2d_unit_t * u, const lv_draw_fill_dsc_t * dsc, const lv_area_t * coords) { lv_area_t draw_area; diff --git a/src/draw/renesas/dave2d/lv_draw_dave2d_image.c b/src/draw/renesas/dave2d/lv_draw_dave2d_image.c index dc001151ae..ee2438099b 100644 --- a/src/draw/renesas/dave2d/lv_draw_dave2d_image.c +++ b/src/draw/renesas/dave2d/lv_draw_dave2d_image.c @@ -9,6 +9,9 @@ #include "lv_draw_dave2d.h" #if LV_USE_DRAW_DAVE2D +#include "../../lv_image_decoder_private.h" +#include "../../lv_draw_image_private.h" + /********************* * DEFINES *********************/ diff --git a/src/draw/renesas/dave2d/lv_draw_dave2d_label.c b/src/draw/renesas/dave2d/lv_draw_dave2d_label.c index f5760e6237..abc417375a 100644 --- a/src/draw/renesas/dave2d/lv_draw_dave2d_label.c +++ b/src/draw/renesas/dave2d/lv_draw_dave2d_label.c @@ -1,6 +1,9 @@ #include "lv_draw_dave2d.h" #if LV_USE_DRAW_DAVE2D +#include "../../lv_draw_label_private.h" +#include "../../../misc/lv_area_private.h" + static void lv_draw_dave2d_draw_letter_cb(lv_draw_unit_t * draw_unit, lv_draw_glyph_dsc_t * glyph_draw_dsc, lv_draw_fill_dsc_t * fill_draw_dsc, const lv_area_t * fill_area); diff --git a/src/draw/renesas/dave2d/lv_draw_dave2d_line.c b/src/draw/renesas/dave2d/lv_draw_dave2d_line.c index ef188eb4a2..37719260d9 100644 --- a/src/draw/renesas/dave2d/lv_draw_dave2d_line.c +++ b/src/draw/renesas/dave2d/lv_draw_dave2d_line.c @@ -1,6 +1,8 @@ #include "lv_draw_dave2d.h" #if LV_USE_DRAW_DAVE2D +#include "../../../misc/lv_area_private.h" + void lv_draw_dave2d_line(lv_draw_dave2d_unit_t * u, const lv_draw_line_dsc_t * dsc) { diff --git a/src/draw/renesas/dave2d/lv_draw_dave2d_mask_rectangle.c b/src/draw/renesas/dave2d/lv_draw_dave2d_mask_rectangle.c index fe94a9a401..57dbce8007 100644 --- a/src/draw/renesas/dave2d/lv_draw_dave2d_mask_rectangle.c +++ b/src/draw/renesas/dave2d/lv_draw_dave2d_mask_rectangle.c @@ -1,6 +1,8 @@ #include "lv_draw_dave2d.h" #if LV_USE_DRAW_DAVE2D +#include "../../../misc/lv_area_private.h" + void lv_draw_dave2d_mask_rect(lv_draw_dave2d_unit_t * u, const lv_draw_mask_rect_dsc_t * dsc, const lv_area_t * coords) { lv_area_t clipped_area; diff --git a/src/draw/renesas/dave2d/lv_draw_dave2d_triangle.c b/src/draw/renesas/dave2d/lv_draw_dave2d_triangle.c index 502200797c..c6f3bac767 100644 --- a/src/draw/renesas/dave2d/lv_draw_dave2d_triangle.c +++ b/src/draw/renesas/dave2d/lv_draw_dave2d_triangle.c @@ -1,6 +1,8 @@ #include "lv_draw_dave2d.h" #if LV_USE_DRAW_DAVE2D +#include "../../../misc/lv_area_private.h" + void lv_draw_dave2d_triangle(lv_draw_dave2d_unit_t * u, const lv_draw_triangle_dsc_t * dsc) { lv_area_t clipped_area;