Changeset 283

Timestamp:

01/13/07 20:45:08 (2 years ago)

Author:

astrange

Message:

Fix subtitles' font substitution. Closes #86.
(ATSUSetTransientFontMatching apparently must be called after ATSUSetTextPointerLocation?)
Add a null pointer check.

Files:

• trunk/TextSubCodec.c (modified) (4 diffs)

trunk/TextSubCodec.c

@@ -48 +48 @@
-static CFMutableStringRef CFStringCreateWithCStringMutable(CFAllocatorRef alloc, const char *cStr, CFStringEncoding encoding) {
-        CFStringRef                s1 = CFStringCreateWithCString(alloc,cStr,encoding);
+        if (!s1) return NULL;
-        CFMutableStringRef s2 = CFStringCreateMutableCopy(alloc,0,s1);
-        CFRelease(s1);
@@ -338 +339 @@
-                ATSUCreateTextLayout(&glob->textLayout);
-                ATSUSetLayoutControls(glob->textLayout, 2, tags, sizes, vals);
-                ATSUSetTransientFontMatching(glob->textLayout,TRUE);
-        }
-        
@@ -355 +355 @@
-        
-        ATSUSetLayoutControls(glob->textLayout, 1, cgc, cgc_s, cgc_v);
-
+
-        CFMutableStringRef cfsub = CFStringCreateWithCStringMutable(NULL, textBuffer, kCFStringEncodingUTF8);
-        if (cfsub == NULL)
@@ -576 +576 @@
-        CFStringGetCharacters(cfsub, all, uc);
-        ATSUSetTextPointerLocation(glob->textLayout,uc,kATSUFromTextBeginning,kATSUToTextEnd,sublen);
+        ATSUSetTransientFontMatching(glob->textLayout,TRUE);
+
-        ATSUSetRunStyle(glob->textLayout,glob->textStyle,kATSUFromTextBeginning,kATSUToTextEnd);
-        if (italics) {