diff options
Diffstat (limited to '0001-Cairo-backend-added-to-Qt5-wrapper.patch')
| -rw-r--r-- | 0001-Cairo-backend-added-to-Qt5-wrapper.patch | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/0001-Cairo-backend-added-to-Qt5-wrapper.patch b/0001-Cairo-backend-added-to-Qt5-wrapper.patch index 482c3cfef632..1194675fb8f3 100644 --- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch +++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch @@ -1,6 +1,6 @@ -From b338ffeaa1cd104dd6c64d2361c3deb981efd0de Mon Sep 17 00:00:00 2001 +From ea2772f97e30f139b65039c0f08cecf5f285a922 Mon Sep 17 00:00:00 2001 From: Kevin Slagle <kjslag@gmail.com> -Date: Sat, 31 Mar 2018 14:13:25 -0400 +Date: Sat, 31 Mar 2018 18:27:25 -0400 Subject: [PATCH 1/3] Cairo backend added to Qt5 wrapper --- @@ -12,7 +12,7 @@ Subject: [PATCH 1/3] Cairo backend added to Qt5 wrapper 5 files changed, 95 insertions(+), 1 deletion(-) diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt -index 7993c33b..80a3c054 100644 +index 5ae42f52..04e3fcdf 100644 --- a/qt5/src/CMakeLists.txt +++ b/qt5/src/CMakeLists.txt @@ -7,6 +7,11 @@ include_directories( @@ -38,8 +38,8 @@ index 7993c33b..80a3c054 100644 + ${CMAKE_SOURCE_DIR}/poppler/CairoFontEngine.cc + ) +endif(HAVE_CAIRO) - add_library(poppler-qt5 SHARED ${poppler_qt5_SRCS}) - set_target_properties(poppler-qt5 PROPERTIES VERSION 1.11.0 SOVERSION 1) + add_library(poppler-qt5 ${poppler_qt5_SRCS}) + set_target_properties(poppler-qt5 PROPERTIES VERSION 1.13.0 SOVERSION 1) if(MINGW) @@ -36,6 +48,9 @@ if(MINGW) set_target_properties(poppler-qt5 PROPERTIES SUFFIX "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") @@ -52,10 +52,10 @@ index 7993c33b..80a3c054 100644 target_link_libraries(poppler-qt5 poppler ${poppler_LIBS}) endif() diff --git a/qt5/src/poppler-document.cc b/qt5/src/poppler-document.cc -index 03077f99..8f67ad80 100644 +index 0eeb923f..e1b7a71c 100644 --- a/qt5/src/poppler-document.cc +++ b/qt5/src/poppler-document.cc -@@ -675,6 +675,9 @@ namespace Poppler { +@@ -672,6 +672,9 @@ namespace Poppler { ret << Document::SplashBackend; #endif ret << Document::ArthurBackend; @@ -66,10 +66,10 @@ index 03077f99..8f67ad80 100644 } diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc -index 9dcdaad9..2706e83a 100644 +index 381a608b..21e96fe2 100644 --- a/qt5/src/poppler-page.cc +++ b/qt5/src/poppler-page.cc -@@ -44,6 +44,7 @@ +@@ -45,6 +45,7 @@ #include <QtGui/QPainter> #include <config.h> @@ -77,7 +77,7 @@ index 9dcdaad9..2706e83a 100644 #include <PDFDoc.h> #include <Catalog.h> #include <Form.h> -@@ -57,6 +58,9 @@ +@@ -58,6 +59,9 @@ #include <SplashOutputDev.h> #include <splash/SplashBitmap.h> #endif @@ -87,7 +87,7 @@ index 9dcdaad9..2706e83a 100644 #include "poppler-private.h" #include "poppler-page-transition-private.h" -@@ -440,6 +444,70 @@ QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h, +@@ -596,6 +600,70 @@ QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h, img = tmpimg; break; } @@ -157,10 +157,10 @@ index 9dcdaad9..2706e83a 100644 + } } - return img; -@@ -499,6 +567,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i - painter->restore(); - return true; + if (shouldAbortRenderCallback && shouldAbortRenderCallback(payload)) +@@ -618,6 +686,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i + QImageDumpingArthurOutputDev arthur_output(painter, nullptr); + return renderToArthur(&arthur_output, painter, m_page, xres, yres, x, y, w, h, rotate, flags); } + case Poppler::Document::CairoBackend: + return false; @@ -168,10 +168,10 @@ index 9dcdaad9..2706e83a 100644 return false; } diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h -index fcfe2d31..1da12e9b 100644 +index 3adbf02f..5422482a 100644 --- a/qt5/src/poppler-qt5.h +++ b/qt5/src/poppler-qt5.h -@@ -878,7 +878,8 @@ delete it; +@@ -1054,7 +1054,8 @@ delete it; */ enum RenderBackend { SplashBackend, ///< Splash backend @@ -182,7 +182,7 @@ index fcfe2d31..1da12e9b 100644 /** diff --git a/qt5/tests/CMakeLists.txt b/qt5/tests/CMakeLists.txt -index 01a1a970..d6d241c6 100644 +index 1e67e6ec..9131568d 100644 --- a/qt5/tests/CMakeLists.txt +++ b/qt5/tests/CMakeLists.txt @@ -11,6 +11,11 @@ include_directories( |