|
17345
|
1 |
diff -urN poppler-0.12.2/poppler/TextOutputDev.cc ../SUNWgnome-pdf-viewer-2.28.2.hacked/poppler-0.12.2/poppler/TextOutputDev.cc
|
|
|
2 |
--- poppler-0.12.2/poppler/TextOutputDev.cc 2009-10-04 23:40:39.000000000 +0100
|
|
|
3 |
+++ ../SUNWgnome-pdf-viewer-2.28.2.hacked/poppler-0.12.2/poppler/TextOutputDev.cc 2010-01-14 16:19:05.588587805 +0000
|
|
|
4 |
@@ -233,9 +233,11 @@
|
|
|
5 |
font = fontA;
|
|
|
6 |
fontSize = fontSizeA;
|
|
|
7 |
state->transform(x0, y0, &x, &y);
|
|
|
8 |
- if ((gfxFont = font->gfxFont)) {
|
|
|
9 |
- ascent = gfxFont->getAscent() * fontSize;
|
|
|
10 |
- descent = gfxFont->getDescent() * fontSize;
|
|
|
11 |
+ if (font) {
|
|
|
12 |
+ if ((gfxFont = font->gfxFont)!= NULL) {
|
|
|
13 |
+ ascent = gfxFont->getAscent() * fontSize;
|
|
|
14 |
+ descent = gfxFont->getDescent() * fontSize;
|
|
|
15 |
+ }
|
|
|
16 |
} else {
|
|
|
17 |
// this means that the PDF file draws text without a current font,
|
|
|
18 |
// which should never happen
|