Changeset 1193

Timestamp:

11/17/09 00:04:23 (4 months ago)

Author:

astrange

Message:

Blacklist DF*.ttc from being imported.

Fixes [BSS]_Darker_Than_Black_-_Gemini_of_the_Meteor_-_02_[1DC03D18].mkv and more.

Reported as radr://7197648 but it didn't help. Closes #453.

Files:

• trunk/CommonUtils.c (modified) (4 diffs)
• trunk/CommonUtils.h (modified) (1 diff)
• trunk/MatroskaImportPrivate.cpp (modified) (1 diff)

trunk/CommonUtils.c

@@ -25 +25 @@
-#import <pthread.h>
-#import <dlfcn.h>
+#import <fnmatch.h>
-
-typedef struct LanguageTriplet {
@@ -411 +412 @@
-}
-
+static int GetSystemMinorVersion()
+{
+        long minorVersion;
+        Gestalt(gestaltSystemVersionMinor, &minorVersion);
+        
+        return minorVersion;
+}
+
-int IsTransparentSubtitleHackEnabled()
-{
@@ -417 +426 @@
-        if(forced == -1)
-        {
-
-
+
-                
-                if (minorVersion == 5)
@@ -449 +457 @@
-}
-
+
+// this could be a defaults setting, but no real call for it yet
+int ShouldImportFontFileName(const char *filename)
+{
+        // match DynaFont Labs (1997) fonts, which are in many files
+        // and completely break ATSUI on different OS versions
+        // FIXME: This font works when in ~/Library/Fonts (!). Check it again with CoreText.
+        return !(GetSystemMinorVersion() >= 6 && fnmatch("DF*.ttc", filename, 0) == 0);
+}
+
+
-CFPropertyListRef CopyPreferencesValueTyped(CFStringRef key, CFTypeID type)
-{

trunk/CommonUtils.h

@@ -62 +62 @@
-int IsAltivecSupported();
-
+// is this font name known to be incompatible with ATSUI?
+int ShouldImportFontFileName(const char *filename);
+        
-// CFPreferencesCopyAppValue() wrapper which checks the type of the value returned
-CFPropertyListRef CopyPreferencesValueTyped(CFStringRef key, CFTypeID type);

trunk/MatroskaImportPrivate.cpp

@@ -762 +762 @@
-                /* The only attachments handled here are fonts, which currently can be truetype or opentype.
-                   application/x-* is probably not a permanent MIME type, but it is current practice... */
-
+
+
-                        KaxFileData & fontData = GetChild<KaxFileData>(*attachedFile);
-