From b7254b3501a898c892211e6b363a292ba01dec08 Mon Sep 17 00:00:00 2001 From: Thomas Holder Date: Sat, 10 Jan 2026 23:44:10 +0100 Subject: [PATCH 1/3] Fix build with poppler 26.01.0 (cherry picked from commit 3a528728ebe33e10bb44d152f47cfedfddbfe18a) --- src/extension/internal/pdfinput/pdf-input.cpp | 1 + src/extension/internal/pdfinput/svg-builder.cpp | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp index 7b5e0ecb1d..45df931f00 100644 --- a/src/extension/internal/pdfinput/pdf-input.cpp +++ b/src/extension/internal/pdfinput/pdf-input.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #endif #include diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp index 6c78247dfb..8b2e6f3d54 100644 --- a/src/extension/internal/pdfinput/svg-builder.cpp +++ b/src/extension/internal/pdfinput/svg-builder.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #include "color.h" #include "color/cms-util.h" @@ -2093,7 +2094,11 @@ Inkscape::XML::Node *SvgBuilder::_createImage(Stream *str, int width, int height } else { image_stream = new ImageStream(str, width, 1, 1); } +#if POPPLER_CHECK_VERSION(26, 0, 0) + image_stream->rewind(); +#else image_stream->reset(); +#endif // Convert grayscale values unsigned char *buffer = new unsigned char[width]; @@ -2119,7 +2124,11 @@ Inkscape::XML::Node *SvgBuilder::_createImage(Stream *str, int width, int height image_stream = new ImageStream(str, width, color_map->getNumPixelComps(), color_map->getBits()); +#if POPPLER_CHECK_VERSION(26, 0, 0) + image_stream->rewind(); +#else image_stream->reset(); +#endif // Convert RGB values unsigned int *buffer = new unsigned int[width]; -- 2.53.0