Ticket #335: atsu-font.patch

Subtitles/SubATSUIRenderer.m

@@ -305 +305 @@
-        ATSUFindFontFromName(uname, nlen * sizeof(unichar), kFontFamilyName, kFontNoPlatformCode, kFontNoScript, kFontNoLanguage, &font);
-        
-        if (font == kATSUInvalidFontID) {
-
+
+
+
-                
+                ATSUFontID fontIDs[fontCount];
+                ItemCount arraySize = fontCount;
+                ATSUGetFontIDs(fontIDs, arraySize, &fontCount);
+                
+                // I do not want to call ATSUFindFontName twice 
+                // so I make the buffer large enough.
+                ByteCount len;
+                ItemCount x, index;
+                const ByteCount kBufLength = 1024;
+                char buf[kBufLength];
+          
+                for (x = 0; x < fontCount; x++) {
+      
+                        ATSUFindFontName(fontIDs[x], kFontFamilyName, kFontMicrosoftPlatform, kFontNoScript, kFontNoLanguage, kBufLength, buf, &len, &index);
+                        
+                        CFStringRef fname = CFStringCreateWithBytes(NULL,(UInt8 *) buf, len, kCFStringEncodingUnicode, false);
+                        if ([name caseInsensitiveCompare:(NSString *) fname] == NSOrderedSame) {
+                                font = fontIDs[x];
+                                break;
+                        }
+                        
+                }
-                if (font == kATSUInvalidFontID) font = ATSFontFindFromName((CFStringRef)@"Helvetica",kATSOptionFlagsDefault);
-        }
-