Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType Demo Programs
Commits:
-
79f3c3d5
by Alexei Podtelezhnikov at 2022-08-14T23:26:31-04:00
-
0e3786b2
by Alexei Podtelezhnikov at 2022-08-14T23:41:31-04:00
1 changed file:
Changes:
... | ... | @@ -1686,24 +1686,15 @@ |
1686 | 1686 | {
|
1687 | 1687 | const char* p = string;
|
1688 | 1688 | const char* end = p + strlen( string );
|
1689 | - unsigned long codepoint;
|
|
1690 | 1689 | int ch;
|
1691 | - int expect;
|
|
1692 | 1690 | PGlyph glyph = handle->string;
|
1693 | 1691 | |
1694 | 1692 | |
1695 | 1693 | handle->string_length = 0;
|
1696 | - codepoint = expect = 0;
|
|
1697 | 1694 | |
1698 | - for (;;)
|
|
1695 | + while ( ( ch = utf8_next( &p, end ) ) >= 0 )
|
|
1699 | 1696 | {
|
1700 | - ch = utf8_next( &p, end );
|
|
1701 | - if ( ch < 0 )
|
|
1702 | - break;
|
|
1703 | - |
|
1704 | - codepoint = (unsigned long)ch;
|
|
1705 | - |
|
1706 | - glyph->glyph_index = FTDemo_Get_Index( handle, codepoint );
|
|
1697 | + glyph->glyph_index = FTDemo_Get_Index( handle, (FT_UInt32)ch );
|
|
1707 | 1698 | |
1708 | 1699 | glyph++;
|
1709 | 1700 | handle->string_length++;
|
... | ... | @@ -2024,13 +2015,8 @@ |
2024 | 2015 | unsigned long l = 0;
|
2025 | 2016 | |
2026 | 2017 | |
2027 | - for ( i = 0; i < 4; i++ )
|
|
2028 | - {
|
|
2029 | - if ( !s[i] )
|
|
2030 | - break;
|
|
2031 | - l <<= 8;
|
|
2032 | - l += (unsigned long)s[i];
|
|
2033 | - }
|
|
2018 | + for ( i = 0; i < 4 && s[i]; i++ )
|
|
2019 | + l = ( l << 8 ) | s[i];
|
|
2034 | 2020 | |
2035 | 2021 | return l;
|
2036 | 2022 | }
|