From dbada0bd3d4c2e06a9df09ae505cf9dca29941dc Mon Sep 17 00:00:00 2001 From: Felix Kauselmann <2039670+selmf@users.noreply.github.com> Date: Mon, 17 Oct 2016 22:27:36 +0200 Subject: [PATCH] Remove some dublicate code from PDFComic::renderPage --- common/comic.cpp | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/common/comic.cpp b/common/comic.cpp index 3a6e3056..7ab2ffe1 100644 --- a/common/comic.cpp +++ b/common/comic.cpp @@ -841,25 +841,18 @@ void PDFComic::process() void PDFComic::renderPage(int page) { #ifdef Q_OS_MAC + QImage img = pdfComic->getPage(page); + if(!img.isNull()) { - 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(); + pdfComic->releaseLastPageData(); + #else Poppler::Page* pdfpage = pdfComic->page(page); if (pdfpage) { QImage img = pdfpage->renderToImage(150,150); delete pdfpage; +#endif QByteArray ba; QBuffer buf(&ba); img.save(&buf, "jpg"); @@ -867,7 +860,6 @@ void PDFComic::renderPage(int page) emit imageLoaded(page); emit imageLoaded(page,_pages[page]); } -#endif } Comic * FactoryComic::newComic(const QString & path)