BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lvgl
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
lvgl
Commits
0d385c23
Commit
0d385c23
authored
Apr 09, 2018
by
Gabor Kiss-Vamosi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lv_font: remove const number return values
parent
94bf21b9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
lv_group.h
lv_core/lv_group.h
+1
-1
lv_font.c
lv_misc/lv_font.c
+2
-2
lv_font.h
lv_misc/lv_font.h
+3
-3
No files found.
lv_core/lv_group.h
View file @
0d385c23
...
@@ -65,7 +65,7 @@ lv_group_t * lv_group_create(void);
...
@@ -65,7 +65,7 @@ lv_group_t * lv_group_create(void);
* Delete a group object
* Delete a group object
* @param group pointer to a group
* @param group pointer to a group
*/
*/
void
lv_group_del
(
lv_group_t
*
group
)
void
lv_group_del
(
lv_group_t
*
group
)
;
/**
/**
* Add an object to a group
* Add an object to a group
...
...
lv_misc/lv_font.c
View file @
0d385c23
...
@@ -292,7 +292,7 @@ const uint8_t * lv_font_get_bitmap_sparse(const lv_font_t * font, uint32_t unico
...
@@ -292,7 +292,7 @@ const uint8_t * lv_font_get_bitmap_sparse(const lv_font_t * font, uint32_t unico
* @param unicode_letter an unicode letter which width should be get
* @param unicode_letter an unicode letter which width should be get
* @return width of the gylph or -1 if not found
* @return width of the gylph or -1 if not found
*/
*/
const
int16_t
lv_font_get_width_continuous
(
const
lv_font_t
*
font
,
uint32_t
unicode_letter
)
int16_t
lv_font_get_width_continuous
(
const
lv_font_t
*
font
,
uint32_t
unicode_letter
)
{
{
/*Check the range*/
/*Check the range*/
if
(
unicode_letter
<
font
->
unicode_first
||
unicode_letter
>
font
->
unicode_last
)
{
if
(
unicode_letter
<
font
->
unicode_first
||
unicode_letter
>
font
->
unicode_last
)
{
...
@@ -309,7 +309,7 @@ const int16_t lv_font_get_width_continuous(const lv_font_t * font, uint32_t unic
...
@@ -309,7 +309,7 @@ const int16_t lv_font_get_width_continuous(const lv_font_t * font, uint32_t unic
* @param unicode_letter an unicode letter which width should be get
* @param unicode_letter an unicode letter which width should be get
* @return width of the glyph or -1 if not found
* @return width of the glyph or -1 if not found
*/
*/
const
int16_t
lv_font_get_width_sparse
(
const
lv_font_t
*
font
,
uint32_t
unicode_letter
)
int16_t
lv_font_get_width_sparse
(
const
lv_font_t
*
font
,
uint32_t
unicode_letter
)
{
{
/*Check the range*/
/*Check the range*/
if
(
unicode_letter
<
font
->
unicode_first
||
unicode_letter
>
font
->
unicode_last
)
return
-
1
;
if
(
unicode_letter
<
font
->
unicode_first
||
unicode_letter
>
font
->
unicode_last
)
return
-
1
;
...
...
lv_misc/lv_font.h
View file @
0d385c23
...
@@ -50,7 +50,7 @@ typedef struct _lv_font_struct
...
@@ -50,7 +50,7 @@ typedef struct _lv_font_struct
const
lv_font_glyph_dsc_t
*
glyph_dsc
;
const
lv_font_glyph_dsc_t
*
glyph_dsc
;
const
uint32_t
*
unicode_list
;
const
uint32_t
*
unicode_list
;
const
uint8_t
*
(
*
get_bitmap
)(
const
struct
_lv_font_struct
*
,
uint32_t
);
/*Get a glyph's bitmap from a font*/
const
uint8_t
*
(
*
get_bitmap
)(
const
struct
_lv_font_struct
*
,
uint32_t
);
/*Get a glyph's bitmap from a font*/
const
int16_t
(
*
get_width
)(
const
struct
_lv_font_struct
*
,
uint32_t
);
/*Get a glyph's with with a given font*/
int16_t
(
*
get_width
)(
const
struct
_lv_font_struct
*
,
uint32_t
);
/*Get a glyph's with with a given font*/
struct
_lv_font_struct
*
next_page
;
/*Pointer to a font extension*/
struct
_lv_font_struct
*
next_page
;
/*Pointer to a font extension*/
uint32_t
bpp
:
4
;
/*Bit per pixel: 1, 2 or 4*/
uint32_t
bpp
:
4
;
/*Bit per pixel: 1, 2 or 4*/
}
lv_font_t
;
}
lv_font_t
;
...
@@ -126,7 +126,7 @@ const uint8_t * lv_font_get_bitmap_sparse(const lv_font_t * font, uint32_t unico
...
@@ -126,7 +126,7 @@ const uint8_t * lv_font_get_bitmap_sparse(const lv_font_t * font, uint32_t unico
* @param unicode_letter an unicode letter which width should be get
* @param unicode_letter an unicode letter which width should be get
* @return width of the gylph or -1 if not found
* @return width of the gylph or -1 if not found
*/
*/
const
int16_t
lv_font_get_width_continuous
(
const
lv_font_t
*
font
,
uint32_t
unicode_letter
);
int16_t
lv_font_get_width_continuous
(
const
lv_font_t
*
font
,
uint32_t
unicode_letter
);
/**
/**
* Generic glyph width get function used in 'font->get_bitmap' when the font NOT contains all characters in the range (sparse)
* Generic glyph width get function used in 'font->get_bitmap' when the font NOT contains all characters in the range (sparse)
...
@@ -134,7 +134,7 @@ const int16_t lv_font_get_width_continuous(const lv_font_t * font, uint32_t unic
...
@@ -134,7 +134,7 @@ const int16_t lv_font_get_width_continuous(const lv_font_t * font, uint32_t unic
* @param unicode_letter an unicode letter which width should be get
* @param unicode_letter an unicode letter which width should be get
* @return width of the glyph or -1 if not found
* @return width of the glyph or -1 if not found
*/
*/
const
int16_t
lv_font_get_width_sparse
(
const
lv_font_t
*
font
,
uint32_t
unicode_letter
);
int16_t
lv_font_get_width_sparse
(
const
lv_font_t
*
font
,
uint32_t
unicode_letter
);
/**********************
/**********************
* MACROS
* MACROS
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment