Fix convert from UTF-8 to Unicode #123
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lexus2k
reviewed
Aug 17, 2024
src/canvas/font.cpp
Outdated
| @@ -331,19 +331,24 @@ uint16_t NanoFont::unicode16FromUtf8(uint8_t ch) | |||
| { | |||
| #ifdef CONFIG_SSD1306_UNICODE_ENABLE | |||
| static uint16_t unicode = 0; | |||
| ch &= 0x00FF; | |||
| if ( !unicode ) | |||
| static uint8_t rest = 0; | |||
There was a problem hiding this comment.
rest should not be static and must be placed in if (ch & 0x40) branch
lexus2k
reviewed
Aug 17, 2024
src/canvas/font.cpp
Outdated
| @@ -331,19 +331,24 @@ uint16_t NanoFont::unicode16FromUtf8(uint8_t ch) | |||
| { | |||
| #ifdef CONFIG_SSD1306_UNICODE_ENABLE | |||
| static uint16_t unicode = 0; | |||
There was a problem hiding this comment.
Now it is better to move unicode variable inside if (ch & 0x80) branch. Please, check clang compiler results.
lexus2k
reviewed
Aug 17, 2024
|
Thanks for your warning. I have made the changes.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before this, we can only display U+0000 to U+07EE, since only 1-byte and 2-byte UTF-8 characters were considered. After this, we can use U+0000 to U+FFFF.
This Pull Request is made to solve issue #122