mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-25 08:25:03 -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

25
YACReaderLibrary/YACReaderLibrary.pro
View File

@ -48,15 +48,22 @@ LIBS += -lGLU
macx{
#INCLUDEPATH += "/Volumes/Mac OS X Lion/usr/X11/include"
isEqual(QT_MAJOR_VERSION, 5) {
INCLUDEPATH += /usr/local/include/poppler/qt5
LIBS += -L/usr/local/lib -lpoppler-qt5
}
else {
INCLUDEPATH += /usr/local/include/poppler/qt4
LIBS += -L/usr/local/lib -lpoppler-qt4
}
QT += macextras
#isEqual(QT_MAJOR_VERSION, 5) {
#INCLUDEPATH += /usr/local/include/poppler/qt5
#LIBS += -L/usr/local/lib -lpoppler-qt5
#}
#else {
#INCLUDEPATH += /usr/local/include/poppler/qt4
#LIBS += -L/usr/local/lib -lpoppler-qt4
#}
#QT += macextras
LIBS += -framework Foundation -framework ApplicationServices
OBJECTIVE_SOURCES += $$PWD/../common/pdf_comic.mm
HEADERS += $$PWD/../common/pdf_comic.h
CONFIG += objective_c
}
#CONFIG += release

37
YACReaderLibrary/library_creator.cpp
View File

@ -22,12 +22,18 @@
#include <algorithm>
using namespace std;
#ifdef Q_OS_MAC
#include "pdf_comic.h"
#else
#if QT_VERSION >= 0x050000
#include "poppler-qt5.h"
#else
#include "poppler-qt4.h"
#endif
#endif
//--------------------------------------------------------------------------------
LibraryCreator::LibraryCreator()
:creation(false)
@ -500,11 +506,24 @@ void ThumbnailCreator::create()
if(fi.suffix().compare("pdf",Qt::CaseInsensitive) == 0)
{
#ifdef Q_OS_MAC
MacOSXPDFComic * pdfComic = new MacOSXPDFComic();
if(!pdfComic->openComic(_fileSource))
{
delete pdfComic;
QImage p;
p.load(":/images/notCover.png");
p.save(_target);
return;
}
#else
Poppler::Document * pdfComic = Poppler::Document::load(_fileSource);
if (!pdfComic)
#endif
if (!pdfComic)
{
QLOG_WARN() << "Extracting cover: unable to open PDF file " << _fileSource;
delete pdfComic;
//delete pdfComic; //TODO check if the delete is needed
pdfComic = 0;
QImage p;
p.load(":/images/notCover.png");
@ -514,8 +533,12 @@ void ThumbnailCreator::create()
_numPages = pdfComic->numPages();
if(_numPages >= _coverPage)
{
QImage p = pdfComic->page(_coverPage-1)->renderToImage(72,72); //TODO check if the page is valid
#ifdef Q_OS_MAC
{
QImage p = pdfComic->getPage(_coverPage-1); //TODO check if the page is valid
#else
QImage p = pdfComic->page(_coverPage-1)->renderToImage(72,72);
#endif
_cover = QPixmap::fromImage(p);
if(_target!="")
{
@ -526,6 +549,10 @@ void ThumbnailCreator::create()
scaled = p.scaledToWidth(480,Qt::SmoothTransformation);
scaled.save(_target,0,75);
}
#ifdef Q_OS_MAC
}
pdfComic->releaseLastPageData();
#endif
}
else if(_target!="")
{
@ -534,6 +561,8 @@ void ThumbnailCreator::create()
p.load(":/images/notCover.png");
p.save(_target);
}
delete pdfComic;
}
else
{