mirror of
https://github.com/lvgl/lvgl.git
synced 2026-05-10 04:37:55 +08:00
fix bad merge
MicroPython CI / Build esp32 port (push) Has been cancelled
MicroPython CI / Build rp2 port (push) Has been cancelled
MicroPython CI / Build stm32 port (push) Has been cancelled
MicroPython CI / Build unix port (push) Has been cancelled
BOM Check / bom-check (push) Has been cancelled
Verify that lv_conf_internal.h matches repository state / verify-conf-internal (push) Has been cancelled
Verify GDB constants are up-to-date / verify-gdb-consts (push) Has been cancelled
Verify the widget property name / verify-property-name (push) Has been cancelled
Verify code formatting / verify-formatting (push) Has been cancelled
Compare file templates with file names / template-check (push) Has been cancelled
Test API JSON generator / Test API JSON (push) Has been cancelled
Verify Font License / verify-font-license (push) Has been cancelled
Verify Kconfig / verify-kconfig (push) Has been cancelled
MicroPython CI / Build esp32 port (push) Has been cancelled
MicroPython CI / Build rp2 port (push) Has been cancelled
MicroPython CI / Build stm32 port (push) Has been cancelled
MicroPython CI / Build unix port (push) Has been cancelled
BOM Check / bom-check (push) Has been cancelled
Verify that lv_conf_internal.h matches repository state / verify-conf-internal (push) Has been cancelled
Verify GDB constants are up-to-date / verify-gdb-consts (push) Has been cancelled
Verify the widget property name / verify-property-name (push) Has been cancelled
Verify code formatting / verify-formatting (push) Has been cancelled
Compare file templates with file names / template-check (push) Has been cancelled
Test API JSON generator / Test API JSON (push) Has been cancelled
Verify Font License / verify-font-license (push) Has been cancelled
Verify Kconfig / verify-kconfig (push) Has been cancelled
This commit is contained in:
@@ -1,16 +1,2 @@
|
||||
#warning Include public headers from the `src` folder is deprecated. This file will be removed soon. To ensure your application keeps working, you can choose to include the new header in <include/lvgl/config/lv_conf_internal.h> or include the main header file <include/lvgl/lvgl.h>
|
||||
#include "../include/lvgl/lvgl.h"
|
||||
#ifndef LV_GIF_MAX_WIDTH
|
||||
#ifdef CONFIG_LV_GIF_MAX_WIDTH
|
||||
#define LV_GIF_MAX_WIDTH CONFIG_LV_GIF_MAX_WIDTH
|
||||
#else
|
||||
#define LV_GIF_MAX_WIDTH 32768
|
||||
#endif
|
||||
#endif
|
||||
#ifndef LV_GIF_MAX_HEIGHT
|
||||
#ifdef CONFIG_LV_GIF_MAX_HEIGHT
|
||||
#define LV_GIF_MAX_HEIGHT CONFIG_LV_GIF_MAX_HEIGHT
|
||||
#else
|
||||
#define LV_GIF_MAX_HEIGHT 32768
|
||||
#endif
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user