1 Patch taken from the Desktop consolidation. |
|
2 See BugDB CR #18372287 |
|
3 Evince garbles japanese characters if ipafont-mincho fonts are installed |
|
4 for more details. |
|
5 |
|
6 This patch will be sent upstream if the problem still exists in the latest |
|
7 version of poppler. |
|
8 |
|
9 diff -ur poppler-0.14.4.orig/poppler/GfxFont.cc poppler-0.14.4/poppler/GfxFont.cc |
|
10 --- poppler-0.14.4.orig/poppler/GfxFont.cc 2014年 3月 7日 五 06:08:25 |
|
11 +++ poppler-0.14.4/poppler/GfxFont.cc 2014年 3月 7日 五 06:13:51 |
|
12 @@ -445,7 +445,7 @@ |
|
13 |
|
14 void GfxFont::findExtFontFile() { |
|
15 static char *type1Exts[] = { ".pfa", ".pfb", ".ps", "", NULL }; |
|
16 - static char *ttExts[] = { ".ttf", ".ttc", NULL }; |
|
17 + static char *ttExts[] = { ".ttf", ".ttc", ".otf", NULL }; |
|
18 |
|
19 if (name) { |
|
20 if (type == fontType1) { |
|
21 diff -ur poppler-0.14.4.orig/poppler/GlobalParams.cc poppler-0.14.4/poppler/GlobalParams.cc |
|
22 --- poppler-0.14.4.orig/poppler/GlobalParams.cc 2014年 3月 7日 五 06:08:24 |
|
23 +++ poppler-0.14.4/poppler/GlobalParams.cc 2014年 3月 7日 五 06:15:15 |
|
24 @@ -1214,7 +1214,7 @@ |
|
25 break; |
|
26 } |
|
27 #endif |
|
28 - if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext, ".ttc", 4)) |
|
29 + if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext, ".ttc", 4) || !strncasecmp(ext, ".otf", 4)) |
|
30 { |
|
31 dfp = new DisplayFontParam(fontName->copy(), displayFontTT); |
|
32 dfp->tt.fileName = new GooString((char*)s); |
|