Changeset 1540

Timestamp:

Apr 18, 2016, 11:40:05 PM (9 years ago)

Author:

dmik

Message:

fontconfig: Properly recognize Type1 fonts listed in OS/2 PM Registry.

These fonts were skipped before because they are stored as .OFM files in PM_Fonts
while Freetype only understands .PFB files.

Location:

fontconfig/trunk/src

Files:

• fcdir.c (modified) (1 diff)
• fcstat.c (modified) (1 diff)

fontconfig/trunk/src/fcdir.c ¶

@@ -272 +272 @@
             char *key = buf;
             char font [CCHMAXPATH];
+            int len;
 
             while (*key)
             {
-                if (PrfQueryProfileString (HINI_USERPROFILE, "PM_Fonts", key, NULL, font, CCHMAXPATH) > 0)
+                if ((len = PrfQueryProfileString (HINI_USERPROFILE, "PM_Fonts", key, NULL, font, CCHMAXPATH)) > 0)
                 {
                     FcBool ok = FcFalse;
-                    FcChar8 *f = FcStrCanonFilename ((FcChar8 *)font);
+                    FcChar8 *f;
+
+                    /* PM_Fonts stores .OFM files for Type1 fonts while Freetype needs .PFB */
+                    if (len >= 5 && stricmp (&font [len - 5], ".OFM") == 0)
+                        strcpy (&font [len - 5], ".PFB");
+
+                    f = FcStrCanonFilename ((FcChar8 *)font);
                     if (f)
                     {

fontconfig/trunk/src/fcstat.c ¶

@@ -350 +350 @@
                 if ((len = PrfQueryProfileString (HINI_USERPROFILE, "PM_Fonts", key, NULL, font, CCHMAXPATH)) > 0)
                 {
+                    /* PM_Fonts stores .OFM files for Type1 fonts while Freetype needs .PFB */
+                    if (len >= 5 && stricmp (&font [len - 5], ".OFM") == 0)
+                        strcpy (&font [len - 5], ".PFB");
+
                     Adler32Update (&ctx, font, len);