office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-27 03:30:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.11' into KDE/4.12

Browse source
This commit is contained in:
Albert Astals Cid 2013-11-30 23:08:26 +01:00
parent 2141e7aeee 55011e0588
commit 94f30e8343
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
generators/comicbook/document.cpp
View file

@ -185,11 +185,17 @@ void Document::pages( QVector<Okular::Page*> * pagesVector )
{
QSize pageSize = reader.size();
if ( !pageSize.isValid() ) {
pageSize = reader.read().size();
const QImage i = reader.read();
if ( !i.isNull() )
pageSize = i.size();
}
if ( pageSize.isValid() ) {
pagesVector->replace( count, new Okular::Page( count, pageSize.width(), pageSize.height(), Okular::Rotation0 ) );
mPageMap.append(file);
count++;
} else {
kDebug() << "Ignoring" << file << "doesn't seem to be an image even if QImageReader::canRead returned true";
}
pagesVector->replace( count, new Okular::Page( count, pageSize.width(), pageSize.height(), Okular::Rotation0 ) );
mPageMap.append(file);
count++;
}
}
}