AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug fix for character 0x200B : zero-advance-space

Browse Source 
If we see a zero-advance, double check to see if its bounds should really be
empty, by asking for its path. If that is empty, jam the bounds to 0

The bug was that CT was returning a huge bounds for that character
(but, strangely enough, not for normal space character, hence our check for
zero-advance)



git-svn-id: http://skia.googlecode.com/svn/trunk@2424 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2011-10-06 16:28:45 +00:00
parent 767ea3be7f
commit fd8772e008
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/ports/SkFontHost_mac_coretext.cpp
View File

@ -484,8 +484,31 @@ void SkScalerContext_Mac::generateMetrics(SkGlyph* glyph)
cgGlyph = (CGGlyph) glyph->getGlyphID(fBaseGlyphCount); cgGlyph = (CGGlyph) glyph->getGlyphID(fBaseGlyphCount);
CTFontGetBoundingRectsForGlyphs(mFont, kCTFontDefaultOrientation, &cgGlyph, &theBounds, 1); CTFontGetBoundingRectsForGlyphs(mFont, kCTFontDefaultOrientation, &cgGlyph, &theBounds, 1);
CTFontGetAdvancesForGlyphs( mFont, kCTFontDefaultOrientation, &cgGlyph, &theAdvance, 1); CTFontGetAdvancesForGlyphs(mFont, kCTFontDefaultOrientation, &cgGlyph, &theAdvance, 1);
// BUG?
// 0x200B (zero-advance space) seems to return a huge (garbage) bounds, when
// it should be empty. So, if we see a zero-advance, we check if it has an
// empty path or not, and if so, we jam the bounds to 0. Hopefully a zero-advance
// is rare, so we won't incur a big performance cost for this extra check.
if (0 == theAdvance.width && 0 == theAdvance.height) {
CGPathRef path = CTFontCreatePathForGlyph(mFont, cgGlyph, NULL);
if (NULL == path || CGPathIsEmpty(path)) {
theBounds = CGRectMake(0, 0, 0, 0);
}
if (path) {
CGPathRelease(path);
}
}
glyph->zeroMetrics();
glyph->fAdvanceX = SkFloatToFixed(theAdvance.width);
glyph->fAdvanceY = -SkFloatToFixed(theAdvance.height);
if (CGRectIsEmpty(theBounds)) {
return;
}
// Adjust the bounds // Adjust the bounds
// //
// CTFontGetBoundingRectsForGlyphs ignores the font transform, so we need // CTFontGetBoundingRectsForGlyphs ignores the font transform, so we need
@ -495,9 +518,6 @@ void SkScalerContext_Mac::generateMetrics(SkGlyph* glyph)
theBounds = CGRectInset(theBounds, -1, -1); theBounds = CGRectInset(theBounds, -1, -1);
// Get the metrics // Get the metrics
glyph->zeroMetrics();
glyph->fAdvanceX = SkFloatToFixed(theAdvance.width);
glyph->fAdvanceY = -SkFloatToFixed(theAdvance.height);
if (isLion()) { if (isLion()) {
// Lion returns fractions in the bounds // Lion returns fractions in the bounds
glyph->fWidth = sk_float_ceil2int(theBounds.size.width); glyph->fWidth = sk_float_ceil2int(theBounds.size.width);