diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/jpg/lv_jpg.c | 6 | ||||
-rw-r--r-- | src/libs/jpg/lv_jpg.h | 6 | ||||
-rw-r--r-- | src/lv_conf_internal.h | 8 | ||||
-rw-r--r-- | src/lv_init.c | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/libs/jpg/lv_jpg.c b/src/libs/jpg/lv_jpg.c index c78cab573..e6a73ec58 100644 --- a/src/libs/jpg/lv_jpg.c +++ b/src/libs/jpg/lv_jpg.c @@ -46,7 +46,7 @@ *********************/ #include "../../../lvgl.h" -#if LV_USE_SJPG +#if LV_USE_JPG #include "tjpgd.h" #include "lv_jpg.h" @@ -85,7 +85,7 @@ static int is_jpg(const uint8_t * raw_data, size_t len); * GLOBAL FUNCTIONS **********************/ -void lv_jpeg_init(void) +void lv_jpg_init(void) { lv_image_decoder_t * dec = lv_image_decoder_create(); lv_image_decoder_set_info_cb(dec, decoder_info); @@ -288,4 +288,4 @@ static int is_jpg(const uint8_t * raw_data, size_t len) return memcmp(jpg_signature, raw_data, sizeof(jpg_signature)) == 0; } -#endif /*LV_USE_SJPG*/ +#endif /*LV_USE_JPG*/ diff --git a/src/libs/jpg/lv_jpg.h b/src/libs/jpg/lv_jpg.h index c301dca20..3158d80a9 100644 --- a/src/libs/jpg/lv_jpg.h +++ b/src/libs/jpg/lv_jpg.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ -#if LV_USE_SJPG +#if LV_USE_JPG /********************* * DEFINES @@ -28,13 +28,13 @@ extern "C" { * GLOBAL PROTOTYPES **********************/ -void lv_jpeg_init(void); +void lv_jpg_init(void); /********************** * MACROS **********************/ -#endif /*LV_USE_SJPG*/ +#endif /*LV_USE_JPG*/ #ifdef __cplusplus } diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index d5e93b789..615565998 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -1957,11 +1957,11 @@ /* JPG + split JPG decoder library. * Split JPG is a custom format optimized for embedded systems. */ -#ifndef LV_USE_SJPG - #ifdef CONFIG_LV_USE_SJPG - #define LV_USE_SJPG CONFIG_LV_USE_SJPG +#ifndef LV_USE_JPG + #ifdef CONFIG_LV_USE_JPG + #define LV_USE_JPG CONFIG_LV_USE_JPG #else - #define LV_USE_SJPG 0 + #define LV_USE_JPG 0 #endif #endif diff --git a/src/lv_init.c b/src/lv_init.c index 4adc35116..40eef1f14 100644 --- a/src/lv_init.c +++ b/src/lv_init.c @@ -219,8 +219,8 @@ void lv_init(void) lv_png_init(); #endif -#if LV_USE_SJPG - lv_jpeg_init(); +#if LV_USE_JPG + lv_jpg_init(); #endif #if LV_USE_BMP |