components/desktop/poppler/patches/poppler-03-null-font.patch
changeset 6408 3c9262a98d5d
parent 6407 233620acc9da
child 6409 a57c61602ca6
--- a/components/desktop/poppler/patches/poppler-03-null-font.patch	Wed Jul 13 09:59:57 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-According to the comment in the Desktop poppler.spec file, this is
-doo:13889
-
-This patch will not be submitted upstream.
-
-diff -urN poppler-0.12.2/poppler/TextOutputDev.cc ../SUNWgnome-pdf-viewer-2.28.2.hacked/poppler-0.12.2/poppler/TextOutputDev.cc
---- poppler-0.12.2/poppler/TextOutputDev.cc	2009-10-04 23:40:39.000000000 +0100
-+++ ../SUNWgnome-pdf-viewer-2.28.2.hacked/poppler-0.12.2/poppler/TextOutputDev.cc	2010-01-14 16:19:05.588587805 +0000
-@@ -233,9 +233,11 @@
-   font = fontA;
-   fontSize = fontSizeA;
-   state->transform(x0, y0, &x, &y);
--  if ((gfxFont = font->gfxFont)) {
--    ascent = gfxFont->getAscent() * fontSize;
--    descent = gfxFont->getDescent() * fontSize;
-+  if (font) {
-+    if ((gfxFont = font->gfxFont)!= NULL) {
-+      ascent = gfxFont->getAscent() * fontSize;
-+      descent = gfxFont->getDescent() * fontSize;
-+    }
-   } else {
-     // this means that the PDF file draws text without a current font,
-     // which should never happen