Attachment 4528 Details for Bug 5758 – revised patch

[patch] revised patch

5758.bugs.fdo-try-all-fonts.patch (text/plain), 2.26 KB, created by Ed Catmur on 2006-02-02 01:44:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Catmur

Created: 2006-02-02 01:44:47 UTC

Size: 2.26 KB

patch

obsolete

>--- poppler/GlobalParams.cc	2006/01/29 07:59:20	1.1
>+++ poppler/GlobalParams.cc	2006/01/29 08:12:06
>@@ -1266,7 +1266,7 @@ FcPattern *buildFcPattern(GfxFont *font)
> 
> DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
>   DisplayFontParam *dfp;
>-  FcPattern *p=0,*m=0;
>+  FcPattern *p=0;
> 
>   GooString *fontName = font->getName();
>   if (!fontName) return NULL;
>@@ -1278,38 +1278,43 @@ DisplayFontParam *GlobalParams::getDispl
>     FcChar8* s;
>     char * ext;
>     FcResult res;
>+    FcFontSet *set;
>+    int i;
>     p = buildFcPattern(font);
> 
>     if (!p)
>       goto fin;
>     FcConfigSubstitute(FCcfg, p, FcMatchPattern);
>     FcDefaultSubstitute(p);
>-    m = FcFontMatch(FCcfg,p,&res);
>-    if (!m)
>-      goto fin; 
>-    res = FcPatternGetString(m, FC_FILE, 0, &s);
>-    if (res != FcResultMatch || !s)
>-      goto fin; 
>-    ext = strrchr((char*)s,'.');
>-    if (!ext)
>+    set = FcFontSort(FCcfg, p, FcFalse, NULL, &res);
>+    if (!set)
>       goto fin;
>-    if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext,".ttc",4))
>+    for (i = 0; i < set->nfont; ++i)
>     {
>-      dfp = new DisplayFontParam(fontName->copy(), displayFontTT);  
>-      dfp->tt.fileName = new GooString((char*)s);
>-    }
>-    else if (!strncasecmp(ext,".pfa",4) || !strncasecmp(ext,".pfb",4)) 
>-    {
>-      dfp = new DisplayFontParam(fontName->copy(), displayFontT1);  
>-      dfp->t1.fileName = new GooString((char*)s);
>+      res = FcPatternGetString(set->fonts[i], FC_FILE, 0, &s);
>+      if (res != FcResultMatch || !s)
>+        continue;
>+      ext = strrchr((char*)s,'.');
>+      if (!ext)
>+        continue;
>+      if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext,".ttc",4))
>+      {
>+        dfp = new DisplayFontParam(fontName->copy(), displayFontTT);  
>+        dfp->tt.fileName = new GooString((char*)s);
>+      }
>+      else if (!strncasecmp(ext,".pfa",4) || !strncasecmp(ext,".pfb",4)) 
>+      {
>+        dfp = new DisplayFontParam(fontName->copy(), displayFontT1);  
>+        dfp->t1.fileName = new GooString((char*)s);
>+      }
>+      else
>+        continue;
>+      displayFonts->add(dfp->name,dfp);
>+      break;
>     }
>-    else
>-      goto fin;
>-    displayFonts->add(dfp->name,dfp);
>+    FcFontSetDestroy(set);
>   }
> fin:
>-  if (m)
>-    FcPatternDestroy(m);
>   if (p)
>     FcPatternDestroy(p);
>

Actions: View | Splinter Review

Attachments on bug 5758: 4503 | 4528 | 4533

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.