github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fixes for compiler warnings/-Werrors

Browse Source
This commit is contained in:
Themba Dube
2019-04-19 15:20:51 -04:00
parent 5353dae027
commit 7419900508
5 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lv_conf_template.h
View File

@@ -147,7 +147,6 @@ typedef void * lv_group_user_data_t;
/*1: Add separate `user_data` for every callback*/
#define LV_USE_USER_DATA_MULTI 0
/*=====================
* Compiler settings
*====================*/
@@ -157,6 +156,11 @@ typedef void * lv_group_user_data_t;
/* Define a custom attribute to `lv_task_handler` function */
#define LV_ATTRIBUTE_TASK_HANDLER
/* With size optimization (-Os) the compiler might not align data to
* 4 or 8 byte boundary. This alignment will be explicitly applied where needed.*/
#define LV_ATTRIBUTE_MEM_ALIGN __attribute__((aligned(4)))
/* 1: Variable length array is supported*/
#define LV_COMPILER_VLA_SUPPORTED 1
@@ -176,7 +180,7 @@ typedef void * lv_group_user_data_t;
#endif /*LV_TICK_CUSTOM*/
typedef void * lv_disp_drv_user_data_t; /*Type of user data in the display driver*/
typedef void * lv_indev_drv_user_data_t; /*Type of user data in the display driver*/
typedef void * lv_indev_drv_user_data_t; /*Type of user data in the input device driver*/
/*================
* Log settings
@@ -439,7 +443,6 @@ typedef void * lv_obj_user_data_t;
/*==================
* Non-user section
*==================*/
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS) /* Disable warnings for Visual Studio*/
# define _CRT_SECURE_NO_WARNINGS
#endif

2
src/lv_misc/lv_area.c
View File

@@ -154,7 +154,7 @@ bool lv_area_is_point_on(const lv_area_t * a_p, const lv_point_t * p_p)
return is_on;
}
#if LV_USE_EXTENDED_CLICK_AREA_TINY
#if LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_TINY
/**
* Check if a point is on an area
* @param a_p pointer to an area

6
src/lv_misc/lv_area.h
View File

@@ -28,6 +28,10 @@ extern "C" {
#define LV_COORD_MAX (16383) /*To avoid overflow don't let the max [-32,32k] range */
#define LV_COORD_MIN (-16384)
#define LV_EXT_CLICK_AREA_OFF 0
#define LV_EXT_CLICK_AREA_TINY 1
#define LV_EXT_CLICK_AREA_FULL 2
/**********************
* TYPEDEFS
**********************/
@@ -145,7 +149,7 @@ void lv_area_join(lv_area_t * a_res_p, const lv_area_t * a1_p, const lv_area_t *
*/
bool lv_area_is_point_on(const lv_area_t * a_p, const lv_point_t * p_p);
#if LV_USE_EXTENDED_CLICK_AREA_TINY
#if LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_TINY
/**
* Check if a point is on an area
* @param a_p pointer to an area

30
src/lv_objx/lv_label.c
View File

@@ -97,7 +97,7 @@ lv_obj_t * lv_label_create(lv_obj_t * par, const lv_obj_t * copy)
ext->txt_sel_start = LV_LABEL_TEXT_SEL_OFF;
ext->txt_sel_end = LV_LABEL_TEXT_SEL_OFF;
#endif
ext->dot_tmp_ptr = NULL;
ext->dt.dot_tmp_ptr = NULL;
ext->dot_tmp_alloc = 0;
lv_obj_set_design_cb(new_label, lv_label_design);
@@ -130,12 +130,12 @@ lv_obj_t * lv_label_create(lv_obj_t * par, const lv_obj_t * copy)
memcpy(ext->text, copy_ext->text, lv_mem_get_size(copy_ext->text));
}
if(copy_ext->dot_tmp_alloc && copy_ext->dot_tmp_ptr ){
int len = strlen(copy_ext->dot_tmp_ptr);
lv_label_set_dot_tmp(new_label, ext->dot_tmp_ptr, len);
if(copy_ext->dot_tmp_alloc && copy_ext->dt.dot_tmp_ptr ){
int len = strlen(copy_ext->dt.dot_tmp_ptr);
lv_label_set_dot_tmp(new_label, ext->dt.dot_tmp_ptr, len);
}
else{
memcpy(ext->dot_tmp, copy_ext->dot_tmp, sizeof(ext->dot_tmp));
memcpy(ext->dt.dot_tmp, copy_ext->dt.dot_tmp, sizeof(ext->dt.dot_tmp));
}
ext->dot_tmp_alloc = copy_ext->dot_tmp_alloc;
ext->dot_end = copy_ext->dot_end;
@@ -1119,19 +1119,19 @@ static bool lv_label_set_dot_tmp(lv_obj_t *label, char *data, uint16_t len){
if( len > sizeof(char *) ){
/* Memory needs to be allocated. Allocates an additional byte
* for a NULL-terminator so it can be copied. */
ext->dot_tmp_ptr = lv_mem_alloc(len + 1);
if( ext->dot_tmp_ptr == NULL ){
ext->dt.dot_tmp_ptr = lv_mem_alloc(len + 1);
if( ext->dt.dot_tmp_ptr == NULL ){
LV_LOG_ERROR("Failed to allocate memory for dot_tmp_ptr");
return false;
}
memcpy(ext->dot_tmp_ptr, data, len);
ext->dot_tmp_ptr[len]='\0';
memcpy(ext->dt.dot_tmp_ptr, data, len);
ext->dt.dot_tmp_ptr[len]='\0';
ext->dot_tmp_alloc = true;
}
else {
/* Characters can be directly stored in object */
ext->dot_tmp_alloc = false;
memcpy(ext->dot_tmp, data, len);
memcpy(ext->dt.dot_tmp, data, len);
}
return true;
}
@@ -1144,10 +1144,10 @@ static bool lv_label_set_dot_tmp(lv_obj_t *label, char *data, uint16_t len){
static char * lv_label_get_dot_tmp(lv_obj_t *label){
lv_label_ext_t * ext = lv_obj_get_ext_attr(label);
if( ext->dot_tmp_alloc ){
return ext->dot_tmp_ptr;
return ext->dt.dot_tmp_ptr;
}
else{
return ext->dot_tmp;
return ext->dt.dot_tmp;
}
}
@@ -1158,11 +1158,11 @@ static char * lv_label_get_dot_tmp(lv_obj_t *label){
*/
static void lv_label_dot_tmp_free(lv_obj_t *label){
lv_label_ext_t * ext = lv_obj_get_ext_attr(label);
if( ext->dot_tmp_alloc && ext->dot_tmp_ptr ){
lv_mem_free(ext->dot_tmp_ptr);
if( ext->dot_tmp_alloc && ext->dt.dot_tmp_ptr ){
lv_mem_free(ext->dt.dot_tmp_ptr);
}
ext->dot_tmp_alloc = false;
ext->dot_tmp_ptr = NULL;
ext->dt.dot_tmp_ptr = NULL;
}
#endif

2
src/lv_objx/lv_label.h
View File

@@ -66,7 +66,7 @@ typedef struct
union{
char * dot_tmp_ptr; /* Pointer to the allocated memory containing the character which are replaced by dots (Handled by the library)*/
char dot_tmp[ sizeof(char *) ]; /* Directly store the characters if <=4 characters */
};
} dt;
uint16_t dot_end; /*The text end position in dot mode (Handled by the library)*/
uint16_t anim_speed; /*Speed of scroll and roll animation in px/sec unit*/
lv_point_t offset; /*Text draw position offset*/