no more poppler in MacOSX, fixed PDF crash issue

common/comic.cpp

@@ -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)

common/comic.h

@@ -10,12 +10,20 @@
 
 #include "bookmarks.h"
 
+#ifdef Q_OS_MAC
+
+#include "pdf_comic.h"
+
+#else
+
 #if QT_VERSION >= 0x050000
 	#include "poppler-qt5.h"
 #else
 	#include "poppler-qt4.h"
 #endif
 
+#endif
+
 class ComicDB;
 //#define EXTENSIONS << "*.jpg" << "*.jpeg" << "*.png" << "*.gif" << "*.tiff" << "*.tif" << "*.bmp" Comic::getSupportedImageFormats()
 //#define EXTENSIONS_LITERAL << ".jpg" << ".jpeg" << ".png" << ".gif" << ".tiff" << ".tif" << ".bmp" //Comic::getSupportedImageLiteralFormats()
@@ -138,7 +146,11 @@ class ComicDB;
 		Q_OBJECT
 	private:
 		//pdf
+#ifdef Q_OS_MAC
+        MacOSXPDFComic * pdfComic;
+#else
 		Poppler::Document * pdfComic;
+#endif
 		void renderPage(int page);
 
 		//void run();

common/pdf_comic.h

@@ -0,0 +1,22 @@
+#ifndef PDF_COMIC_H
+#define PDF_COMIC_H
+
+#include <QObject>
+#include <QImage>
+
+class MacOSXPDFComic
+{
+public:
+    MacOSXPDFComic();
+    ~MacOSXPDFComic();
+    bool openComic(const QString & path);
+    void closeComic();
+    unsigned int numPages();
+    QImage getPage(const int page);
+    void releaseLastPageData();
+private:
+    void * document;
+    void * lastPageData;
+};
+
+#endif // PDF_COMIC_H

common/pdf_comic.mm

@@ -0,0 +1,117 @@
+#include "pdf_comic.h"
+
+#import <AppKit/AppKit.h>
+#import <Foundation/Foundation.h>
+#import <ApplicationServices/ApplicationServices.h>
+
+#include "QsLog.h"
+#include "QsLogDest.h"
+
+
+MacOSXPDFComic::MacOSXPDFComic()
+{
+
+}
+
+MacOSXPDFComic::~MacOSXPDFComic()
+{
+    CGPDFDocumentRelease((CGPDFDocumentRef)document);
+}
+
+bool MacOSXPDFComic::openComic(const QString &path)
+{
+
+    CFURLRef pdfFileUrl;
+    CFStringRef str;
+    str=CFStringCreateWithCString( kCFAllocatorDefault,path.toUtf8().data(),kCFStringEncodingUTF8);
+    pdfFileUrl=CFURLCreateWithFileSystemPath( kCFAllocatorDefault,str,kCFURLPOSIXPathStyle,true );
+
+    CGPDFDocumentRef pdf = CGPDFDocumentCreateWithURL((CFURLRef)pdfFileUrl);
+
+    document = pdf;
+
+    CFRelease(str);
+    CFRelease(pdfFileUrl);
+
+    return true;
+}
+
+void MacOSXPDFComic::closeComic()
+{
+    //CGPDFDocumentRelease((CGPDFDocumentRef)document);
+}
+
+unsigned int MacOSXPDFComic::numPages()
+{
+   return (int)CGPDFDocumentGetNumberOfPages((CGPDFDocumentRef)document);
+}
+
+QImage MacOSXPDFComic::getPage(const int pageNum)
+{
+    CGPDFPageRef page = CGPDFDocumentGetPage((CGPDFDocumentRef)document, pageNum+1);
+    // Changed this line for the line above which is a generic line
+    //CGPDFPageRef page = [self getPage:page_number];
+
+
+
+    CGRect pageRect = CGPDFPageGetBoxRect(page, kCGPDFMediaBox);
+    int width = 1200;
+
+    //NSLog(@"-----%f",pageRect.size.width);
+    CGFloat pdfScale = float(width)/pageRect.size.width;
+
+    pageRect.size = CGSizeMake(pageRect.size.width*pdfScale, pageRect.size.height*pdfScale);
+    pageRect.origin = CGPointZero;
+
+    CGColorSpaceRef genericColorSpace = CGColorSpaceCreateDeviceRGB();
+    CGContextRef bitmapContext = CGBitmapContextCreate(NULL,
+                                                       pageRect.size.width,
+                                                       pageRect.size.height,
+                                                       8, 0,
+                                                       genericColorSpace,
+                                                       kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Little
+                                                       );
+
+    CGContextSetInterpolationQuality(bitmapContext, kCGInterpolationHigh);
+    CGContextSetRenderingIntent(bitmapContext, kCGRenderingIntentDefault);
+    CGContextSetRGBFillColor( bitmapContext, 1.0, 1.0, 1.0, 1.0 );
+    CGContextFillRect( bitmapContext, CGContextGetClipBoundingBox( bitmapContext ));
+
+    //CGContextTranslateCTM( bitmapContext, 0, pageRect.size.height );
+    //CGContextScaleCTM( bitmapContext, 1.0, -1.0 );
+
+    CGContextConcatCTM(bitmapContext, CGAffineTransformMakeScale(pdfScale, pdfScale));
+
+
+    /*CGAffineTransform pdfXfm = CGPDFPageGetDrawingTransform( page, kCGPDFMediaBox, CGRectMake(pageRect.origin.x, pageRect.origin.y, pageRect.size.width, pageRect.size.height) , 0, true );
+    */
+    //CGContextConcatCTM( bitmapContext, pdfXfm );
+
+    CGContextDrawPDFPage(bitmapContext, page);
+
+    CGImageRef image = CGBitmapContextCreateImage(bitmapContext);
+
+    QImage qtImage;
+
+    CFDataRef dataRef = CGDataProviderCopyData(CGImageGetDataProvider(image));
+
+    lastPageData = (void *)dataRef;
+
+    const uchar *bytes = (const uchar *)CFDataGetBytePtr(dataRef);
+
+    qtImage = QImage(bytes, pageRect.size.width, pageRect.size.height, QImage::Format_ARGB32);
+
+    CGImageRelease(image);
+    //CFRelease(dataRef);
+    CGContextRelease(bitmapContext);
+    //CGPDFPageRelease(page);
+    CGColorSpaceRelease(genericColorSpace);
+
+    return qtImage;
+}
+
+void MacOSXPDFComic::releaseLastPageData()
+{
+    CFRelease((CFDataRef)lastPageData);
+}
+

common/yacreader_global.h

@@ -8,7 +8,7 @@
 #endif
 
 
-#define VERSION "7.0.1"
+#define VERSION "7.0.2"
 
 #define PATH "PATH"
 #define MAG_GLASS_SIZE "MAG_GLASS_SIZE"