i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Added clarifying comment.

Browse Source 
* When the consumer does not want to consume a glyph, make
  sure the advance values are being reset before breaking out of the
  loop. These are used one more time after the loop.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28083 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2008-10-14 13:20:29 +00:00
parent 47ddcdba73
commit e385b2434f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/GlyphLayoutEngine.h
+7 -2
View File
@@ -155,6 +155,8 @@ GlyphLayoutEngine::LayoutGlyphs(GlyphConsumer& consumer,
continue; continue;
} }
// TODO: Currently disabled, because it works much too slow (doesn't seem
// to be properly cached in FreeType.)
// if (kerning) // if (kerning)
// entry->GetKerning(lastCharCode, charCode, &advanceX, &advanceY); // entry->GetKerning(lastCharCode, charCode, &advanceX, &advanceY);
@@ -164,10 +166,13 @@ GlyphLayoutEngine::LayoutGlyphs(GlyphConsumer& consumer,
if (delta) if (delta)
x += IsWhiteSpace(charCode) ? delta->space : delta->nonspace; x += IsWhiteSpace(charCode) ? delta->space : delta->nonspace;
if (!consumer.ConsumeGlyph(index, charCode, glyph, entry, x, y)) if (!consumer.ConsumeGlyph(index, charCode, glyph, entry, x, y)) {
advanceX = 0;
advanceY = 0;
break; break;
}
// increment pen position // get next increment for pen position
advanceX = glyph->advance_x; advanceX = glyph->advance_x;
advanceY = glyph->advance_y; advanceY = glyph->advance_y;