mirror of
https://invent.kde.org/graphics/okular
synced 2024-09-12 20:51:17 +00:00
pages can be interleaved in multiple files as well (10.1.2 in the specs)
svn path=/trunk/KDE/kdegraphics/okular/; revision=825291
This commit is contained in:
parent
5c91487bbc
commit
4eb6413e37
|
@ -964,7 +964,7 @@ XpsPage::XpsPage(XpsFile *file, const QString &fileName): m_file( file ),
|
|||
const KZipFileEntry* pageFile = static_cast<const KZipFileEntry *>(m_file->xpsArchive()->directory()->entry( fileName ));
|
||||
|
||||
QXmlStreamReader xml;
|
||||
xml.addData( pageFile->data() );
|
||||
xml.addData( readFileOrDirectoryParts( pageFile ) );
|
||||
while ( !xml.atEnd() )
|
||||
{
|
||||
xml.readNext();
|
||||
|
@ -1007,7 +1007,7 @@ bool XpsPage::renderToImage( QImage *p )
|
|||
parser->setContentHandler( handler );
|
||||
parser->setErrorHandler( handler );
|
||||
const KZipFileEntry* pageFile = static_cast<const KZipFileEntry *>(m_file->xpsArchive()->directory()->entry( m_fileName ));
|
||||
QByteArray data = pageFile->data();
|
||||
QByteArray data = readFileOrDirectoryParts( pageFile );
|
||||
QBuffer * buffer = new QBuffer(&data);
|
||||
QXmlInputSource *source = new QXmlInputSource(buffer);
|
||||
bool ok = parser->parse( source );
|
||||
|
|
Loading…
Reference in a new issue