interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Folded all CFNumber accesses into [self prepare] for error checking. This shouldn't make things *significantly* slower...

This commit is contained in:
Pietro Gagliardi 2017-11-03 18:41:13 -04:00
parent 4e7fb5e264
commit 51f0e3dbe5
2 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
doc/export/fontmatch.m
View File

@ -78,6 +78,7 @@
- (BOOL)prepare
{
CFNumberRef num;
Boolean success;
self->traits = NULL;
self->symbolic = 0;
@ -87,12 +88,10 @@
self->styleName = NULL;
self->didVariations = NO;
self->variations = NULL;
self->didRegistrationScope = NO;
self->hasRegistrationScope = NO;
self->registrationScope = 0;
self->didPostScriptName = NO;
self->postScriptName = NULL;
self->didFontFormat = NO;
self->fontFormat = 0;
self->didPreferredSubFamilyName = NO;
self->preferredSubFamilyName = NULL;
@ -129,6 +128,24 @@
if (CFNumberGetValue(num, kCFNumberDoubleType, &(self->width)) == false)
return NO;
// do these now for the sake of error checking
num = (CFNumberRef) CTFontDescriptorCopyAttribute(desc, kCTFontRegistrationScopeAttribute);
self->hasRegistrationScope = num != NULL;
if (self->hasRegistrationScope) {
success = CFNumberGetValue(num, kCFNumberSInt32Type, &(self->registrationScope));
CFRelease(num);
if (success == false)
return NO;
}
num = (CFNumberRef) CTFontDescriptorCopyAttribute(self->desc, kCTFontFormatAttribute);
if (num == NULL)
return NO;
success = CFNumberGetValue(num, kCFNumberSInt32Type, &(self->fontFormat));
CFRelease(num);
if (success == false)
return NO;
return YES;
}
@ -176,25 +193,11 @@
- (BOOL)hasRegistrationScope
{
if (!self->didRegistrationScope) {
CFNumberRef num;
self->didRegistrationScope = YES;
num = (CFNumberRef) CTFontDescriptorCopyAttribute(desc, kCTFontRegistrationScopeAttribute);
self->hasRegistrationScope = num != NULL;
if (self->hasRegistrationScope) {
if (CFNumberGetValue(num, kCFNumberSInt32Type, &(self->registrationScope)) == false) {
// TODO
}
CFRelease(num);
}
}
return self->hasRegistrationScope;
}
- (CTFontManagerScope)registrationScope
{
[self hasRegistrationScope];
return self->registrationScope;
}
@ -216,19 +219,6 @@
- (CTFontFormat)fontFormat
{
if (!self->didFontFormat) {
CFNumberRef num;
self->didFontFormat = YES;
num = (CFNumberRef) CTFontDescriptorCopyAttribute(self->desc, kCTFontFormatAttribute);
if (num == NULL) {
// TODO
}
if (CFNumberGetValue(num, kCFNumberSInt32Type, &(self->fontFormat)) == false) {
// TODO
}
CFRelease(num);
}
return self->fontFormat;
}

2
doc/export/fontstyle.h
View File

@ -12,12 +12,10 @@
CFStringRef styleName;
BOOL didVariations;
CFDictionaryRef variations;
BOOL didRegistrationScope;
BOOL hasRegistrationScope;
CTFontManagerScope registrationScope;
BOOL didPostScriptName;
CFStringRef postScriptName;
BOOL didFontFormat;
CTFontFormat fontFormat;
BOOL didPreferredSubFamilyName;
CFStringRef preferredSubFamilyName;