zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2026-06-04 23:54:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize and simplify hasGlyph.

Browse Source
This commit is contained in:
Mikael Sand
2017-08-29 03:16:52 +03:00
parent 04887af278
commit 5a01d672b9
1 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ios/Text/RNSVGTSpan.m
+16 -21
View File
@@ -671,6 +671,19 @@
} }
} }
int i = -1; int i = -1;
CFDictionaryRef ligattributes;
NSNumber *lig = [NSNumber numberWithInt:allowOptionalLigatures ? 2 : 1];
if (fontRef != nil) {
ligattributes = (__bridge CFDictionaryRef)@{
(NSString *)kCTFontAttributeName: (__bridge id)fontRef,
(NSString *)NSLigatureAttributeName: lig
};
} else {
ligattributes = (__bridge CFDictionaryRef)@{
(NSString *)NSLigatureAttributeName: lig
};
}
for(CFIndex g = 0; g < runGlyphCount; g++) { for(CFIndex g = 0; g < runGlyphCount; g++) {
i++; i++;
bool alreadyRenderedGraphemeCluster = ligature[i]; bool alreadyRenderedGraphemeCluster = ligature[i];
@@ -719,7 +732,7 @@
bool hasLigature = false; bool hasLigature = false;
while (++nextIndex < n) { while (++nextIndex < n) {
NSString* nextLigature = [str substringWithRange:NSMakeRange(i, len++)]; NSString* nextLigature = [str substringWithRange:NSMakeRange(i, len++)];
bool hasNextLigature = hasGlyph(fontRef, nextLigature, &glyph, allowOptionalLigatures); bool hasNextLigature = hasGlyph(fontRef, nextLigature, &glyph, ligattributes);
if (hasNextLigature) { if (hasNextLigature) {
ligature[nextIndex] = true; ligature[nextIndex] = true;
hasLigature = true; hasLigature = true;
@@ -836,23 +849,9 @@ CGFloat getTextAnchorOffset(enum TextAnchor textAnchor, CGFloat width)
} }
} }
bool hasGlyph(CTFontRef fontRef, NSString * str, CGGlyph* glyph, bool allowOptionalLigatures) bool hasGlyph(CTFontRef fontRef, NSString * str, CGGlyph* glyph, CFDictionaryRef attributes)
{ {
CFStringRef string = (__bridge CFStringRef)str; CFStringRef string = (__bridge CFStringRef)str;
CFDictionaryRef attributes;
NSNumber *lig = [NSNumber numberWithInt:allowOptionalLigatures ? 2 : 1];
if (fontRef != nil) {
attributes = (__bridge CFDictionaryRef)@{
(NSString *)kCTFontAttributeName: (__bridge id)fontRef,
(NSString *)NSLigatureAttributeName: lig
};
} else {
attributes = (__bridge CFDictionaryRef)@{
(NSString *)NSLigatureAttributeName: lig
};
}
CFAttributedStringRef attrString = CFAttributedStringCreate(kCFAllocatorDefault, string, attributes); CFAttributedStringRef attrString = CFAttributedStringCreate(kCFAllocatorDefault, string, attributes);
CTLineRef line = CTLineCreateWithAttributedString(attrString); CTLineRef line = CTLineCreateWithAttributedString(attrString);
CFArrayRef runs = CTLineGetGlyphRuns(line); CFArrayRef runs = CTLineGetGlyphRuns(line);
@@ -863,14 +862,10 @@ bool hasGlyph(CTFontRef fontRef, NSString * str, CGGlyph* glyph, bool allowOptio
} }
CTRunRef run = CFArrayGetValueAtIndex(runs, 0); CTRunRef run = CFArrayGetValueAtIndex(runs, 0);
CFIndex runGlyphCount = CTRunGetGlyphCount(run); CFIndex runGlyphCount = CTRunGetGlyphCount(run);
CGGlyph glyphs[runGlyphCount];
CTRunGetGlyphs(run, CFRangeMake(0, 0), glyphs);
bool hasGlyph = runGlyphCount == 1; bool hasGlyph = runGlyphCount == 1;
if (hasGlyph) { if (hasGlyph) {
*glyph = glyphs[0]; CTRunGetGlyphs(run, CFRangeMake(0, 1), glyph);
} }
return hasGlyph; return hasGlyph;