From f28d18dda49169c4c93da06ad019c8e5e040f1d8 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 20 Feb 2023 22:18:56 +0100 Subject: [PATCH] fix: minor fixes to make the CI work --- examples/widgets/canvas/lv_example_canvas_2.c | 4 ++-- src/core/lv_indev.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/widgets/canvas/lv_example_canvas_2.c b/examples/widgets/canvas/lv_example_canvas_2.c index e9483577d..ede9da551 100644 --- a/examples/widgets/canvas/lv_example_canvas_2.c +++ b/examples/widgets/canvas/lv_example_canvas_2.c @@ -1,5 +1,5 @@ #include "../../lv_examples.h" -#if LV_USE_CANVAS && LV_BUILD_EXAMPLES && 0 +#if LV_USE_CANVAS && LV_BUILD_EXAMPLES #define CANVAS_WIDTH 50 #define CANVAS_HEIGHT 50 @@ -17,7 +17,7 @@ void lv_example_canvas_2(void) /*Create a canvas and initialize its palette*/ lv_obj_t * canvas = lv_canvas_create(lv_scr_act()); - lv_canvas_set_buffer(canvas, cbuf, CANVAS_WIDTH, CANVAS_HEIGHT, LV_IMG_CF_INDEXED_1BIT); + lv_canvas_set_buffer(canvas, cbuf, CANVAS_WIDTH, CANVAS_HEIGHT, LV_COLOR_FORMAT_I1); lv_canvas_set_palette(canvas, 0, LV_COLOR_CHROMA_KEY); lv_canvas_set_palette(canvas, 1, lv_palette_main(LV_PALETTE_RED)); diff --git a/src/core/lv_indev.c b/src/core/lv_indev.c index 8918d00e6..e5c9fb167 100644 --- a/src/core/lv_indev.c +++ b/src/core/lv_indev.c @@ -297,7 +297,7 @@ lv_group_t * lv_indev_get_group(const lv_indev_t * indev) lv_disp_t * lv_indev_get_disp(const lv_indev_t * indev) { - if(indev == NULL) return LV_INDEV_TYPE_NONE; + if(indev == NULL) return NULL; return indev->disp; }