| author | Rich Burridge <rich.burridge@oracle.com> |
| Mon, 25 Jan 2016 14:14:00 -0800 | |
| changeset 5327 | e8b0f6b16632 |
| permissions | -rw-r--r-- |
|
5327
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
According to the comment in the Desktop poppler.spec file, this is |
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
doo:13889 |
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
|
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
This patch will not be submitted upstream. |
|
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 |
diff -urN poppler-0.12.2/poppler/TextOutputDev.cc ../SUNWgnome-pdf-viewer-2.28.2.hacked/poppler-0.12.2/poppler/TextOutputDev.cc |
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
--- poppler-0.12.2/poppler/TextOutputDev.cc 2009-10-04 23:40:39.000000000 +0100 |
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
+++ ../SUNWgnome-pdf-viewer-2.28.2.hacked/poppler-0.12.2/poppler/TextOutputDev.cc 2010-01-14 16:19:05.588587805 +0000 |
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
@@ -233,9 +233,11 @@ |
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
font = fontA; |
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
fontSize = fontSizeA; |
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
state->transform(x0, y0, &x, &y); |
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
- if ((gfxFont = font->gfxFont)) {
|
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
- ascent = gfxFont->getAscent() * fontSize; |
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
- descent = gfxFont->getDescent() * fontSize; |
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
+ if (font) {
|
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
+ if ((gfxFont = font->gfxFont)!= NULL) {
|
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
+ ascent = gfxFont->getAscent() * fontSize; |
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
+ descent = gfxFont->getDescent() * fontSize; |
|
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 |
} else {
|
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
// this means that the PDF file draws text without a current font, |
|
e8b0f6b16632
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
// which should never happen |