From a7ca2281c8b85a842e5a9677dded792135ad121f Mon Sep 17 00:00:00 2001 From: Paul Gideon Dann Date: Wed, 4 Apr 2018 16:36:56 +0100 Subject: [PATCH 1/3] Cairo backend added to Qt5 wrapper --- qt5/src/CMakeLists.txt | 15 ++++++++ qt5/src/poppler-document.cc | 3 ++ qt5/src/poppler-page.cc | 70 +++++++++++++++++++++++++++++++++++++ qt5/src/poppler-qt5.h | 3 +- qt5/tests/CMakeLists.txt | 5 +++ 5 files changed, 95 insertions(+), 1 deletion(-) diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt index 0247fa3f..f52e4a3b 100644 --- a/qt5/src/CMakeLists.txt +++ b/qt5/src/CMakeLists.txt @@ -8,6 +8,11 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) +if (HAVE_CAIRO) + include_directories(${CAIRO_INCLUDE_DIRS}) + add_definitions(${CAIRO_CFLAGS}) +endif (HAVE_CAIRO) + set(CMAKE_C_VISIBILITY_PRESET hidden) set(CMAKE_CXX_VISIBILITY_PRESET hidden) set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) @@ -39,6 +44,13 @@ set(poppler_qt5_SRCS ArthurOutputDev.cc poppler-version.cpp ) +if (HAVE_CAIRO) + set(poppler_qt5_SRCS ${poppler_qt5_SRCS} + ${CMAKE_SOURCE_DIR}/poppler/CairoOutputDev.cc + ${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc + ${CMAKE_SOURCE_DIR}/poppler/CairoFontEngine.cc + ) +endif(HAVE_CAIRO) add_library(poppler-qt5 ${poppler_qt5_SRCS}) set_target_properties(poppler-qt5 PROPERTIES VERSION 1.25.0 SOVERSION 1) if(MINGW AND BUILD_SHARED_LIBS) @@ -46,6 +58,9 @@ if(MINGW AND BUILD_SHARED_LIBS) set_target_properties(poppler-qt5 PROPERTIES SUFFIX "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") endif() target_link_libraries(poppler-qt5 poppler ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Xml_LIBRARIES} ${FREETYPE_LIBRARIES}) +if (HAVE_CAIRO) + target_link_libraries(poppler-qt5 ${CAIRO_LIBRARIES}) +endif (HAVE_CAIRO) if(MSVC) target_link_libraries(poppler-qt5 poppler ${poppler_LIBS}) endif() diff --git a/qt5/src/poppler-document.cc b/qt5/src/poppler-document.cc index 6828da4d..37b11229 100644 --- a/qt5/src/poppler-document.cc +++ b/qt5/src/poppler-document.cc @@ -692,6 +692,9 @@ QSet Document::availableRenderBackends() ret << Document::SplashBackend; #endif ret << Document::ArthurBackend; +#if defined(HAVE_CAIRO) + ret << Document::CairoBackend; +#endif return ret; } diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc index af7e4a11..992e6f00 100644 --- a/qt5/src/poppler-page.cc +++ b/qt5/src/poppler-page.cc @@ -50,6 +50,7 @@ #include #include +#include #include #include #include @@ -63,6 +64,9 @@ # include # include #endif +#if defined(HAVE_CAIRO) +#include +#endif #include "poppler-private.h" #include "poppler-page-transition-private.h" @@ -556,6 +560,69 @@ QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w, img = tmpimg; break; } + case Poppler::Document::CairoBackend: { +#if defined(HAVE_CAIRO) + CairoOutputDev *output_dev = new CairoOutputDev(); + output_dev->startDoc(m_page->parentDoc->doc); + int buffer_width, buffer_height, rotate; + cairo_surface_t *surface; + cairo_t *cairo; + + // If w or h are -1, that indicates the whole page, so we need to + // calculate how many pixels that corresponds to. Otherwise, we can use w + // or h directly for our buffer size. + const QSize pageSize = this->pageSize(); + if (w == -1) { + const double xscale = xres / 72.0; + const double width = pageSize.width();; + buffer_width = (int) ceil(width * xscale); + } else { + buffer_width = w; + } + if (h == -1) { + const double yscale = yres / 72.0; + const double height = pageSize.height(); + buffer_height = (int) ceil(height * yscale); + } else { + buffer_height = h; + } + + rotate = rotation + m_page->page->getRotate(); + + // FIXME: Okular never provides a rotation value, so I don't have any way + // of testing this right now. The result is that subpixels are ordered + // incorrectly when the page is rotated. + + //if (rotate == 90 || rotate == 270) { + // const double temp = height; + // height = width; + // width = temp; + //} + + img = QImage(buffer_width, buffer_height, QImage::Format_ARGB32); + img.fill(Qt::white); // Never transparent + + surface = cairo_image_surface_create_for_data( + img.bits(), + CAIRO_FORMAT_ARGB32, + buffer_width, buffer_height, + img.bytesPerLine()); + + cairo = cairo_create(surface); + output_dev->setCairo(cairo); + + m_page->parentDoc->doc->displayPageSlice( + output_dev, m_page->index + 1, xres, yres, rotation, false, true, + false, xPos, yPos, w, h); + + // Clean up + output_dev->setCairo(nullptr); + cairo_destroy(cairo); + cairo_surface_destroy(surface); + delete output_dev; +#endif + break; + } } if (shouldAbortRenderCallback && shouldAbortRenderCallback(payload)) @@ -579,6 +646,9 @@ bool Page::renderToPainter(QPainter *painter, double xres, double yres, int x, i return renderToArthur(&arthur_output, painter, m_page, xres, yres, x, y, w, h, rotate, flags); } + case Poppler::Document::CairoBackend: { + return false; + } } return false; } diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h index 5e78c9e5..386b5562 100644 --- a/qt5/src/poppler-qt5.h +++ b/qt5/src/poppler-qt5.h @@ -1166,7 +1166,8 @@ public: enum RenderBackend { SplashBackend, ///< Splash backend - ArthurBackend ///< Arthur (Qt) backend + ArthurBackend, ///< Arthur (Qt) backend + CairoBackend ///< Cairo backend }; /** diff --git a/qt5/tests/CMakeLists.txt b/qt5/tests/CMakeLists.txt index b01d0835..561cb5dd 100644 --- a/qt5/tests/CMakeLists.txt +++ b/qt5/tests/CMakeLists.txt @@ -11,6 +11,11 @@ include_directories( ${Qt5Widgets_INCLUDE_DIRS} ) +if (HAVE_CAIRO) + include_directories(${CAIRO_INCLUDE_DIRS}) + add_definitions(${CAIRO_CFLAGS}) +endif (HAVE_CAIRO) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Gui_EXECUTABLE_COMPILE_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS}") -- 2.28.0