bump pdf2htmlex

.github/workflows/build_test.yml

@@ -63,7 +63,7 @@ jobs:
             conan-${{ matrix.host_profile }}-
 
       - name: export conan-odr-index
-        run: python conan-odr-index/scripts/conan_export_all_packages.py
+        run: python conan-odr-index/scripts/conan_export_all_packages.py --selection-config conan-odr-index/defaults.yaml
       - name: conan config
         run: conan config install .github/config/conan
 
@@ -78,7 +78,6 @@ jobs:
       - name: conan install
         run: >
           conan install .
-          --lockfile conan.lock
           --profile:host '${{ matrix.host_profile }}'
           --profile:build '${{ matrix.build_profile }}'
           --build missing

.github/workflows/publish.yml

@@ -55,7 +55,7 @@ jobs:
             conan-${{ matrix.host_profile }}-
 
       - name: export conan-odr-index
-        run: python conan-odr-index/scripts/conan_export_all_packages.py
+        run: python conan-odr-index/scripts/conan_export_all_packages.py --selection-config conan-odr-index/defaults.yaml
       - name: conan config
         run: conan config install .github/config/conan
 

.github/workflows/tidy.yml

@@ -56,7 +56,7 @@ jobs:
             conan-${{ matrix.host_profile }}-
 
       - name: export conan-odr-index
-        run: python conan-odr-index/scripts/conan_export_all_packages.py
+        run: python conan-odr-index/scripts/conan_export_all_packages.py --selection-config conan-odr-index/defaults.yaml
       - name: conan config
         run: conan config install .github/config/conan
 

conan.lock

@@ -4,22 +4,19 @@
         "zstd/1.5.7#b68ca8e3de04ba5957761751d1d661f4%1760955092.069",
         "zlib/1.3.1#cac0f6daea041b0ccf42934163defb20%1765284699.337",
         "xz_utils/5.8.2#79a8ec4932f0b3bad1293f78d5b90447%1773450120.286",
-        "wvware/1.2.9-odr#2d8e0b63ad3ece786e8e70cb5c550f5f%1766352522.558",
+        "wvware/1.2.9-odr#ecdcc87eeee4ba3171fc52b885ffcd37%1780344294.0196831",
         "vincentlaucsb-csv-parser/2.3.0#ac67e368e82c9e3da4a663c35e3a1b2f%1718528275.177",
         "util-linux-libuuid/2.41.2#ee8e33ba15c17c0140643e0bd93c0b6f%1765881086.29",
         "utfcpp/4.0.9#b5eb56fe6b829b6f3eb8da167c4f41b2%1773905531.586",
-        "utfcpp/4.0.4#199ad4051968b14d27cb937173bcf42a%1773905534.969",
         "uchardet/0.0.8#6ab25e452021fcdb560f4e37f4a27bc1%1759735438.978",
         "pugixml/1.15#979e88f4fafbfe3585d2c0510a071cc7%1739435725.483",
-        "pugixml/1.14#c6afdcf73d71858303d8260b0d76ff91%1696206310.014",
-        "poppler-data/0.4.12-odr#06cdb12e4cab52261a5eb6c7d7dad273%1764497608.501",
-        "poppler/24.08.0-odr#5150a6889acc1c8c9176d857c12fa3c8%1766352521.627",
+        "poppler-data/0.4.12-odr#06cdb12e4cab52261a5eb6c7d7dad273%1780344293.8660889",
+        "poppler/26.05.0-odr#1bea719ddff7adcea402ab5cc230cddb%1780344293.709663",
         "pixman/0.46.2#88b157b4faa6474a6028c2ba2a987924%1752742515.414",
-        "pdf2htmlex/0.18.8.rc1-odr-git-eb5d291#fadb1d15d841bf6c75e3bc76bde81777%1766352519.27",
+        "pdf2htmlex/0.18.8.rc1-odr-git-e685b24#8331b79845ed2db803e7eea4937a8cd5%1780344293.242528",
         "pcre2/10.42#9a35f5089feb875ec61a38eca364ce77%1743524593.693",
         "openjpeg/2.5.4#372fbc2b4348d45ab0c0a62a8475dc2f%1760446899.685",
         "nlohmann_json/3.12.0#2d634ab0ec8d9f56353e5ccef6d6612c%1744735883.94",
-        "nlohmann_json/3.11.3#45828be26eb619a2e04ca517bb7b828d%1701220705.259",
         "miniz/3.0.2#bfbce07c6654293cce27ee24129d2df7%1743673472.805",
         "lzo/2.10#f00b10acc508cea70645727d970a23e1%1759909644.842",
         "libxml2/2.12.7#1c4d20b7ab8b618ce699733723ba4df6%1721306327.767",
@@ -28,25 +25,25 @@
         "libmagic/5.45#791d5bad38d33272bb120994a198b1ac%1727273086.09",
         "libjpeg/9f#8edfe2699565c80c825d0256002504ff%1723665907.087",
         "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1751451666.321",
