merged develop

This commit is contained in:
Luis Ángel San Martín
2016-06-16 19:23:36 +02:00
8 changed files with 80 additions and 52 deletions

View File

@ -97,6 +97,15 @@ QImage MacOSXPDFComic::getPage(const int pageNum)
lastPageData = (void *)dataRef;
if(!lastPageData)
{
QLOG_ERROR() << "Unable to extract image from PDF file using CGPDFDocument";
CGImageRelease(image);
CGContextRelease(bitmapContext);
CGColorSpaceRelease(genericColorSpace);
return QImage();
}
const uchar *bytes = (const uchar *)CFDataGetBytePtr(dataRef);
qtImage = QImage(bytes, pageRect.size.width, pageRect.size.height, QImage::Format_ARGB32);

View File

@ -7,7 +7,7 @@
#include <QDesktopServices>
#endif
#define VERSION "8.5.0"
#define VERSION "8.6.0"
#define USE_BACKGROUND_IMAGE_IN_GRID_VIEW "USE_BACKGROUND_IMAGE_IN_GRID_VIEW"
#define OPACITY_BACKGROUND_IMAGE_IN_GRID_VIEW "OPACITY_BACKGROUND_IMAGE_IN_GRID_VIEW"