splash/Splash.cc | 1 + splash/SplashBitmap.cc | 1 + splash/SplashBitmap.h | 6 ++++-- splash/SplashXPathScanner.cc | 3 ++- utils/pdftoppm.cc | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-)
New commits: commit a296982e1d5b4968b2bd044d80647ae6f9267526 Author: Albert Astals Cid <[email protected]> Date: Sun Oct 30 09:52:57 2022 +0100 Do not include a poppler/ file from a splash/ header In general we should not include them at all, neither from the .cc files, but at least keeping the .h clean is a step diff --git a/splash/Splash.cc b/splash/Splash.cc index aa5aaa38..05f000d9 100644 --- a/splash/Splash.cc +++ b/splash/Splash.cc @@ -40,6 +40,7 @@ #include <cmath> #include "goo/gmem.h" #include "goo/GooLikely.h" +#include "poppler/GfxState.h" #include "poppler/Error.h" #include "SplashErrorCodes.h" #include "SplashMath.h" diff --git a/splash/SplashBitmap.cc b/splash/SplashBitmap.cc index 9656bb1a..af4a6223 100644 --- a/splash/SplashBitmap.cc +++ b/splash/SplashBitmap.cc @@ -43,6 +43,7 @@ #include "SplashErrorCodes.h" #include "SplashBitmap.h" #include "poppler/Error.h" +#include "poppler/GfxState.h" #include "goo/JpegWriter.h" #include "goo/PNGWriter.h" #include "goo/TiffWriter.h" diff --git a/splash/SplashBitmap.h b/splash/SplashBitmap.h index c80a66d7..2d7cf413 100644 --- a/splash/SplashBitmap.h +++ b/splash/SplashBitmap.h @@ -34,11 +34,13 @@ #define SPLASHBITMAP_H #include "SplashTypes.h" -#include "poppler/GfxState.h" #include "poppler_private_export.h" #include <cstdio> +#include <string> +#include <vector> class ImgWriter; +class GfxSeparationColorSpace; //------------------------------------------------------------------------ // SplashBitmap @@ -80,7 +82,7 @@ public: { int jpegQuality = -1; bool jpegProgressive = false; - GooString tiffCompression; + std::string tiffCompression; bool jpegOptimize = false; }; diff --git a/splash/SplashXPathScanner.cc b/splash/SplashXPathScanner.cc index 232ca7b7..cc5f8501 100644 --- a/splash/SplashXPathScanner.cc +++ b/splash/SplashXPathScanner.cc @@ -11,7 +11,7 @@ // All changes made under the Poppler project to this file are licensed // under GPL version 2 or later // -// Copyright (C) 2008, 2010, 2014, 2018, 2019, 2021 Albert Astals Cid <[email protected]> +// Copyright (C) 2008, 2010, 2014, 2018, 2019, 2021, 2022 Albert Astals Cid <[email protected]> // Copyright (C) 2010 Paweł Wiejacha <[email protected]> // Copyright (C) 2013, 2014, 2021 Thomas Freitag <[email protected]> // Copyright (C) 2018 Stefan Brüns <[email protected]> @@ -27,6 +27,7 @@ #include <cstring> #include <algorithm> #include "goo/gmem.h" +#include "goo/GooLikely.h" #include "SplashMath.h" #include "SplashXPath.h" #include "SplashBitmap.h" diff --git a/utils/pdftoppm.cc b/utils/pdftoppm.cc index b0f0120c..e95d9b37 100644 --- a/utils/pdftoppm.cc +++ b/utils/pdftoppm.cc @@ -298,7 +298,7 @@ static void savePageSlice(PDFDoc *doc, SplashOutputDev *splashOut, int pg, int x params.jpegQuality = jpegQuality; params.jpegProgressive = jpegProgressive; params.jpegOptimize = jpegOptimize; - params.tiffCompression.Set(TiffCompressionStr); + params.tiffCompression = TiffCompressionStr; if (ppmFile != nullptr) { SplashError e;
