From 93330eaf1d8e1926486ba3e254649c2feebe2597 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Fri, 23 Feb 2018 15:22:23 +0100 Subject: [PATCH] rename LV_IMG_FORMAT_RAW_INTERNAL to LV_IMG_FORMAT_INTERNAL_RAW --- lv_draw/lv_draw.h | 2 +- lv_objx/lv_img.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lv_draw/lv_draw.h b/lv_draw/lv_draw.h index 28663c520..58ab3db9a 100644 --- a/lv_draw/lv_draw.h +++ b/lv_draw/lv_draw.h @@ -55,7 +55,7 @@ typedef struct typedef enum { LV_IMG_FORMAT_UNKOWN = 0, - LV_IMG_FORMAT_RAW_INTERNAL, /*'lv_img_t' variable compiled with the code*/ + LV_IMG_FORMAT_INTERNAL_RAW, /*'lv_img_t' variable compiled with the code*/ LV_IMG_FORMAT_FILE_RAW_RGB332, /*8 bit*/ LV_IMG_FORMAT_FILE_RAW_RGB565, /*16 bit*/ LV_IMG_FORMAT_FILE_RAW_RGB888, /*24 bit (stored on 32 bit)*/ diff --git a/lv_objx/lv_img.c b/lv_objx/lv_img.c index c98c3ea99..62a5bc596 100644 --- a/lv_objx/lv_img.c +++ b/lv_objx/lv_img.c @@ -234,7 +234,7 @@ lv_img_src_t lv_img_get_src_type(const void * src) /*The first byte shows the type of the image source*/ if(u8_p[0] >= 'A' && u8_p[0] <= 'Z') return LV_IMG_SRC_FILE; /*It's a driver letter*/ else if(u8_p[0] >= 127) return LV_IMG_SRC_SYMBOL; /*After ASCII letteres only symbols (even UTF-8) can be*/ - else if(((u8_p[0] & 0xFC) >> 2) == LV_IMG_FORMAT_RAW_INTERNAL) return LV_IMG_SRC_VARIABLE; /*Mask the file format part og of lv_img_t header. IT should be 0 which means C array */ + else if(((u8_p[0] & 0xFC) >> 2) == LV_IMG_FORMAT_INTERNAL_RAW) return LV_IMG_SRC_VARIABLE; /*Mask the file format part og of lv_img_t header. IT should be 0 which means C array */ else return LV_IMG_SRC_UNKNOWN; }