components/desktop/poppler/patches/poppler-03-null-font.patch
changeset 5327 e8b0f6b16632
equal deleted inserted replaced
5326:5ee407fd058a 5327:e8b0f6b16632
       
     1 According to the comment in the Desktop poppler.spec file, this is
       
     2 doo:13889
       
     3 
       
     4 This patch will not be submitted upstream.
       
     5 
       
     6 diff -urN poppler-0.12.2/poppler/TextOutputDev.cc ../SUNWgnome-pdf-viewer-2.28.2.hacked/poppler-0.12.2/poppler/TextOutputDev.cc
       
     7 --- poppler-0.12.2/poppler/TextOutputDev.cc	2009-10-04 23:40:39.000000000 +0100
       
     8 +++ ../SUNWgnome-pdf-viewer-2.28.2.hacked/poppler-0.12.2/poppler/TextOutputDev.cc	2010-01-14 16:19:05.588587805 +0000
       
     9 @@ -233,9 +233,11 @@
       
    10    font = fontA;
       
    11    fontSize = fontSizeA;
       
    12    state->transform(x0, y0, &x, &y);
       
    13 -  if ((gfxFont = font->gfxFont)) {
       
    14 -    ascent = gfxFont->getAscent() * fontSize;
       
    15 -    descent = gfxFont->getDescent() * fontSize;
       
    16 +  if (font) {
       
    17 +    if ((gfxFont = font->gfxFont)!= NULL) {
       
    18 +      ascent = gfxFont->getAscent() * fontSize;
       
    19 +      descent = gfxFont->getDescent() * fontSize;
       
    20 +    }
       
    21    } else {
       
    22      // this means that the PDF file draws text without a current font,
       
    23      // which should never happen