mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-26 00:44:59 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

no more poppler in MacOSX, fixed PDF crash issue

Browse Source
This commit is contained in:
Luis Ángel San Martín
2014-06-01 11:09:38 +02:00
parent 2cdc796445
commit 55f6052a05
8 changed files with 247 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
common/comic.cpp
View File

@ -633,18 +633,32 @@ bool PDFComic::load(const QString & path, const ComicDB & comic)
void PDFComic::process()
{
#ifdef Q_OS_MAC
pdfComic = new MacOSXPDFComic();
if(!pdfComic->openComic(_path))
{
delete pdfComic;
emit errorOpening();
return;
}
#else
pdfComic = Poppler::Document::load(_path);
if (!pdfComic)
{
delete pdfComic;
pdfComic = 0;
//delete pdfComic;
//pdfComic = 0;
emit errorOpening();
return;
}
//pdfComic->setRenderHint(Poppler::Document::Antialiasing, true);
pdfComic->setRenderHint(Poppler::Document::TextAntialiasing, true);
#endif
int nPages = pdfComic->numPages();
emit pageChanged(0); // this indicates new comic, index=0
emit numPages(nPages);
@ -672,6 +686,21 @@ void PDFComic::process()
void PDFComic::renderPage(int page)
{
#ifdef Q_OS_MAC
{
QImage img = pdfComic->getPage(page);
if(!img.isNull())
{
QByteArray ba;
QBuffer buf(&ba);
img.save(&buf, "jpg");
_pages[page] = ba;
emit imageLoaded(page);
emit imageLoaded(page,_pages[page]);
}
}
pdfComic->releaseLastPageData();
#else
Poppler::Page* pdfpage = pdfComic->page(page);
if (pdfpage)
{
@ -684,6 +713,7 @@ void PDFComic::renderPage(int page)
emit imageLoaded(page);
emit imageLoaded(page,_pages[page]);
}
#endif
}
Comic * FactoryComic::newComic(const QString & path)