components/desktop/poppler/patches/poppler-04-sun-ja-font.patch
author Rich Burridge <rich.burridge@oracle.com>
Mon, 25 Jan 2016 14:14:00 -0800
changeset 5327 e8b0f6b16632
permissions -rw-r--r--
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland 22271989 Move evince and dependencies from Desktop to Userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5327
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     1
Patch taken from the Desktop consolidation.
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     2
See BugDB CR#15724715
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     3
SUNBT7059720 evince cannot display the pdf file without embedded font if sun-ja-
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     4
for more details.
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     5
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     6
This patch will be sent upstream if the problem still exists in the latest
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     7
version of poppler.
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     8
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     9
diff -urN poppler-0.14.4/poppler/GlobalParams.cc ../SUNWgnome-pdf-viewer-2.30.3.hacked/poppler-0.14.4/poppler/GlobalParams.cc
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    10
--- poppler-0.14.4/poppler/GlobalParams.cc	2010-09-12 17:16:26.000000000 +0000
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    11
+++ ../SUNWgnome-pdf-viewer-2.30.3.hacked/poppler-0.14.4/poppler/GlobalParams.cc	2011-07-14 13:35:34.448661213 +0000
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    12
@@ -1202,6 +1202,18 @@
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    13
       ext = strrchr((char*)s,'.');
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    14
       if (!ext)
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    15
         continue;
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    16
+#ifdef __sun
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    17
+      // system/font/sun-ja-bitmap-unicode has messed up the choice of fonts
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    18
+      // to render Japanese PDF doc, so replace it with a TrueType font.
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    19
+      if (strstr ((char *)s, "sun-ja") && !strncasecmp(ext,".pcf",4))
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    20
+      {
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    21
+        dfp = new DisplayFontParam(fontName->copy(), displayFontTT);
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    22
+        dfp->tt.fileName = new GooString("/usr/share/fonts/TrueType/ipafont/ipagp.ttf");
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    23
+        FcPatternGetInteger(set->fonts[i], FC_INDEX, 0, &(dfp->tt.faceIndex));
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    24
+        font->dfp = dfp;
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    25
+        break;
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    26
+      }
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    27
+#endif
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    28
       if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext, ".ttc", 4))
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    29
       {
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    30
         dfp = new DisplayFontParam(fontName->copy(), displayFontTT);