-        "libgsf/1.14.52#7b7b45fff714f0441d8837e7b14b8b9a%1766352516.733",
+        "libgsf/1.14.52#5dbc15a9ac6f146fa648766f8691256e%1780344289.224694",
         "libgettext/0.22#b09eea019e19b9b9c46d8f1da7d75444%1765809130.834",
         "libffi/3.4.8#a045c00fb26779635e3bed40e80c5254%1753360042.396",
         "libelf/0.8.13#ba59bbc89757ed62cfd7690a73bf81be%1741781951.327",
         "lcms/2.17#3feb06eea368c52c82f50107cd7694cd%1753693316.094",
         "gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1743410807.169",
-        "glib/2.81.0-odr#0436d4fbe7682722ede5964a63953c1d%1766352509.109",
+        "glib/2.81.0-odr#0436d4fbe7682722ede5964a63953c1d%1780344289.048973",
         "giflib/5.2.2#b445ec67bae61a96ddf0fa5614afde18%1773315754.794",
         "freetype/2.14.1#40f1e4af5db7d8155f9ecabd09973280%1762374429.281",
-        "fontforge/20240423-git#af7f643fc24bfd3661e97e8adf7c5a72%1766352508.159",
-        "fontconfig/2.15.0-odr#5681bcb942193569ee95215b93ed9fb0%1766352507.462",
+        "fontforge/20251009#07aafbbba7f910e55dd8eb926acb52f3%1780344288.892788",
+        "fontconfig/2.15.0-odr#5681bcb942193569ee95215b93ed9fb0%1780344288.5746791",
         "expat/2.7.5#89bbde1770876a19bb8620b9808941cc%1773806275.408",
         "cryptopp/8.9.0#7a51e0038756b21bc3a6b82d681d5906%1758206597.119",
         "cpp-httplib/0.16.3#7aa89fbb81ffd19539a49fc132502966%1748426320.106",
-        "cairo/1.18.0-odr#e2979af10b4da6ece999e32d272ffabc%1766352506.497",
+        "cairo/1.18.0-odr#e2979af10b4da6ece999e32d272ffabc%1780344288.42029",
         "bzip2/1.0.8#c470882369c2d95c5c77e970c0c7e321%1762886692.465",
         "brotli/1.1.0#3f631ef77008f7b5eb388780116371a3%1764862343.045",
         "boost/1.90.0#d5e8defe7355494953be18524a7f135b%1765955095.179",
-        "argon2/20190702-odr#965901884bc82ec8a7c0a1305d42c127%1764497584.637"
+        "argon2/20190702-odr#965901884bc82ec8a7c0a1305d42c127%1780344288.253698"
     ],
     "build_requires": [
         "zstd/1.5.7#b68ca8e3de04ba5957761751d1d661f4%1760955092.069",
@@ -70,7 +67,7 @@
         "gtk-doc-stub/cci.20181216#09072d684ce1458596b44a30a747494c%1687277608.37",
         "gperf/3.1#a7afdf8f7cccdc2dcd4d962370c33d4f%1755780571.156",
         "gnu-config/cci.20210814#466e9d4d7779e1c142443f7ea44b4284%1762363589.329",
-        "glib/2.81.0-odr#0436d4fbe7682722ede5964a63953c1d%1766352509.109",
+        "glib/2.81.0-odr#0436d4fbe7682722ede5964a63953c1d%1780344289.048973",
         "gettext/0.26#28c867efd4914f03c6c05da08a23c35b%1765299118.633",
         "flex/2.6.4#efa781fc5088b47c895bd4eef6911f2e%1761560242.855",
         "cmake/4.3.0#b939a42e98f593fb34d3a8c5cc860359%1773780142.26",

conanfile.py

@@ -47,7 +47,7 @@ def requirements(self):
         self.requires("uchardet/0.0.8")
         self.requires("utfcpp/4.0.9")
         if self.options.get_safe("with_pdf2htmlEX", False):
-            self.requires("pdf2htmlex/0.18.8.rc1-odr-git-eb5d291")
+            self.requires("pdf2htmlex/0.18.8.rc1-odr-git-e685b24")
         if self.options.get_safe("with_wvWare", False):
             self.requires("wvware/1.2.9-odr")
         self.requires("cpp-httplib/0.16.3")

src/odr/internal/pdf_poppler/poppler_pdf_file.cpp

@@ -29,11 +29,11 @@ void PopplerPdfFile::open(const std::optional<std::string> &password) {
   } else if (const std::shared_ptr memory_file =
                  std::dynamic_pointer_cast<MemoryFile>(m_file);
              memory_file != nullptr) {
-    // `stream` is freed by `m_pdf_doc`
-    auto stream = new MemStream(memory_file->memory_data(), 0,
-                                static_cast<Goffset>(memory_file->size()),
-                                Object(objNull));
-    m_pdf_doc = std::make_shared<PDFDoc>(stream, password_goo, password_goo);
+    auto stream = std::make_unique<MemStream>(
+        memory_file->memory_data(), 0,
+        static_cast<Goffset>(memory_file->size()), Object::null());
+    m_pdf_doc =
+        std::make_shared<PDFDoc>(std::move(stream), password_goo, password_goo);
   } else {
     throw NoPdfFile();
   }