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
7b46bfa0
Commit
7b46bfa0
authored
Jan 25, 2018
by
Josh McAtee
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/beta'
parents
2d83b6ed
177af6ca
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
lv_txt.c
lv_misc/lv_txt.c
+1
-1
lvgl.h
lvgl.h
+2
-2
No files found.
lv_misc/lv_txt.c
View file @
7b46bfa0
...
...
@@ -415,7 +415,7 @@ uint32_t lv_txt_utf8_next(const char * txt, uint32_t * i)
(
*
i
)
++
;
if
((
txt
[
*
i
]
&
0xC0
)
!=
0x80
)
return
0
;
/*Invalid UTF-8 code*/
result
+=
(
uint32_t
)(
txt
[
*
i
]
&
0x3F
)
<<
6
;
result
+=
txt
[
*
i
]
&
0x3F
;
(
*
i
)
++
;
}
else
{
(
*
i
)
++
;
/*Not UTF-8 char. Go the next.*/
...
...
lvgl.h
View file @
7b46bfa0
...
...
@@ -56,8 +56,8 @@ extern "C" {
/*Current version of LittlevGL*/
#define LVGL_VERSION_MAJOR 5
#define LVGL_VERSION_MINOR 0
#define LVGL_VERSION_PATCH
2
#define LVGL_VERSION_INFO ""
#define LVGL_VERSION_PATCH
3
#define LVGL_VERSION_INFO "
beta
"
/**********************
* TYPEDEFS
...
...
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