Merge pull request #451 from cantabular/poppler-update-2026-03

Update Poppler 2026-03

Author: StevenMaude

src/DumpAsTextDev.h

@@ -53,7 +53,7 @@ class DumpAsTextDev : public OutputDev {
     return OutputDev::needClipToCropBox();
   }
 
-  void setDefaultCTM(const double *ctm) {
+  void setDefaultCTM(const std::array<double, 6> &ctm) {
     printf("setDefaultCTM\n");
     return OutputDev::setDefaultCTM(ctm);
   }
@@ -86,26 +86,11 @@ class DumpAsTextDev : public OutputDev {
     return OutputDev::dump();
   }
 
-  void cvtDevToUser(double dx, double dy, double *ux, double *uy) {
-    printf("cvtDevToUser\n");
-    return OutputDev::cvtDevToUser(dx, dy, ux, uy);
-  }
-
   void cvtUserToDev(double ux, double uy, int *dx, int *dy) {
     printf("cvtUserToDev\n");
     return OutputDev::cvtUserToDev(ux, uy, dx, dy);
   }
 
-  const double *getDefCTM() {
-    printf("getDefCTM\n");
-    return OutputDev::getDefCTM();
-  }
-
-  const double *getDefICTM() {
-    printf("getDefICTM\n");
-    return OutputDev::getDefICTM();
-  }
-
   void saveState(GfxState *A) {
     printf("saveState\n");
     return OutputDev::saveState(A);
@@ -451,13 +436,13 @@ class DumpAsTextDev : public OutputDev {
 
   void setSoftMaskFromImageMask(GfxState *state, Object *ref, Stream *str,
                                 int width, int height, bool invert,
-                                bool inlineImg, double *baseMatrix) {
+                                bool inlineImg, std::array<double, 6> &baseMatrix) {
     printf("setSoftMaskFromImageMask\n");
     return OutputDev::setSoftMaskFromImageMask(state, ref, str, width, height,
                                                invert, inlineImg, baseMatrix);
   }
 
-  void unsetSoftMaskFromImageMask(GfxState *state, double *baseMatrix) {
+  void unsetSoftMaskFromImageMask(GfxState *state, std::array<double, 6> &baseMatrix) {
     printf("unsetSoftMaskFromImageMask\n");
     return OutputDev::unsetSoftMaskFromImageMask(state, baseMatrix);
   }
@@ -512,12 +497,12 @@ class DumpAsTextDev : public OutputDev {
     return OutputDev::markPoint(name, properties);
   }
 
-  void opiBegin(GfxState *state, Dict *opiDict) {
+  void opiBegin(GfxState *state, const Dict &opiDict) {
     printf("opiBegin\n");
     return OutputDev::opiBegin(state, opiDict);
   }
 
-  void opiEnd(GfxState *state, Dict *opiDict) {
+  void opiEnd(GfxState *state, const Dict &opiDict) {
     printf("opiEnd\n");
     return OutputDev::opiEnd(state, opiDict);
   }

src/DumpPathsAsMsgPackDev.h

@@ -21,10 +21,10 @@ const int SET_FILL_COLOR = 15;
 typedef struct { double x, y; } Point;
 
 class Mat2x3 {
-  const double *m;
+  const std::array<double, 6> &m;
 
 public:
-  Mat2x3(const double m[6]) : m(m) {}
+  Mat2x3(const std::array<double, 6> &m) : m(m) {}
 
   inline const Point mul(const double x, const double y) const {
     auto xt = x * m[0] + y * m[2] + m[4];

src/main.cpp

@@ -140,17 +140,13 @@ static std::string fmt(const Object &o, const UnicodeMap *uMap) {
   auto s = o.getString();
 
   char buf[9];
-  Unicode *ucs4_out;
   std::vector<Unicode> ucs4 = TextStringToUCS4(s->toStr());
-  ucs4_out = (Unicode *)gmallocn(ucs4.size(), sizeof(Unicode));
-  memcpy(ucs4_out, ucs4.data(), ucs4.size() * sizeof(Unicode));
-  auto len = ucs4.size();
 
   std::string out;
-  out.reserve(static_cast<size_t>(len));
+  out.reserve(ucs4.size());
 
-  for (unsigned long int i = 0; i < len; i++) {
-    auto n = uMap->mapUnicode(ucs4_out[i], buf, sizeof(buf));
+  for (const auto &uChar : ucs4) {
+    auto n = uMap->mapUnicode(uChar, buf, sizeof(buf));
     out.append(buf, n);
   }
 
@@ -199,7 +195,7 @@ void dump_font_info(PDFDoc *doc) {
 void pack_stream_content(Stream *stream) {
   GooString content;
 
-  stream->reset();
+  stream->rewind();
   stream->fillGooString(&content);
   stream->close();
 
@@ -307,8 +303,6 @@ void dump_document_meta(const std::string filename, PDFDoc *doc,
   }
 }
 
-void TextPageDecRef(TextPage *text_page) { text_page->decRefCnt(); }
-
 void render_annotations(std::unique_ptr<Gfx> &gfx, Annots *annots) {
   gfx->saveState();
 
@@ -319,7 +313,7 @@ void render_annotations(std::unique_ptr<Gfx> &gfx, Annots *annots) {
   gfx->restoreState();
 }
 
-typedef std::unique_ptr<TextPage, decltype(&TextPageDecRef)> TextPagePtr;
+typedef std::unique_ptr<TextPage> TextPagePtr;
 
 TextPagePtr page_to_text_page(Page *page) {
   auto dev = std::make_unique<TextOutputDev>(nullptr, true, 0, false, false);
@@ -343,7 +337,7 @@ TextPagePtr page_to_text_page(Page *page) {
 
   dev->endPage();
 
-  return TextPagePtr(dev->takeText(), TextPageDecRef);
+  return dev->takeText();
 }
 
 int count_glyphs(const std::vector<std::vector<std::unique_ptr<TextWordSelection>>>& word_list) {
@@ -439,7 +433,7 @@ void dump_page_bitmap(Page *page) {
   // auto mode = splashModeRGB8;
   // const auto n_channels = 3;
 
-  auto dev = std::make_unique<SplashOutputDev>(mode, 4, false, paperColor,
+  auto dev = std::make_unique<SplashOutputDev>(mode, 4, paperColor,
                                                true, splashThinLineShape);
 
   dev->setFontAntialias(true);
@@ -502,14 +496,14 @@ void dump_document(PDFDoc *doc, const Options &options) {
   }
 }
 
-BaseStream *open_file(const std::string filename) {
+std::unique_ptr<BaseStream> open_file(const std::string filename) {
   std::unique_ptr<GooFile> file = GooFile::open(filename);
   if (file == NULL) {
     std::cerr << "Failed to open " << filename << std::endl;
     exit(5);
   }
-  Object obj;
-  return new FileStream(file.release(), 0, false, file->size(), Object::null());
+  auto size = file->size();
+  return std::make_unique<FileStream>(file.release(), 0, false, size, Object::null());
 }
 
 std::string parse_page_range(std::string value, Options *options) {
@@ -618,7 +612,7 @@ int main(int argc, char *argv[]) {
     exit(127);
   }
 
-  std::unique_ptr<PDFDoc> doc(new PDFDoc(file));
+  std::unique_ptr<PDFDoc> doc(new PDFDoc(std::move(file)));
   if (!doc) {
     std::cerr << "Problem loading document." << std::endl;
     exit(64);