Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing a crash on mutli-byte Unicode characters in MOAIFreetypeFont:dimensionsOfLine #132

Open
wants to merge 2 commits into
base: mindsnacks-dev
Choose a base branch
from
Open

Fixing a crash on mutli-byte Unicode characters in MOAIFreetypeFont:dimensionsOfLine #132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59bbaaa
Fixed the comparison statement in the first `for` loop in `Dimensions…
aab29 Nov 4, 2021
1b9a283
Switched the way that `maxGlyphs` gets calculated in `RenderTextureSi…
aab29 Nov 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/moaicore/MOAIFreeTypeFont.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ USRect MOAIFreeTypeFont::DimensionsOfLine(cc8 *text, float fontSize, FT_Vector *
// Gather up the positions of each glyph
FT_Int penX = 0, penY = 0;

for (size_t n = 0; n < maxGlyphs; ) {
for (size_t n = 0; numGlyphs < maxGlyphs; numGlyphs++) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This for loop feels really weird. I'm seeing how trying to clean it up expands into a much larger task. How would you feel about just switching it to a while loop until that cleanup happens, since it might make it a little more readable?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

Does the value of n ever change in this loop?

FT_UInt glyphIndex;

int idx = (int)n;
Expand Down Expand Up @@ -625,7 +625,6 @@ USRect MOAIFreeTypeFont::DimensionsOfLine(cc8 *text, float fontSize, FT_Vector *
penX += glyphXAdvance;

previousGlyphIndex = glyphIndex;
numGlyphs++;
}

// compute the bounding box of the glyphs
Expand Down Expand Up @@ -1650,7 +1649,7 @@ MOAITexture* MOAIFreeTypeFont::RenderTextureSingleLine(cc8 *text, float fontSize
FT_UInt numGlyphs;
FT_Error error;

const size_t maxGlyphs = strlen(text);
const size_t maxGlyphs = glyphsInText(text);

FT_Int maxDescender;
FT_Int maxAscender;
Expand Down