From b5a6897e362a817f42823d8a0315d4feff5a1283 Mon Sep 17 00:00:00 2001 From: Steven Maude Date: Mon, 13 Jul 2026 13:46:55 +0100 Subject: [PATCH 1/6] Update to patched poppler 26.07.0 --- vendor/github.com/cantabular/poppler | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/github.com/cantabular/poppler b/vendor/github.com/cantabular/poppler index 4c00df0..d72e212 160000 --- a/vendor/github.com/cantabular/poppler +++ b/vendor/github.com/cantabular/poppler @@ -1 +1 @@ -Subproject commit 4c00df0b382b17b5d9a6562c524eb3e5d27b46e9 +Subproject commit d72e21264a928d7b5af185b594ea836b4bb2e5eb From 2497e35d6cfa2f6488ab9875429252575b6845a3 Mon Sep 17 00:00:00 2001 From: Steven Maude Date: Mon, 13 Jul 2026 14:54:52 +0100 Subject: [PATCH 2/6] Update `setSoftMaskFromImageMask` type See poppler commit: ecc27d8d1be2a59a8f437c4f3b5adbd9e11951d5 --- src/DumpAsTextDev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DumpAsTextDev.h b/src/DumpAsTextDev.h index 5c585b4..5d418ff 100644 --- a/src/DumpAsTextDev.h +++ b/src/DumpAsTextDev.h @@ -434,7 +434,7 @@ class DumpAsTextDev : public OutputDev { interpolate, inlineImg); } - void setSoftMaskFromImageMask(GfxState *state, Object *ref, Stream *str, + bool setSoftMaskFromImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool inlineImg, std::array &baseMatrix) { printf("setSoftMaskFromImageMask\n"); From 15bf6ea86cc63bd3c2fa9e764dd0847f091402b9 Mon Sep 17 00:00:00 2001 From: Steven Maude Date: Mon, 13 Jul 2026 14:58:00 +0100 Subject: [PATCH 3/6] Update `setSoftMask` signature See poppler commit: 0f94f530852bfe236340ace874d100e21a60aa66 --- src/DumpAsTextDev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DumpAsTextDev.h b/src/DumpAsTextDev.h index 5d418ff..4f79642 100644 --- a/src/DumpAsTextDev.h +++ b/src/DumpAsTextDev.h @@ -549,7 +549,7 @@ class DumpAsTextDev : public OutputDev { return OutputDev::paintTransparencyGroup(A, B); } - void setSoftMask(GfxState *A, const std::array &B, bool C, Function *D, GfxColor *E) { + void setSoftMask(GfxState *A, const std::array &B, bool C, Function *D, const GfxColor &E) { printf("setSoftMask\n"); return OutputDev::setSoftMask(A, B, C, D, E); } From 5793a16681fd5faf6d015cdfe5301b80d1d460f7 Mon Sep 17 00:00:00 2001 From: Steven Maude Date: Mon, 13 Jul 2026 14:56:01 +0100 Subject: [PATCH 4/6] Update `markPoint` and `beginMarkedContent` Update the signatures. See poppler commit: 98f0be58d4fed974f83fa886979aae9ef6a9808b --- src/DumpAsTextDev.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/DumpAsTextDev.h b/src/DumpAsTextDev.h index 4f79642..b72a28c 100644 --- a/src/DumpAsTextDev.h +++ b/src/DumpAsTextDev.h @@ -482,17 +482,17 @@ class DumpAsTextDev : public OutputDev { return OutputDev::endMarkedContent(state); } - void beginMarkedContent(const char *name, Dict *properties) { + void beginMarkedContent(const std::string &name, Dict *properties) { printf("beginMarkedContent\n"); return OutputDev::beginMarkedContent(name, properties); } - void markPoint(const char *name) { + void markPoint(const std::string &name) { printf("markPoint\n"); return OutputDev::markPoint(name); } - void markPoint(const char *name, Dict *properties) { + void markPoint(const std::string &name, Dict *properties) { printf("markPoint\n"); return OutputDev::markPoint(name, properties); } From 5233392175e10bbd27f57522ac4471225c299336 Mon Sep 17 00:00:00 2001 From: Steven Maude Date: Mon, 13 Jul 2026 15:01:40 +0100 Subject: [PATCH 5/6] Switch pointer to reference in `getSelectionWords` See poppler commit: d50a4510de484373f3b3c21e3f32861664fb59d7 --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 0d81c80..31bb0a1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -397,7 +397,7 @@ void dump_page_glyphs(Page *page) { PDFRectangle whole_page(-inf, -inf, inf, inf); - auto word_list = text->getSelectionWords(&whole_page, selectionStyleGlyph); + auto word_list = text->getSelectionWords(whole_page, selectionStyleGlyph); int total_glyphs = count_glyphs(word_list); From f660fa1320e8b652c83a8326b8954386bf077c12 Mon Sep 17 00:00:00 2001 From: Steven Maude Date: Mon, 13 Jul 2026 14:59:30 +0100 Subject: [PATCH 6/6] Include `Annot.h` See poppler commit: e1a4f1cfb8e4ac9ebd6bbde605ccfcc25d88e40a --- src/main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main.cpp b/src/main.cpp index 31bb0a1..ebabd31 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include