From c1fe3ebb3d8a8c0a048b9687395dd6ee185d1138 Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Sat, 1 Dec 2018 15:30:08 +0100 Subject: [PATCH] video: use BMP_ALIGN_CENTER define from splash.h Drop BMP_ALIGN_CENTER define in lcd.c and video_bmp.c as it is already defined by splash.h. Include splash.h in bmp code. Signed-off-by: Anatolij Gustschin --- common/lcd.c | 1 - drivers/video/video_bmp.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/common/lcd.c b/common/lcd.c index 74407a17e9..cd630405d4 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -381,7 +381,6 @@ static inline void lcd_logo_plot(int x, int y) {} #if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN) #ifdef CONFIG_SPLASH_SCREEN_ALIGN -#define BMP_ALIGN_CENTER 0x7FFF static void splash_align_axis(int *axis, unsigned long panel_size, unsigned long picture_size) diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c index 1377e19081..2898b0b55d 100644 --- a/drivers/video/video_bmp.c +++ b/drivers/video/video_bmp.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -140,8 +141,6 @@ __weak void fb_put_word(uchar **fb, uchar **from) } #endif /* CONFIG_BMP_16BPP */ -#define BMP_ALIGN_CENTER 0x7fff - /** * video_splash_align_axis() - Align a single coordinate * -- 2.39.5