[poppler] poppler/qt4/src: poppler-page.cc,1.25,1.26
Albert Astals Cid
aacid at kemper.freedesktop.org
Sat Sep 30 09:28:37 PDT 2006
Update of /cvs/poppler/poppler/qt4/src
In directory kemper:/tmp/cvs-serv26407/qt4/src
Modified Files:
poppler-page.cc
Log Message:
* qt4/src/poppler-page.cc: PA is optional, H is a name not a string
Index: poppler-page.cc
===================================================================
RCS file: /cvs/poppler/poppler/qt4/src/poppler-page.cc,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- poppler-page.cc 11 Sep 2006 21:20:56 -0000 1.25
+++ poppler-page.cc 30 Sep 2006 16:28:35 -0000 1.26
@@ -804,7 +804,7 @@
// -> hlMode
QString hlModeString;
- XPDFReader::lookupString( annotDict, "H", hlModeString );
+ XPDFReader::lookupName( annotDict, "H", hlModeString );
if ( hlModeString == "N" )
l->linkHLMode = LinkAnnotation::None;
else if ( hlModeString == "I" )
@@ -835,13 +835,16 @@
// reading link action
Object objPA;
annotDict->lookup( "PA", &objPA );
- ::LinkAction * a = ::LinkAction::parseAction( &objPA, m_page->parentDoc->m_doc->doc.getCatalog()->getBaseURI() );
- Link * popplerLink = m_page->convertLinkActionToLink( a, QRectF(), m_page->parentDoc->m_doc );
- if ( popplerLink )
+ if (!objPA.isNull())
{
- l->linkDestination = popplerLink;
+ ::LinkAction * a = ::LinkAction::parseAction( &objPA, m_page->parentDoc->m_doc->doc.getCatalog()->getBaseURI() );
+ Link * popplerLink = m_page->convertLinkActionToLink( a, QRectF(), m_page->parentDoc->m_doc );
+ if ( popplerLink )
+ {
+ l->linkDestination = popplerLink;
+ }
+ objPA.free();
}
- objPA.free();
}
else
{
More information about the poppler
mailing list