diff options
author | Paul Gideon Dann | 2019-12-03 08:33:20 +0000 |
---|---|---|
committer | Paul Gideon Dann | 2019-12-03 08:33:20 +0000 |
commit | a64a52f7ebc11fdd7f5222fd480d6a9ad0189600 (patch) | |
tree | 0acaee14358661d65854f244d7c1e051dd300328 /0001-Cairo-backend-added-to-Qt5-wrapper.patch | |
parent | 41fec94378cf56e456a7d93090a7ef25f6b05d86 (diff) | |
download | aur-a64a52f7ebc11fdd7f5222fd480d6a9ad0189600.tar.gz |
Update for Poppler 0.82.0
Diffstat (limited to '0001-Cairo-backend-added-to-Qt5-wrapper.patch')
-rw-r--r-- | 0001-Cairo-backend-added-to-Qt5-wrapper.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/0001-Cairo-backend-added-to-Qt5-wrapper.patch b/0001-Cairo-backend-added-to-Qt5-wrapper.patch index 2ebecbd80732..9634d3f2ce5a 100644 --- a/0001-Cairo-backend-added-to-Qt5-wrapper.patch +++ b/0001-Cairo-backend-added-to-Qt5-wrapper.patch @@ -1,4 +1,4 @@ -From ca21442edf7ec79c8662f6cfadc2fb8b882a9092 Mon Sep 17 00:00:00 2001 +From 3a7e0da0618def03a1913ceb0b1f4543f2ea32ef Mon Sep 17 00:00:00 2001 From: Paul Gideon Dann <pdgiddie@gmail.com> Date: Wed, 4 Apr 2018 16:36:56 +0100 Subject: [PATCH 1/4] Cairo backend added to Qt5 wrapper @@ -52,7 +52,7 @@ index ca1f2478..af19e065 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 81db4eaf..635e44f9 100644 +index ba9b86cd..d4336d3f 100644 --- a/qt5/src/poppler-document.cc +++ b/qt5/src/poppler-document.cc @@ -695,6 +695,9 @@ namespace Poppler { @@ -66,7 +66,7 @@ index 81db4eaf..635e44f9 100644 } diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc -index c4d00a6b..92aa0e8a 100644 +index 69006754..8b31ec60 100644 --- a/qt5/src/poppler-page.cc +++ b/qt5/src/poppler-page.cc @@ -48,6 +48,7 @@ @@ -87,7 +87,7 @@ index c4d00a6b..92aa0e8a 100644 #include "poppler-private.h" #include "poppler-page-transition-private.h" -@@ -622,6 +626,70 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w, +@@ -616,6 +620,70 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w, img = tmpimg; break; } @@ -158,7 +158,7 @@ index c4d00a6b..92aa0e8a 100644 } if (shouldAbortRenderCallback && shouldAbortRenderCallback(payload)) -@@ -644,6 +712,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i +@@ -638,6 +706,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); } @@ -168,7 +168,7 @@ index c4d00a6b..92aa0e8a 100644 return false; } diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h -index 847671ea..117efa1e 100644 +index 1460690f..96f1b986 100644 --- a/qt5/src/poppler-qt5.h +++ b/qt5/src/poppler-qt5.h @@ -1151,7 +1151,8 @@ delete it; @@ -198,5 +198,5 @@ index 5abcbc45..99c12b9f 100644 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Gui_EXECUTABLE_COMPILE_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS}") -- -2.23.0 +2.24.0 |