Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev-6.0' of https://github.com/littlevgl/lvgl into dev-6.0

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2019-03-06 23:00:06 +01:00
commit 3d4f823884
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lv_draw/lv_draw_img.c
View File

@ -124,7 +124,7 @@ lv_res_t lv_img_dsc_get_info(const char * src, lv_img_header_t * header)
if(res != LV_FS_RES_OK || rn != sizeof(lv_img_header_t)) { if(res != LV_FS_RES_OK || rn != sizeof(lv_img_header_t)) {
header->w = LV_DPI; header->w = LV_DPI;
header->h = LV_DPI; header->h = LV_DPI;
header->cf = LV_IMG_CF_UNKOWN; header->cf = LV_IMG_CF_UNKNOWN;
} }
lv_fs_close(&file); lv_fs_close(&file);
@ -150,7 +150,7 @@ uint8_t lv_img_color_format_get_px_size(lv_img_cf_t cf)
uint8_t px_size = 0; uint8_t px_size = 0;
switch(cf) { switch(cf) {
case LV_IMG_CF_UNKOWN: case LV_IMG_CF_UNKNOWN:
case LV_IMG_CF_RAW: case LV_IMG_CF_RAW:
px_size = 0; px_size = 0;
break; break;
@ -234,7 +234,7 @@ bool lv_img_color_format_has_alpha(lv_img_cf_t cf)
* - pointer to an 'lv_img_t' variable (image stored internally and compiled into the code) * - pointer to an 'lv_img_t' variable (image stored internally and compiled into the code)
* - a path to a file (e.g. "S:/folder/image.bin") * - a path to a file (e.g. "S:/folder/image.bin")
* - or a symbol (e.g. SYMBOL_CLOSE) * - or a symbol (e.g. SYMBOL_CLOSE)
* @return type of the image source LV_IMG_SRC_VARIABLE/FILE/SYMBOL/UNKOWN * @return type of the image source LV_IMG_SRC_VARIABLE/FILE/SYMBOL/UNKNOWN
*/ */
lv_img_src_t lv_img_src_get_type(const void * src) lv_img_src_t lv_img_src_get_type(const void * src)
{ {

4
lv_draw/lv_draw_img.h
View File

@ -41,7 +41,7 @@ typedef struct {
/*Image color format*/ /*Image color format*/
enum { enum {
LV_IMG_CF_UNKOWN = 0, LV_IMG_CF_UNKNOWN = 0,
LV_IMG_CF_RAW, /*Contains the file as it is. Needs custom decoder function*/ LV_IMG_CF_RAW, /*Contains the file as it is. Needs custom decoder function*/
LV_IMG_CF_RAW_ALPHA, /*Contains the file as it is. The image has alpha. Needs custom decoder function*/ LV_IMG_CF_RAW_ALPHA, /*Contains the file as it is. The image has alpha. Needs custom decoder function*/
@ -132,7 +132,7 @@ void lv_draw_img(const lv_area_t * coords, const lv_area_t * mask,
* - pointer to an 'lv_img_t' variable (image stored internally and compiled into the code) * - pointer to an 'lv_img_t' variable (image stored internally and compiled into the code)
* - a path to a file (e.g. "S:/folder/image.bin") * - a path to a file (e.g. "S:/folder/image.bin")
* - or a symbol (e.g. SYMBOL_CLOSE) * - or a symbol (e.g. SYMBOL_CLOSE)
* @return type of the image source LV_IMG_SRC_VARIABLE/FILE/SYMBOL/UNKOWN * @return type of the image source LV_IMG_SRC_VARIABLE/FILE/SYMBOL/UNKNOWN
*/ */
lv_img_src_t lv_img_src_get_type(const void * src); lv_img_src_t lv_img_src_get_type(const void * src);

2
lv_objx/lv_img.c
View File

@ -74,7 +74,7 @@ lv_obj_t * lv_img_create(lv_obj_t * par, const lv_obj_t * copy)
ext->src = NULL; ext->src = NULL;
ext->src_type = LV_IMG_SRC_UNKNOWN; ext->src_type = LV_IMG_SRC_UNKNOWN;
ext->cf = LV_IMG_CF_UNKOWN; ext->cf = LV_IMG_CF_UNKNOWN;
ext->w = lv_obj_get_width(new_img); ext->w = lv_obj_get_width(new_img);
ext->h = lv_obj_get_height(new_img); ext->h = lv_obj_get_height(new_img);
ext->auto_size = 1; ext->auto_size = 1;

4
lv_objx/lv_imgbtn.c
View File

@ -69,7 +69,7 @@ lv_obj_t * lv_imgbtn_create(lv_obj_t * par, const lv_obj_t * copy)
memset(ext->img_src_right, 0, sizeof(ext->img_src_right)); memset(ext->img_src_right, 0, sizeof(ext->img_src_right));
#endif #endif
ext->act_cf = LV_IMG_CF_UNKOWN; ext->act_cf = LV_IMG_CF_UNKNOWN;
/*The signal and design functions are not copied so set them here*/ /*The signal and design functions are not copied so set them here*/
lv_obj_set_signal_func(new_imgbtn, lv_imgbtn_signal); lv_obj_set_signal_func(new_imgbtn, lv_imgbtn_signal);
@ -382,7 +382,7 @@ static void refr_img(lv_obj_t * imgbtn)
lv_obj_set_height(imgbtn, header.h); lv_obj_set_height(imgbtn, header.h);
#endif #endif
} else { } else {
ext->act_cf = LV_IMG_CF_UNKOWN; ext->act_cf = LV_IMG_CF_UNKNOWN;
} }
lv_obj_invalidate(imgbtn); lv_obj_invalidate(imgbtn);