config.h.cmake | 3 --- cpp/poppler-page-renderer.cpp | 2 ++ poppler/poppler-config.h.cmake | 6 ++++++ qt5/src/poppler-document.cc | 1 + qt5/src/poppler-page.cc | 1 + qt5/src/poppler-private.h | 1 + qt6/src/poppler-document.cc | 1 + qt6/src/poppler-page.cc | 1 + qt6/src/poppler-private.h | 1 + 9 files changed, 14 insertions(+), 3 deletions(-)
New commits: commit 57f9f7f1f9e2351b630e15f2667c44348ecb2476 Author: Albert Astals Cid <[email protected]> Date: Tue Dec 1 22:46:33 2020 +0100 Move HAVE_SPLASH to poppler-config.h Now that HAVE_SPLASH is used in the the "public unsupported" internal headers diff --git a/config.h.cmake b/config.h.cmake index 5b25f778..2eaeb13f 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -91,9 +91,6 @@ /* Define to 1 if you have the `popen' function. */ #cmakedefine HAVE_POPEN 1 -/* Use splash for rendering. */ -#cmakedefine HAVE_SPLASH 1 - /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. */ #cmakedefine HAVE_SYS_DIR_H 1 diff --git a/cpp/poppler-page-renderer.cpp b/cpp/poppler-page-renderer.cpp index b43e7f9b..0ef41f8b 100644 --- a/cpp/poppler-page-renderer.cpp +++ b/cpp/poppler-page-renderer.cpp @@ -3,6 +3,7 @@ * Copyright (C) 2015 William Bader <[email protected]> * Copyright (C) 2018, Zsombor Hollay-Horvath <[email protected]> * Copyright (C) 2019, Julián Unrrein <[email protected]> + * Copyright (C) 2020, Albert Astals Cid <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,6 +30,7 @@ #include "poppler-image.h" #include <config.h> +#include <poppler-config.h> #include "PDFDoc.h" #if defined(HAVE_SPLASH) diff --git a/poppler/poppler-config.h.cmake b/poppler/poppler-config.h.cmake index 4e6cc522..f90b43e3 100644 --- a/poppler/poppler-config.h.cmake +++ b/poppler/poppler-config.h.cmake @@ -19,6 +19,7 @@ // Copyright (C) 2017 Adrian Johnson <[email protected]> // Copyright (C) 2018 Adam Reichold <[email protected]> // Copyright (C) 2018 Stefan Brüns <[email protected]> +// Copyright (C) 2020 Albert Astals Cid <[email protected]> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -116,6 +117,11 @@ #cmakedefine USE_BOOST_HEADERS 1 #endif +/* Is splash backend available */ +#ifndef HAVE_SPLASH +#cmakedefine HAVE_SPLASH 1 +#endif + //------------------------------------------------------------------------ // version //------------------------------------------------------------------------ diff --git a/qt5/src/poppler-document.cc b/qt5/src/poppler-document.cc index 8c449d1e..87aee4cf 100644 --- a/qt5/src/poppler-document.cc +++ b/qt5/src/poppler-document.cc @@ -35,6 +35,7 @@ #include "poppler-qt5.h" #include <config.h> +#include <poppler-config.h> #include <ErrorCodes.h> #include <GlobalParams.h> #include <Outline.h> diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc index 03aebab5..31c60698 100644 --- a/qt5/src/poppler-page.cc +++ b/qt5/src/poppler-page.cc @@ -50,6 +50,7 @@ #include <QtGui/QPainter> #include <config.h> +#include <poppler-config.h> #include <PDFDoc.h> #include <Catalog.h> #include <Form.h> diff --git a/qt5/src/poppler-private.h b/qt5/src/poppler-private.h index 97bd700c..3d503321 100644 --- a/qt5/src/poppler-private.h +++ b/qt5/src/poppler-private.h @@ -46,6 +46,7 @@ #include <QtCore/QVector> #include <config.h> +#include <poppler-config.h> #include <GfxState.h> #include <GlobalParams.h> #include <Form.h> diff --git a/qt6/src/poppler-document.cc b/qt6/src/poppler-document.cc index 4af90f07..65077e6f 100644 --- a/qt6/src/poppler-document.cc +++ b/qt6/src/poppler-document.cc @@ -35,6 +35,7 @@ #include "poppler-qt6.h" #include <config.h> +#include <poppler-config.h> #include <ErrorCodes.h> #include <GlobalParams.h> #include <Outline.h> diff --git a/qt6/src/poppler-page.cc b/qt6/src/poppler-page.cc index f138f520..248b48d5 100644 --- a/qt6/src/poppler-page.cc +++ b/qt6/src/poppler-page.cc @@ -50,6 +50,7 @@ #include <QtGui/QPainter> #include <config.h> +#include <poppler-config.h> #include <PDFDoc.h> #include <Catalog.h> #include <Form.h> diff --git a/qt6/src/poppler-private.h b/qt6/src/poppler-private.h index 11c8c1a9..e1cff9c6 100644 --- a/qt6/src/poppler-private.h +++ b/qt6/src/poppler-private.h @@ -46,6 +46,7 @@ #include <QtCore/QVector> #include <config.h> +#include <poppler-config.h> #include <GfxState.h> #include <GlobalParams.h> #include <Form.h> _______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
