diff --git a/src/index.js b/src/index.js index 0ebeffd9..1aaeb5c5 100644 --- a/src/index.js +++ b/src/index.js @@ -100,7 +100,7 @@ class Poppler { __dirname, "lib", "win32", - "poppler-21.09.0", + "poppler-21.10.0", "Library", "bin" ); diff --git a/src/index.test.js b/src/index.test.js index 8519a3ea..21198406 100644 --- a/src/index.test.js +++ b/src/index.test.js @@ -33,7 +33,7 @@ switch (platform) { __dirname, "lib", "win32", - "poppler-21.09.0", + "poppler-21.10.0", "Library", "bin" ); @@ -732,6 +732,47 @@ describe("Node-Poppler Module", () => { }); }); + describe("PDF-to-TIFF Option", () => { + test("Should convert PDF file to TIFF file", async () => { + const poppler = new Poppler(testBinaryPath); + const options = { + tiffFile: true, + }; + const outputFile = `${testDirectory}pdf_1.3_NHS_Constitution`; + + const res = await poppler.pdfToCairo(file, outputFile, options); + + expect(typeof res).toBe("string"); + expect( + fs.existsSync( + `${testDirectory}pdf_1.3_NHS_Constitution-01.tif` + ) + ).toBe(true); + }); + + test("Should convert PDF file as Buffer to TIFF file", async () => { + const poppler = new Poppler(testBinaryPath); + const attachmentFile = fs.readFileSync(file); + const options = { + tiffFile: true, + }; + const outputFile = `${testDirectory}pdf_1.3_NHS_Constitution`; + + const res = await poppler.pdfToCairo( + attachmentFile, + outputFile, + options + ); + + expect(typeof res).toBe("string"); + expect( + fs.existsSync( + `${testDirectory}pdf_1.3_NHS_Constitution-01.tif` + ) + ).toBe(true); + }); + }); + test("Should accept options and only process 2 pages of PDF file", async () => { const poppler = new Poppler(testBinaryPath); const options = { diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/libcrypto-1_1-x64.dll b/src/lib/win32/poppler-21.09.0/Library/bin/libcrypto-1_1-x64.dll deleted file mode 100644 index afbf8bcd..00000000 Binary files a/src/lib/win32/poppler-21.09.0/Library/bin/libcrypto-1_1-x64.dll and /dev/null differ diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/libcurl.dll b/src/lib/win32/poppler-21.09.0/Library/bin/libcurl.dll deleted file mode 100644 index a11923dd..00000000 Binary files a/src/lib/win32/poppler-21.09.0/Library/bin/libcurl.dll and /dev/null differ diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/pdfinfo.exe b/src/lib/win32/poppler-21.09.0/Library/bin/pdfinfo.exe deleted file mode 100644 index 447fe015..00000000 Binary files a/src/lib/win32/poppler-21.09.0/Library/bin/pdfinfo.exe and /dev/null differ diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/poppler-glib.dll b/src/lib/win32/poppler-21.09.0/Library/bin/poppler-glib.dll deleted file mode 100644 index 7ce4f44d..00000000 Binary files a/src/lib/win32/poppler-21.09.0/Library/bin/poppler-glib.dll and /dev/null differ diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/poppler.dll b/src/lib/win32/poppler-21.09.0/Library/bin/poppler.dll deleted file mode 100644 index 6c3711d6..00000000 Binary files a/src/lib/win32/poppler-21.09.0/Library/bin/poppler.dll and /dev/null differ diff --git a/src/lib/win32/poppler-21.09.0/Library/lib/pkgconfig/poppler-cpp.pc b/src/lib/win32/poppler-21.09.0/Library/lib/pkgconfig/poppler-cpp.pc deleted file mode 100644 index 1126b604..00000000 --- a/src/lib/win32/poppler-21.09.0/Library/lib/pkgconfig/poppler-cpp.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=D:/bld/poppler_1631234218217/_h_env/Library -libdir=D:/bld/poppler_1631234218217/_h_env/Library/lib -includedir=D:/bld/poppler_1631234218217/_h_env/Library/include - -Name: poppler-cpp -Description: cpp backend for Poppler PDF rendering library -Version: 21.09.0 -Requires: -Requires.private: poppler = 21.09.0 - -Libs: -L${libdir} -lpoppler-cpp -Cflags: -I${includedir}/poppler/cpp diff --git a/src/lib/win32/poppler-21.09.0/Library/lib/pkgconfig/poppler-glib.pc b/src/lib/win32/poppler-21.09.0/Library/lib/pkgconfig/poppler-glib.pc deleted file mode 100644 index 882438c5..00000000 --- a/src/lib/win32/poppler-21.09.0/Library/lib/pkgconfig/poppler-glib.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=D:/bld/poppler_1631234218217/_h_env/Library -libdir=D:/bld/poppler_1631234218217/_h_env/Library/lib -includedir=D:/bld/poppler_1631234218217/_h_env/Library/include - -Name: poppler-glib -Description: GLib wrapper for poppler -Version: 21.09.0 -Requires: glib-2.0 >= 2.56 gobject-2.0 >= 2.56 cairo >= 1.10.0 -Requires.private: poppler = 21.09.0 - -Libs: -L${libdir} -lpoppler-glib -Cflags: -I${includedir}/poppler/glib diff --git a/src/lib/win32/poppler-21.09.0/Library/lib/pkgconfig/poppler.pc b/src/lib/win32/poppler-21.09.0/Library/lib/pkgconfig/poppler.pc deleted file mode 100644 index dd75732b..00000000 --- a/src/lib/win32/poppler-21.09.0/Library/lib/pkgconfig/poppler.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=D:/bld/poppler_1631234218217/_h_env/Library -libdir=D:/bld/poppler_1631234218217/_h_env/Library/lib -includedir=D:/bld/poppler_1631234218217/_h_env/Library/include - -Name: poppler -Description: PDF rendering library -Version: 21.09.0 - -Libs: -L${libdir} -lpoppler -Cflags: -I${includedir}/poppler diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/Lerc.dll b/src/lib/win32/poppler-21.10.0/Library/bin/Lerc.dll similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/bin/Lerc.dll rename to src/lib/win32/poppler-21.10.0/Library/bin/Lerc.dll diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/cairo.dll b/src/lib/win32/poppler-21.10.0/Library/bin/cairo.dll similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/bin/cairo.dll rename to src/lib/win32/poppler-21.10.0/Library/bin/cairo.dll diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/charset.dll b/src/lib/win32/poppler-21.10.0/Library/bin/charset.dll similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/bin/charset.dll rename to src/lib/win32/poppler-21.10.0/Library/bin/charset.dll diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/freetype.dll b/src/lib/win32/poppler-21.10.0/Library/bin/freetype.dll similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/bin/freetype.dll rename to src/lib/win32/poppler-21.10.0/Library/bin/freetype.dll diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/iconv.dll b/src/lib/win32/poppler-21.10.0/Library/bin/iconv.dll similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/bin/iconv.dll rename to src/lib/win32/poppler-21.10.0/Library/bin/iconv.dll diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/jbig.dll b/src/lib/win32/poppler-21.10.0/Library/bin/jbig.dll similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/bin/jbig.dll rename to src/lib/win32/poppler-21.10.0/Library/bin/jbig.dll diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/lcms2.dll b/src/lib/win32/poppler-21.10.0/Library/bin/lcms2.dll similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/bin/lcms2.dll rename to src/lib/win32/poppler-21.10.0/Library/bin/lcms2.dll diff --git a/src/lib/win32/poppler-21.10.0/Library/bin/libcrypto-3-x64.dll b/src/lib/win32/poppler-21.10.0/Library/bin/libcrypto-3-x64.dll new file mode 100644 index 00000000..de417059 Binary files /dev/null and b/src/lib/win32/poppler-21.10.0/Library/bin/libcrypto-3-x64.dll differ diff --git a/src/lib/win32/poppler-21.10.0/Library/bin/libcurl.dll b/src/lib/win32/poppler-21.10.0/Library/bin/libcurl.dll new file mode 100644 index 00000000..461c8130 Binary files /dev/null and b/src/lib/win32/poppler-21.10.0/Library/bin/libcurl.dll differ diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/libdeflate.dll b/src/lib/win32/poppler-21.10.0/Library/bin/libdeflate.dll similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/bin/libdeflate.dll rename to src/lib/win32/poppler-21.10.0/Library/bin/libdeflate.dll diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/liblzma.dll b/src/lib/win32/poppler-21.10.0/Library/bin/liblzma.dll similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/bin/liblzma.dll rename to src/lib/win32/poppler-21.10.0/Library/bin/liblzma.dll diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/libpng16.dll b/src/lib/win32/poppler-21.10.0/Library/bin/libpng16.dll similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/bin/libpng16.dll rename to src/lib/win32/poppler-21.10.0/Library/bin/libpng16.dll diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/libssh2.dll b/src/lib/win32/poppler-21.10.0/Library/bin/libssh2.dll similarity index 96% rename from src/lib/win32/poppler-21.09.0/Library/bin/libssh2.dll rename to src/lib/win32/poppler-21.10.0/Library/bin/libssh2.dll index b4193be3..1b2f4d65 100644 Binary files a/src/lib/win32/poppler-21.09.0/Library/bin/libssh2.dll and b/src/lib/win32/poppler-21.10.0/Library/bin/libssh2.dll differ diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/libtiff.dll b/src/lib/win32/poppler-21.10.0/Library/bin/libtiff.dll similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/bin/libtiff.dll rename to src/lib/win32/poppler-21.10.0/Library/bin/libtiff.dll diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/libxml2.dll b/src/lib/win32/poppler-21.10.0/Library/bin/libxml2.dll similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/bin/libxml2.dll rename to src/lib/win32/poppler-21.10.0/Library/bin/libxml2.dll diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/libzstd.dll b/src/lib/win32/poppler-21.10.0/Library/bin/libzstd.dll similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/bin/libzstd.dll rename to src/lib/win32/poppler-21.10.0/Library/bin/libzstd.dll diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/openjp2.dll b/src/lib/win32/poppler-21.10.0/Library/bin/openjp2.dll similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/bin/openjp2.dll rename to src/lib/win32/poppler-21.10.0/Library/bin/openjp2.dll diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/pdfattach.exe b/src/lib/win32/poppler-21.10.0/Library/bin/pdfattach.exe similarity index 93% rename from src/lib/win32/poppler-21.09.0/Library/bin/pdfattach.exe rename to src/lib/win32/poppler-21.10.0/Library/bin/pdfattach.exe index 0020541a..4b903487 100644 Binary files a/src/lib/win32/poppler-21.09.0/Library/bin/pdfattach.exe and b/src/lib/win32/poppler-21.10.0/Library/bin/pdfattach.exe differ diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/pdfdetach.exe b/src/lib/win32/poppler-21.10.0/Library/bin/pdfdetach.exe similarity index 94% rename from src/lib/win32/poppler-21.09.0/Library/bin/pdfdetach.exe rename to src/lib/win32/poppler-21.10.0/Library/bin/pdfdetach.exe index b7acfece..1efb8825 100644 Binary files a/src/lib/win32/poppler-21.09.0/Library/bin/pdfdetach.exe and b/src/lib/win32/poppler-21.10.0/Library/bin/pdfdetach.exe differ diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/pdffonts.exe b/src/lib/win32/poppler-21.10.0/Library/bin/pdffonts.exe similarity index 92% rename from src/lib/win32/poppler-21.09.0/Library/bin/pdffonts.exe rename to src/lib/win32/poppler-21.10.0/Library/bin/pdffonts.exe index bcdf095a..248e295d 100644 Binary files a/src/lib/win32/poppler-21.09.0/Library/bin/pdffonts.exe and b/src/lib/win32/poppler-21.10.0/Library/bin/pdffonts.exe differ diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/pdfimages.exe b/src/lib/win32/poppler-21.10.0/Library/bin/pdfimages.exe similarity index 84% rename from src/lib/win32/poppler-21.09.0/Library/bin/pdfimages.exe rename to src/lib/win32/poppler-21.10.0/Library/bin/pdfimages.exe index f6fac070..b297680d 100644 Binary files a/src/lib/win32/poppler-21.09.0/Library/bin/pdfimages.exe and b/src/lib/win32/poppler-21.10.0/Library/bin/pdfimages.exe differ diff --git a/src/lib/win32/poppler-21.10.0/Library/bin/pdfinfo.exe b/src/lib/win32/poppler-21.10.0/Library/bin/pdfinfo.exe new file mode 100644 index 00000000..ecd1bd9a Binary files /dev/null and b/src/lib/win32/poppler-21.10.0/Library/bin/pdfinfo.exe differ diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/pdfseparate.exe b/src/lib/win32/poppler-21.10.0/Library/bin/pdfseparate.exe similarity index 96% rename from src/lib/win32/poppler-21.09.0/Library/bin/pdfseparate.exe rename to src/lib/win32/poppler-21.10.0/Library/bin/pdfseparate.exe index 508350da..1a4ee6af 100644 Binary files a/src/lib/win32/poppler-21.09.0/Library/bin/pdfseparate.exe and b/src/lib/win32/poppler-21.10.0/Library/bin/pdfseparate.exe differ diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/pdftocairo.exe b/src/lib/win32/poppler-21.10.0/Library/bin/pdftocairo.exe similarity index 92% rename from src/lib/win32/poppler-21.09.0/Library/bin/pdftocairo.exe rename to src/lib/win32/poppler-21.10.0/Library/bin/pdftocairo.exe index 30144a4e..636b75f9 100644 Binary files a/src/lib/win32/poppler-21.09.0/Library/bin/pdftocairo.exe and b/src/lib/win32/poppler-21.10.0/Library/bin/pdftocairo.exe differ diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/pdftohtml.exe b/src/lib/win32/poppler-21.10.0/Library/bin/pdftohtml.exe similarity index 81% rename from src/lib/win32/poppler-21.09.0/Library/bin/pdftohtml.exe rename to src/lib/win32/poppler-21.10.0/Library/bin/pdftohtml.exe index 5d73f9d5..3425efff 100644 Binary files a/src/lib/win32/poppler-21.09.0/Library/bin/pdftohtml.exe and b/src/lib/win32/poppler-21.10.0/Library/bin/pdftohtml.exe differ diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/pdftoppm.exe b/src/lib/win32/poppler-21.10.0/Library/bin/pdftoppm.exe similarity index 74% rename from src/lib/win32/poppler-21.09.0/Library/bin/pdftoppm.exe rename to src/lib/win32/poppler-21.10.0/Library/bin/pdftoppm.exe index 3ee70efd..0b9cec05 100644 Binary files a/src/lib/win32/poppler-21.09.0/Library/bin/pdftoppm.exe and b/src/lib/win32/poppler-21.10.0/Library/bin/pdftoppm.exe differ diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/pdftops.exe b/src/lib/win32/poppler-21.10.0/Library/bin/pdftops.exe similarity index 82% rename from src/lib/win32/poppler-21.09.0/Library/bin/pdftops.exe rename to src/lib/win32/poppler-21.10.0/Library/bin/pdftops.exe index 5969e3b7..b4782101 100644 Binary files a/src/lib/win32/poppler-21.09.0/Library/bin/pdftops.exe and b/src/lib/win32/poppler-21.10.0/Library/bin/pdftops.exe differ diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/pdftotext.exe b/src/lib/win32/poppler-21.10.0/Library/bin/pdftotext.exe similarity index 84% rename from src/lib/win32/poppler-21.09.0/Library/bin/pdftotext.exe rename to src/lib/win32/poppler-21.10.0/Library/bin/pdftotext.exe index 9ac42365..b4e58c38 100644 Binary files a/src/lib/win32/poppler-21.09.0/Library/bin/pdftotext.exe and b/src/lib/win32/poppler-21.10.0/Library/bin/pdftotext.exe differ diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/pdfunite.exe b/src/lib/win32/poppler-21.10.0/Library/bin/pdfunite.exe similarity index 91% rename from src/lib/win32/poppler-21.09.0/Library/bin/pdfunite.exe rename to src/lib/win32/poppler-21.10.0/Library/bin/pdfunite.exe index d6d821b8..38b067cb 100644 Binary files a/src/lib/win32/poppler-21.09.0/Library/bin/pdfunite.exe and b/src/lib/win32/poppler-21.10.0/Library/bin/pdfunite.exe differ diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/poppler-cpp.dll b/src/lib/win32/poppler-21.10.0/Library/bin/poppler-cpp.dll similarity index 81% rename from src/lib/win32/poppler-21.09.0/Library/bin/poppler-cpp.dll rename to src/lib/win32/poppler-21.10.0/Library/bin/poppler-cpp.dll index 5217410c..99334dfd 100644 Binary files a/src/lib/win32/poppler-21.09.0/Library/bin/poppler-cpp.dll and b/src/lib/win32/poppler-21.10.0/Library/bin/poppler-cpp.dll differ diff --git a/src/lib/win32/poppler-21.10.0/Library/bin/poppler-glib.dll b/src/lib/win32/poppler-21.10.0/Library/bin/poppler-glib.dll new file mode 100644 index 00000000..d3813f9a Binary files /dev/null and b/src/lib/win32/poppler-21.10.0/Library/bin/poppler-glib.dll differ diff --git a/src/lib/win32/poppler-21.10.0/Library/bin/poppler.dll b/src/lib/win32/poppler-21.10.0/Library/bin/poppler.dll new file mode 100644 index 00000000..f0408891 Binary files /dev/null and b/src/lib/win32/poppler-21.10.0/Library/bin/poppler.dll differ diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/tiff.dll b/src/lib/win32/poppler-21.10.0/Library/bin/tiff.dll similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/bin/tiff.dll rename to src/lib/win32/poppler-21.10.0/Library/bin/tiff.dll diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/zlib.dll b/src/lib/win32/poppler-21.10.0/Library/bin/zlib.dll similarity index 98% rename from src/lib/win32/poppler-21.09.0/Library/bin/zlib.dll rename to src/lib/win32/poppler-21.10.0/Library/bin/zlib.dll index 4de28fa2..1e649b64 100644 Binary files a/src/lib/win32/poppler-21.09.0/Library/bin/zlib.dll and b/src/lib/win32/poppler-21.10.0/Library/bin/zlib.dll differ diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/zstd.dll b/src/lib/win32/poppler-21.10.0/Library/bin/zstd.dll similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/bin/zstd.dll rename to src/lib/win32/poppler-21.10.0/Library/bin/zstd.dll diff --git a/src/lib/win32/poppler-21.09.0/Library/bin/zstd.exe b/src/lib/win32/poppler-21.10.0/Library/bin/zstd.exe similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/bin/zstd.exe rename to src/lib/win32/poppler-21.10.0/Library/bin/zstd.exe diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Annot.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Annot.h similarity index 98% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Annot.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Annot.h index daaf7b10..745618db 100644 --- a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Annot.h +++ b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Annot.h @@ -39,6 +39,7 @@ // Copyright (C) 2020 Thorsten Behrens // Copyright (C) 2021 Klarälvdalens Datakonsult AB, a KDAB Group company, . // Copyright (C) 2021 Zachary Travis +// Copyright (C) 2021 Mahmoud Ahmed Khalil // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -53,6 +54,7 @@ #include #include +#include "AnnotStampImageHelper.h" #include "Object.h" #include "poppler_private_export.h" @@ -375,7 +377,7 @@ class POPPLER_PRIVATE_EXPORT AnnotColor class POPPLER_PRIVATE_EXPORT DefaultAppearance { public: - DefaultAppearance(Object &&fontNameA, double fontPtSizeA, std::unique_ptr fontColorA); + DefaultAppearance(Object &&fontNameA, double fontPtSizeA, std::unique_ptr &&fontColorA); explicit DefaultAppearance(const GooString *da); void setFontName(Object &&fontNameA); const Object &getFontName() const { return fontName; } @@ -731,6 +733,8 @@ class POPPLER_PRIVATE_EXPORT Annot const GooString *getName() const { return name.get(); } const GooString *getModified() const { return modified.get(); } unsigned int getFlags() const { return flags; } + Object getAppearance() const; + void setNewAppearance(Object &&newAppearance); AnnotAppearance *getAppearStreams() const { return appearStreams.get(); } const GooString *getAppearState() const { return appearState.get(); } AnnotBorder *getBorder() const { return border.get(); } @@ -754,8 +758,8 @@ class POPPLER_PRIVATE_EXPORT Annot protected: virtual ~Annot(); virtual void removeReferencedObjects(); // Called by Page::removeAnnot - Object createForm(const GooString *appearBuf, double *bbox, bool transparencyGroup, Dict *resDict); - Object createForm(const GooString *appearBuf, double *bbox, bool transparencyGroup, Object &&resDictObject); // overload to support incRef/decRef + Object createForm(const GooString *appearBuf, const double *bbox, bool transparencyGroup, Dict *resDict); + Object createForm(const GooString *appearBuf, const double *bbox, bool transparencyGroup, Object &&resDictObject); // overload to support incRef/decRef Dict *createResourcesDict(const char *formName, Object &&formStream, const char *stateName, double opacity, const char *blendMode); bool isVisible(bool printing); int getRotation() const; @@ -1195,15 +1199,25 @@ class POPPLER_PRIVATE_EXPORT AnnotStamp : public AnnotMarkup AnnotStamp(PDFDoc *docA, Object &&dictObject, const Object *obj); ~AnnotStamp() override; + void draw(Gfx *gfx, bool printing) override; + void setIcon(GooString *new_icon); + void setCustomImage(AnnotStampImageHelper *stampImageHelperA); + + void clearCustomImage(); + // getters const GooString *getIcon() const { return icon.get(); } private: void initialize(PDFDoc *docA, Dict *dict); + void generateStampDefaultAppearance(); + void generateStampCustomAppearance(); std::unique_ptr icon; // Name (Default Draft) + AnnotStampImageHelper *stampImageHelper; + Ref updatedAppearanceStream; }; //------------------------------------------------------------------------ @@ -1436,7 +1450,6 @@ class POPPLER_PRIVATE_EXPORT AnnotWidget : public Annot std::unique_ptr getAdditionalAction(AdditionalActionsType type); std::unique_ptr getFormAdditionalAction(FormAdditionalActionsType type); Dict *getParent() { return parent; } - void setNewAppearance(Object &&newAppearance); bool setFormAdditionalAction(FormAdditionalActionsType type, const GooString &js); diff --git a/src/lib/win32/poppler-21.10.0/Library/include/poppler/AnnotStampImageHelper.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/AnnotStampImageHelper.h new file mode 100644 index 00000000..ebe6e919 --- /dev/null +++ b/src/lib/win32/poppler-21.10.0/Library/include/poppler/AnnotStampImageHelper.h @@ -0,0 +1,68 @@ +//======================================================================== +// +// AnnotStampImageHelper.h +// +// Copyright (C) 2021 Mahmoud Ahmed Khalil +// Copyright (C) 2021 Albert Astals Cid +// +// Licensed under GPLv2 or later +// +//======================================================================== + +#ifndef ANNOTSTAMPIMAGEHELPER_H +#define ANNOTSTAMPIMAGEHELPER_H + +#include "Object.h" + +class PDFDoc; + +enum ColorSpace +{ + DeviceGray, + DeviceRGB, + DeviceCMYK +}; + +/** + * This class is used only to load Image XObjects into stamp annotations. It takes in + * the image parameters in its constructors and creates a new Image XObject that gets + * added to the XRef table, so that the annotations that would like to use it be able + * to get its ref number. + * + * To have transparency in the image, you should first try to create the soft + * mask of the image, by creating a AnnotStampImageHelper object giving it the soft + * image data normally. You would then need to pass in the created soft mask Image XObject + * ref to the actual image you'd like to be created by this helper class. + */ +class POPPLER_PRIVATE_EXPORT AnnotStampImageHelper +{ +public: + AnnotStampImageHelper(PDFDoc *docA, int widthA, int heightA, ColorSpace colorSpace, int bitsPerComponent, char *data, int dataLength); + AnnotStampImageHelper(PDFDoc *docA, int widthA, int heightA, ColorSpace colorSpace, int bitsPerComponent, char *data, int dataLength, Ref softMaskRef); + ~AnnotStampImageHelper() { } + + // Returns the ref to the created Image XObject + Ref getRef() const { return ref; } + + // Returns the width of the image + int getWidth() const { return width; } + // Returns the height of the image + int getHeight() const { return height; } + + // Removes the created Image XObject as well as its soft mask from the XRef Table + void removeAnnotStampImageObject(); + +private: + void initialize(PDFDoc *docA, int widthA, int heightA, ColorSpace colorSpace, int bitsPerComponent, char *data, int dataLength); + + PDFDoc *doc; + + Object imgObj; + Ref ref; + Ref sMaskRef; + + int width; + int height; +}; + +#endif diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Array.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Array.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Array.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Array.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/BBoxOutputDev.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/BBoxOutputDev.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/BBoxOutputDev.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/BBoxOutputDev.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/CMap.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/CMap.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/CMap.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/CMap.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/CachedFile.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/CachedFile.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/CachedFile.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/CachedFile.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/CairoFontEngine.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/CairoFontEngine.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/CairoFontEngine.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/CairoFontEngine.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/CairoOutputDev.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/CairoOutputDev.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/CairoOutputDev.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/CairoOutputDev.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/CairoRescaleBox.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/CairoRescaleBox.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/CairoRescaleBox.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/CairoRescaleBox.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Catalog.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Catalog.h similarity index 99% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Catalog.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Catalog.h index 3f95f3a2..7a30ebbf 100644 --- a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Catalog.h +++ b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Catalog.h @@ -136,7 +136,7 @@ class POPPLER_PRIVATE_EXPORT Catalog // Return the contents of the metadata stream, or NULL if there is // no metadata. - GooString *readMetadata(); + std::unique_ptr readMetadata(); // Return the structure tree root object. StructTreeRoot *getStructTreeRoot(); diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/CertificateInfo.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/CertificateInfo.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/CertificateInfo.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/CertificateInfo.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/CharCodeToUnicode.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/CharCodeToUnicode.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/CharCodeToUnicode.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/CharCodeToUnicode.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/CharTypes.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/CharTypes.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/CharTypes.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/CharTypes.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/CurlCachedFile.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/CurlCachedFile.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/CurlCachedFile.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/CurlCachedFile.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/CurlPDFDocBuilder.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/CurlPDFDocBuilder.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/CurlPDFDocBuilder.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/CurlPDFDocBuilder.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/DateInfo.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/DateInfo.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/DateInfo.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/DateInfo.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Decrypt.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Decrypt.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Decrypt.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Decrypt.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Dict.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Dict.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Dict.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Dict.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Error.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Error.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Error.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Error.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/ErrorCodes.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/ErrorCodes.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/ErrorCodes.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/ErrorCodes.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/FileSpec.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/FileSpec.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/FileSpec.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/FileSpec.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/FontEncodingTables.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/FontEncodingTables.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/FontEncodingTables.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/FontEncodingTables.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/FontInfo.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/FontInfo.h similarity index 94% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/FontInfo.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/FontInfo.h index 50f2a6b7..a798c5d2 100644 --- a/src/lib/win32/poppler-21.09.0/Library/include/poppler/FontInfo.h +++ b/src/lib/win32/poppler-21.10.0/Library/include/poppler/FontInfo.h @@ -8,7 +8,7 @@ // Copyright (C) 2009 Pino Toscano // Copyright (C) 2012 Adrian Johnson // Copyright (C) 2013 Thomas Freitag -// Copyright (C) 2019 Oliver Sander +// Copyright (C) 2019, 2021 Oliver Sander // Copyright (C) 2019 Adam Reichold // // To see a description of the changes please see the Changelog file that @@ -66,7 +66,7 @@ class POPPLER_PRIVATE_EXPORT FontInfo const GooString *getName() const { return name; }; const GooString *getSubstituteName() const { return substituteName; }; const GooString *getFile() const { return file; }; - const GooString *getEncoding() const { return encoding; }; + const std::string &getEncoding() const { return encoding; }; Type getType() const { return type; }; bool getEmbedded() const { return emb; }; bool getSubset() const { return subset; }; @@ -78,7 +78,7 @@ class POPPLER_PRIVATE_EXPORT FontInfo GooString *name; GooString *substituteName; GooString *file; - GooString *encoding; + std::string encoding; Type type; bool emb; bool subset; diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Form.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Form.h similarity index 96% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Form.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Form.h index 13ca1f5f..9c51bcfd 100644 --- a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Form.h +++ b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Form.h @@ -24,6 +24,8 @@ // Copyright 2020 Marek Kasik // Copyright 2020 Thorsten Behrens // Copyright 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden +// Copyright 2021 Georgiy Sgibnev . Work sponsored by lab50.net. +// Copyright 2021 Theofilos Intzoglou // //======================================================================== @@ -295,19 +297,20 @@ class POPPLER_PRIVATE_EXPORT FormWidgetSignature : public FormWidget void setSignatureType(FormSignatureType fst); // Use -1 for now as validationTime - SignatureInfo *validateSignature(bool doVerifyCert, bool forceRevalidation, time_t validationTime); + SignatureInfo *validateSignature(bool doVerifyCert, bool forceRevalidation, time_t validationTime, bool ocspRevocationCheck, bool enableAIA); // returns a list with the boundaries of the signed ranges // the elements of the list are of type Goffset std::vector getSignedRangeBounds() const; - // creates or replaces the dictionary name "V" in the signature dictionary and + // Creates or replaces the dictionary name "V" in the signature dictionary and // fills it with the fields of the signature; the field "Contents" is the signature // in PKCS#7 format, which is calculated over the byte range encompassing the whole // document except for the signature itself; this byte range is specified in the - // field "ByteRange" in the dictionary "V" - // return success - bool signDocument(const char *filename, const char *certNickname, const char *digestName, const char *password, const char *reason = nullptr); + // field "ByteRange" in the dictionary "V". + // Arguments reason and location are UTF-16 big endian strings with BOM. An empty string and nullptr are acceptable too. + // Returns success. + bool signDocument(const char *filename, const char *certNickname, const char *digestName, const char *password, const GooString *reason = nullptr, const GooString *location = nullptr); // checks the length encoding of the signature and returns the hex encoded signature // if the check passed (and the checked file size as output parameter in checkedFileSize) @@ -317,7 +320,7 @@ class POPPLER_PRIVATE_EXPORT FormWidgetSignature : public FormWidget const GooString *getSignature() const; private: - bool createSignature(Object &vObj, Ref vRef, const GooString &name, const GooString &reason, const GooString *signature); + bool createSignature(Object &vObj, Ref vRef, const GooString &name, const GooString *signature, const GooString *reason = nullptr, const GooString *location = nullptr); bool getObjectStartEnd(GooString *filename, int objNum, Goffset *objStart, Goffset *objEnd); bool updateOffsets(FILE *f, Goffset objStart, Goffset objEnd, Goffset *sigStart, Goffset *sigEnd, Goffset *fileSize); @@ -594,7 +597,7 @@ class POPPLER_PRIVATE_EXPORT FormFieldSignature : public FormField FormFieldSignature(PDFDoc *docA, Object &&dict, const Ref ref, FormField *parent, std::set *usedParents); // Use -1 for now as validationTime - SignatureInfo *validateSignature(bool doVerifyCert, bool forceRevalidation, time_t validationTime); + SignatureInfo *validateSignature(bool doVerifyCert, bool forceRevalidation, time_t validationTime, bool ocspRevocationCheck, bool enableAIA); // returns a list with the boundaries of the signed ranges // the elements of the list are of type Goffset diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Function.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Function.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Function.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Function.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Gfx.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Gfx.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Gfx.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Gfx.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/GfxFont.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/GfxFont.h similarity index 98% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/GfxFont.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/GfxFont.h index 16f062e9..398f4dea 100644 --- a/src/lib/win32/poppler-21.09.0/Library/include/poppler/GfxFont.h +++ b/src/lib/win32/poppler-21.10.0/Library/include/poppler/GfxFont.h @@ -24,6 +24,7 @@ // Copyright (C) 2015, 2018 Jason Crain // Copyright (C) 2015 Thomas Freitag // Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2021 Oliver Sander // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -291,7 +292,7 @@ class POPPLER_PRIVATE_EXPORT GfxFont bool hasToUnicodeCMap() const { return hasToUnicode; } // Return the name of the encoding - GooString *getEncodingName() const { return encodingName; } + const std::string &getEncodingName() const { return encodingName; } // Return AGLFN names of ligatures in the Standard and Expert encodings // for use with fonts that are not compatible with the Standard 14 fonts. @@ -326,7 +327,7 @@ class POPPLER_PRIVATE_EXPORT GfxFont int refCnt; bool ok; bool hasToUnicode; - GooString *encodingName; + std::string encodingName; }; //------------------------------------------------------------------------ diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/GfxState.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/GfxState.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/GfxState.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/GfxState.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/GfxState_helpers.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/GfxState_helpers.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/GfxState_helpers.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/GfxState_helpers.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/GlobalParams.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/GlobalParams.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/GlobalParams.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/GlobalParams.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Hints.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Hints.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Hints.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Hints.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/JArithmeticDecoder.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/JArithmeticDecoder.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/JArithmeticDecoder.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/JArithmeticDecoder.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/JBIG2Stream.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/JBIG2Stream.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/JBIG2Stream.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/JBIG2Stream.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/JPEG2000Stream.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/JPEG2000Stream.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/JPEG2000Stream.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/JPEG2000Stream.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/JSInfo.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/JSInfo.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/JSInfo.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/JSInfo.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Lexer.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Lexer.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Lexer.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Lexer.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Linearization.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Linearization.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Linearization.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Linearization.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Link.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Link.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Link.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Link.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/LocalPDFDocBuilder.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/LocalPDFDocBuilder.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/LocalPDFDocBuilder.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/LocalPDFDocBuilder.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/MarkedContentOutputDev.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/MarkedContentOutputDev.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/MarkedContentOutputDev.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/MarkedContentOutputDev.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Movie.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Movie.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Movie.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Movie.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/NameToCharCode.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/NameToCharCode.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/NameToCharCode.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/NameToCharCode.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/NameToUnicodeTable.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/NameToUnicodeTable.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/NameToUnicodeTable.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/NameToUnicodeTable.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Object.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Object.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Object.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Object.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/OptionalContent.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/OptionalContent.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/OptionalContent.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/OptionalContent.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Outline.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Outline.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Outline.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Outline.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/OutputDev.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/OutputDev.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/OutputDev.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/OutputDev.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/PDFDoc.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/PDFDoc.h similarity index 95% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/PDFDoc.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/PDFDoc.h index 9f5b0bf4..aca23585 100644 --- a/src/lib/win32/poppler-21.09.0/Library/include/poppler/PDFDoc.h +++ b/src/lib/win32/poppler-21.10.0/Library/include/poppler/PDFDoc.h @@ -35,6 +35,7 @@ // Copyright (C) 2020, 2021 Oliver Sander // Copyright (C) 2020 Nelson Benítez León // Copyright (C) 2021 Mahmoud Khalil +// Copyright (C) 2021 Georgiy Sgibnev . Work sponsored by lab50.net. // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -183,7 +184,7 @@ class POPPLER_PRIVATE_EXPORT PDFDoc // Return the contents of the metadata stream, or nullptr if there is // no metadata. - const GooString *readMetadata() const { return catalog->readMetadata(); } + std::unique_ptr readMetadata() const { return catalog->readMetadata(); } // Return the structure tree root object. const StructTreeRoot *getStructTreeRoot() const { return catalog->getStructTreeRoot(); } @@ -329,6 +330,11 @@ class POPPLER_PRIVATE_EXPORT PDFDoc // scans the PDF and returns whether it contains any javascript bool hasJavascript(); + // Arguments signatureText and signatureTextLeft are UTF-16 big endian strings with BOM. + // Arguments reason and location are UTF-16 big endian strings with BOM. An empty string and nullptr are acceptable too. + bool sign(const char *saveFilename, const char *certNickname, const char *password, GooString *partialFieldName, int page, const PDFRectangle &rect, const GooString &signatureText, const GooString &signatureTextLeft, double fontSize, + std::unique_ptr &&fontColor, double borderWidth, std::unique_ptr &&borderColor, std::unique_ptr &&backgroundColor, const GooString *reason = nullptr, const GooString *location = nullptr); + private: // insert referenced objects in XRef void markDictionnary(Dict *dict, XRef *xRef, XRef *countRef, unsigned int numOffset, int oldRefNum, int newRefNum, std::set *alreadyMarkedDicts); diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/PDFDocBuilder.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/PDFDocBuilder.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/PDFDocBuilder.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/PDFDocBuilder.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/PDFDocEncoding.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/PDFDocEncoding.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/PDFDocEncoding.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/PDFDocEncoding.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/PDFDocFactory.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/PDFDocFactory.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/PDFDocFactory.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/PDFDocFactory.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/PSOutputDev.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/PSOutputDev.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/PSOutputDev.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/PSOutputDev.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/PSTokenizer.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/PSTokenizer.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/PSTokenizer.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/PSTokenizer.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Page.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Page.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Page.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Page.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/PageTransition.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/PageTransition.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/PageTransition.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/PageTransition.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Parser.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Parser.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Parser.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Parser.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/PopplerCache.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/PopplerCache.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/PopplerCache.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/PopplerCache.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/PreScanOutputDev.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/PreScanOutputDev.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/PreScanOutputDev.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/PreScanOutputDev.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/ProfileData.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/ProfileData.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/ProfileData.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/ProfileData.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Rendition.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Rendition.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Rendition.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Rendition.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/SecurityHandler.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/SecurityHandler.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/SecurityHandler.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/SecurityHandler.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Sound.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Sound.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Sound.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Sound.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/SplashOutputDev.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/SplashOutputDev.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/SplashOutputDev.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/SplashOutputDev.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/StdinCachedFile.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/StdinCachedFile.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/StdinCachedFile.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/StdinCachedFile.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/StdinPDFDocBuilder.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/StdinPDFDocBuilder.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/StdinPDFDocBuilder.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/StdinPDFDocBuilder.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Stream-CCITT.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Stream-CCITT.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Stream-CCITT.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Stream-CCITT.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/Stream.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/Stream.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/Stream.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/Stream.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/StructElement.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/StructElement.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/StructElement.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/StructElement.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/StructTreeRoot.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/StructTreeRoot.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/StructTreeRoot.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/StructTreeRoot.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/TextOutputDev.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/TextOutputDev.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/TextOutputDev.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/TextOutputDev.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/UTF.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/UTF.h similarity index 82% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/UTF.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/UTF.h index 2e4cfe7f..0a85a0e2 100644 --- a/src/lib/win32/poppler-21.09.0/Library/include/poppler/UTF.h +++ b/src/lib/win32/poppler-21.10.0/Library/include/poppler/UTF.h @@ -4,11 +4,12 @@ // // This file is licensed under the GPLv2 or later // -// Copyright (C) 2012, 2017 Adrian Johnson +// Copyright (C) 2012, 2017, 2021 Adrian Johnson // Copyright (C) 2016 Jason Crain // Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich // Copyright (C) 2018 Nelson Benítez León // Copyright (C) 2019, 2020 Albert Astals Cid +// Copyright (C) 2021 Georgiy Sgibnev . Work sponsored by lab50.net. // //======================================================================== @@ -42,6 +43,16 @@ bool UnicodeIsValid(Unicode ucs4); // is a unicode whitespace character bool UnicodeIsWhitespace(Unicode ucs4); +// Count number of UCS-4 characters required to convert a UTF-8 string to +// UCS-4 (excluding terminating NULL). +int POPPLER_PRIVATE_EXPORT utf8CountUCS4(const char *utf8); + +// Convert a UTF-8 string to a UCS-4 +// utf8 - utf8 bytes +// ucs4_out - if not NULL, allocates and returns UCS-4 string. Free with gfree. +// returns number of UCS-4 characters +int POPPLER_PRIVATE_EXPORT utf8ToUCS4(const char *utf8, Unicode **ucs4_out); + // Count number of UTF-16 code units required to convert a UTF-8 string // (excluding terminating NULL). Each invalid byte is counted as a // code point since the UTF-8 conversion functions will replace it with @@ -61,6 +72,12 @@ int POPPLER_PRIVATE_EXPORT utf8ToUtf16(const char *utf8, uint16_t *utf16, int ma // Allocate utf16 string and convert utf8 into it. uint16_t POPPLER_PRIVATE_EXPORT *utf8ToUtf16(const char *utf8, int *len = nullptr); +// Converts a UTF-8 string to a big endian UTF-16 string with BOM. +// The caller owns the returned pointer. +// utf8 - UTF-8 string to convert. An empty string is acceptable. +// Returns a big endian UTF-16 string with BOM or an empty string without BOM. +GooString POPPLER_PRIVATE_EXPORT *utf8ToUtf16WithBom(const GooString &utf8); + // Count number of UTF-8 bytes required to convert a UTF-16 string to // UTF-8 (excluding terminating NULL). int POPPLER_PRIVATE_EXPORT utf16CountUtf8Bytes(const uint16_t *utf16); diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/UnicodeCClassTables.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/UnicodeCClassTables.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/UnicodeCClassTables.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/UnicodeCClassTables.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/UnicodeCompTables.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/UnicodeCompTables.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/UnicodeCompTables.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/UnicodeCompTables.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/UnicodeDecompTables.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/UnicodeDecompTables.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/UnicodeDecompTables.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/UnicodeDecompTables.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/UnicodeMap.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/UnicodeMap.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/UnicodeMap.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/UnicodeMap.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/UnicodeMapFuncs.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/UnicodeMapFuncs.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/UnicodeMapFuncs.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/UnicodeMapFuncs.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/UnicodeMapTables.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/UnicodeMapTables.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/UnicodeMapTables.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/UnicodeMapTables.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/UnicodeTypeTable.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/UnicodeTypeTable.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/UnicodeTypeTable.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/UnicodeTypeTable.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/ViewerPreferences.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/ViewerPreferences.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/ViewerPreferences.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/ViewerPreferences.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/XRef.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/XRef.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/XRef.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/XRef.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-destination.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-destination.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-destination.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-destination.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-document.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-document.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-document.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-document.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-embedded-file.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-embedded-file.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-embedded-file.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-embedded-file.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-font-private.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-font-private.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-font-private.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-font-private.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-font.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-font.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-font.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-font.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-global.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-global.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-global.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-global.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-image.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-image.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-image.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-image.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-page-renderer.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-page-renderer.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-page-renderer.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-page-renderer.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-page-transition.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-page-transition.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-page-transition.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-page-transition.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-page.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-page.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-page.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-page.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-rectangle.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-rectangle.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-rectangle.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-rectangle.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-toc.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-toc.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-toc.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-toc.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-version.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-version.h similarity index 91% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-version.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-version.h index fb7bf94d..599ab963 100644 --- a/src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler-version.h +++ b/src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler-version.h @@ -21,9 +21,9 @@ #include "poppler-global.h" -#define POPPLER_VERSION "21.09.0" +#define POPPLER_VERSION "21.10.0" #define POPPLER_VERSION_MAJOR 21 -#define POPPLER_VERSION_MINOR 9 +#define POPPLER_VERSION_MINOR 10 #define POPPLER_VERSION_MICRO 0 namespace poppler diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler_cpp_export.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler_cpp_export.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/cpp/poppler_cpp_export.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/cpp/poppler_cpp_export.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/fofi/FoFiBase.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/fofi/FoFiBase.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/fofi/FoFiBase.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/fofi/FoFiBase.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/fofi/FoFiEncodings.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/fofi/FoFiEncodings.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/fofi/FoFiEncodings.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/fofi/FoFiEncodings.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/fofi/FoFiIdentifier.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/fofi/FoFiIdentifier.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/fofi/FoFiIdentifier.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/fofi/FoFiIdentifier.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/fofi/FoFiTrueType.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/fofi/FoFiTrueType.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/fofi/FoFiTrueType.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/fofi/FoFiTrueType.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/fofi/FoFiType1.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/fofi/FoFiType1.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/fofi/FoFiType1.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/fofi/FoFiType1.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/fofi/FoFiType1C.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/fofi/FoFiType1C.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/fofi/FoFiType1C.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/fofi/FoFiType1C.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-action.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-action.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-action.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-action.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-annot.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-annot.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-annot.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-annot.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-attachment.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-attachment.h similarity index 92% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-attachment.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-attachment.h index 40b7723b..5505a959 100644 --- a/src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-attachment.h +++ b/src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-attachment.h @@ -82,20 +82,18 @@ struct _PopplerAttachment GString *checksum; }; -/* This struct was never documented nor intended for external use, but - * has technically been part of the API (see #33). */ +/* This struct was not intended to be public, but can't be moved to + * poppler-attachment.cc without breaking the API stability. + */ /** * PopplerAttachmentClass: * - * Provides a named wrapper for a single GObjectClass. - * - * Deprecated: 20.11: Use PopplerAttachment objects with the public - * poppler_attachment functions instead. + * The GObject class structure of #PopplerAttachment. */ typedef struct _PopplerAttachmentClass { GObjectClass parent_class; -} PopplerAttachmentClass G_GNUC_DEPRECATED_FOR(PopplerAttachment); +} PopplerAttachmentClass; POPPLER_PUBLIC GType poppler_attachment_get_type(void) G_GNUC_CONST; diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-date.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-date.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-date.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-date.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-document.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-document.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-document.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-document.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-enums.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-enums.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-enums.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-enums.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-features.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-features.h similarity index 95% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-features.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-features.h index 0d3a1e0c..6f26253a 100644 --- a/src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-features.h +++ b/src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-features.h @@ -55,7 +55,7 @@ * * Since: 0.12 */ -#define POPPLER_MINOR_VERSION (9) +#define POPPLER_MINOR_VERSION (10) /** * POPPLER_MICRO_VERSION: diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-form-field.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-form-field.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-form-field.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-form-field.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-layer.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-layer.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-layer.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-layer.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-macros.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-macros.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-macros.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-macros.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-media.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-media.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-media.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-media.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-movie.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-movie.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-movie.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-movie.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-page.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-page.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-page.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-page.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-structure-element.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-structure-element.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler-structure-element.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler-structure-element.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/glib/poppler.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/glib/poppler.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/GooCheckedOps.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/GooCheckedOps.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/GooCheckedOps.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/GooCheckedOps.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/GooLikely.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/GooLikely.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/GooLikely.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/GooLikely.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/GooString.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/GooString.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/GooString.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/GooString.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/GooTimer.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/GooTimer.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/GooTimer.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/GooTimer.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/ImgWriter.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/ImgWriter.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/ImgWriter.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/ImgWriter.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/JpegWriter.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/JpegWriter.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/JpegWriter.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/JpegWriter.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/PNGWriter.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/PNGWriter.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/PNGWriter.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/PNGWriter.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/TiffWriter.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/TiffWriter.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/TiffWriter.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/TiffWriter.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/gdir.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/gdir.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/gdir.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/gdir.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/gfile.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/gfile.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/gfile.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/gfile.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/gmem.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/gmem.h similarity index 95% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/gmem.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/gmem.h index d104061b..5d5fb1ec 100644 --- a/src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/gmem.h +++ b/src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/gmem.h @@ -17,6 +17,7 @@ // Copyright (C) 2007-2010, 2017, 2019 Albert Astals Cid // Copyright (C) 2008 Jonathan Kew // Copyright (C) 2018 Adam Reichold +// Copyright (C) 2021 Even Rouault // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -168,7 +169,13 @@ inline void *greallocn(void *p, int count, int size, bool checkoverflow = false, std::abort(); } - return grealloc(p, bytes, checkoverflow); + if (void *q = grealloc(p, bytes, checkoverflow)) { + return q; + } + if (free_p) { + gfree(p); + } + return nullptr; } inline void *greallocn_checkoverflow(void *p, int count, int size) diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/grandom.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/grandom.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/grandom.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/grandom.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/gstrtod.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/gstrtod.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/goo/gstrtod.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/goo/gstrtod.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/poppler-config.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/poppler-config.h similarity index 95% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/poppler-config.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/poppler-config.h index 5b69c6cd..8181101a 100644 --- a/src/lib/win32/poppler-21.09.0/Library/include/poppler/poppler-config.h +++ b/src/lib/win32/poppler-21.10.0/Library/include/poppler/poppler-config.h @@ -36,7 +36,7 @@ /* Defines the poppler version. */ #ifndef POPPLER_VERSION -#define POPPLER_VERSION "21.09.0" +#define POPPLER_VERSION "21.10.0" #endif /* Use single precision arithmetic in the Splash backend */ diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/poppler_private_export.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/poppler_private_export.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/poppler_private_export.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/poppler_private_export.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/Splash.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/Splash.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/Splash.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/Splash.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashBitmap.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashBitmap.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashBitmap.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashBitmap.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashClip.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashClip.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashClip.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashClip.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashErrorCodes.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashErrorCodes.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashErrorCodes.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashErrorCodes.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashFTFont.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashFTFont.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashFTFont.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashFTFont.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashFTFontEngine.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashFTFontEngine.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashFTFontEngine.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashFTFontEngine.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashFTFontFile.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashFTFontFile.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashFTFontFile.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashFTFontFile.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashFont.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashFont.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashFont.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashFont.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashFontEngine.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashFontEngine.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashFontEngine.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashFontEngine.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashFontFile.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashFontFile.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashFontFile.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashFontFile.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashFontFileID.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashFontFileID.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashFontFileID.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashFontFileID.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashGlyphBitmap.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashGlyphBitmap.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashGlyphBitmap.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashGlyphBitmap.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashMath.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashMath.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashMath.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashMath.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashPath.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashPath.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashPath.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashPath.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashPattern.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashPattern.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashPattern.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashPattern.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashScreen.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashScreen.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashScreen.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashScreen.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashState.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashState.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashState.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashState.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashTypes.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashTypes.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashTypes.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashTypes.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashXPath.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashXPath.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashXPath.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashXPath.h diff --git a/src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashXPathScanner.h b/src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashXPathScanner.h similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/include/poppler/splash/SplashXPathScanner.h rename to src/lib/win32/poppler-21.10.0/Library/include/poppler/splash/SplashXPathScanner.h diff --git a/src/lib/win32/poppler-21.10.0/Library/lib/pkgconfig/poppler-cpp.pc b/src/lib/win32/poppler-21.10.0/Library/lib/pkgconfig/poppler-cpp.pc new file mode 100644 index 00000000..0fb34971 --- /dev/null +++ b/src/lib/win32/poppler-21.10.0/Library/lib/pkgconfig/poppler-cpp.pc @@ -0,0 +1,12 @@ +prefix=D:/bld/poppler-split_1633103564765/_h_env/Library +libdir=D:/bld/poppler-split_1633103564765/_h_env/Library/lib +includedir=D:/bld/poppler-split_1633103564765/_h_env/Library/include + +Name: poppler-cpp +Description: cpp backend for Poppler PDF rendering library +Version: 21.10.0 +Requires: +Requires.private: poppler = 21.10.0 + +Libs: -L${libdir} -lpoppler-cpp +Cflags: -I${includedir}/poppler/cpp diff --git a/src/lib/win32/poppler-21.10.0/Library/lib/pkgconfig/poppler-glib.pc b/src/lib/win32/poppler-21.10.0/Library/lib/pkgconfig/poppler-glib.pc new file mode 100644 index 00000000..cff7034e --- /dev/null +++ b/src/lib/win32/poppler-21.10.0/Library/lib/pkgconfig/poppler-glib.pc @@ -0,0 +1,12 @@ +prefix=D:/bld/poppler-split_1633103564765/_h_env/Library +libdir=D:/bld/poppler-split_1633103564765/_h_env/Library/lib +includedir=D:/bld/poppler-split_1633103564765/_h_env/Library/include + +Name: poppler-glib +Description: GLib wrapper for poppler +Version: 21.10.0 +Requires: glib-2.0 >= 2.56 gobject-2.0 >= 2.56 cairo >= 1.10.0 +Requires.private: poppler = 21.10.0 + +Libs: -L${libdir} -lpoppler-glib +Cflags: -I${includedir}/poppler/glib diff --git a/src/lib/win32/poppler-21.10.0/Library/lib/pkgconfig/poppler.pc b/src/lib/win32/poppler-21.10.0/Library/lib/pkgconfig/poppler.pc new file mode 100644 index 00000000..828fb8f7 --- /dev/null +++ b/src/lib/win32/poppler-21.10.0/Library/lib/pkgconfig/poppler.pc @@ -0,0 +1,10 @@ +prefix=D:/bld/poppler-split_1633103564765/_h_env/Library +libdir=D:/bld/poppler-split_1633103564765/_h_env/Library/lib +includedir=D:/bld/poppler-split_1633103564765/_h_env/Library/include + +Name: poppler +Description: PDF rendering library +Version: 21.10.0 + +Libs: -L${libdir} -lpoppler +Cflags: -I${includedir}/poppler diff --git a/src/lib/win32/poppler-21.09.0/Library/lib/poppler-cpp.lib b/src/lib/win32/poppler-21.10.0/Library/lib/poppler-cpp.lib similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/lib/poppler-cpp.lib rename to src/lib/win32/poppler-21.10.0/Library/lib/poppler-cpp.lib diff --git a/src/lib/win32/poppler-21.09.0/Library/lib/poppler-glib.lib b/src/lib/win32/poppler-21.10.0/Library/lib/poppler-glib.lib similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/lib/poppler-glib.lib rename to src/lib/win32/poppler-21.10.0/Library/lib/poppler-glib.lib diff --git a/src/lib/win32/poppler-21.09.0/Library/lib/poppler.lib b/src/lib/win32/poppler-21.10.0/Library/lib/poppler.lib similarity index 67% rename from src/lib/win32/poppler-21.09.0/Library/lib/poppler.lib rename to src/lib/win32/poppler-21.10.0/Library/lib/poppler.lib index aeae7495..319c174f 100644 Binary files a/src/lib/win32/poppler-21.09.0/Library/lib/poppler.lib and b/src/lib/win32/poppler-21.10.0/Library/lib/poppler.lib differ diff --git a/src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdfattach.1 b/src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdfattach.1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdfattach.1 rename to src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdfattach.1 diff --git a/src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdfdetach.1 b/src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdfdetach.1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdfdetach.1 rename to src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdfdetach.1 diff --git a/src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdffonts.1 b/src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdffonts.1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdffonts.1 rename to src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdffonts.1 diff --git a/src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdfimages.1 b/src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdfimages.1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdfimages.1 rename to src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdfimages.1 diff --git a/src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdfinfo.1 b/src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdfinfo.1 similarity index 95% rename from src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdfinfo.1 rename to src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdfinfo.1 index 41190842..abd34a8c 100644 --- a/src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdfinfo.1 +++ b/src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdfinfo.1 @@ -46,9 +46,21 @@ modification date In addition, the following information is printed: .PP .RS +custom metadata (yes/no) +.RE +.RS +metadata stream (yes/no) +.RE +.RS tagged (yes/no) .RE .RS +userproperties (yes/no) +.RE +.RS +suspects (yes/no) +.RE +.RS form (AcroForm / XFA / none) .RE .RS @@ -99,6 +111,9 @@ TrimBox, and ArtBox. Prints document-level metadata. (This is the "Metadata" stream from the PDF file's Catalog object.) .TP +.B \-custom +Prints custom and standard metadata. +.TP .B \-js Prints all JavaScript in the PDF. .TP diff --git a/src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdfseparate.1 b/src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdfseparate.1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdfseparate.1 rename to src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdfseparate.1 diff --git a/src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdftocairo.1 b/src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdftocairo.1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdftocairo.1 rename to src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdftocairo.1 diff --git a/src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdftohtml.1 b/src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdftohtml.1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdftohtml.1 rename to src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdftohtml.1 diff --git a/src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdftoppm.1 b/src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdftoppm.1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdftoppm.1 rename to src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdftoppm.1 diff --git a/src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdftops.1 b/src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdftops.1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdftops.1 rename to src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdftops.1 diff --git a/src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdftotext.1 b/src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdftotext.1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdftotext.1 rename to src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdftotext.1 diff --git a/src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdfunite.1 b/src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdfunite.1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/Library/share/man/man1/pdfunite.1 rename to src/lib/win32/poppler-21.10.0/Library/share/man/man1/pdfunite.1 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/CMakeLists.txt b/src/lib/win32/poppler-21.10.0/share/poppler/CMakeLists.txt similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/CMakeLists.txt rename to src/lib/win32/poppler-21.10.0/share/poppler/CMakeLists.txt diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/COPYING b/src/lib/win32/poppler-21.10.0/share/poppler/COPYING similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/COPYING rename to src/lib/win32/poppler-21.10.0/share/poppler/COPYING diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/COPYING.adobe b/src/lib/win32/poppler-21.10.0/share/poppler/COPYING.adobe similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/COPYING.adobe rename to src/lib/win32/poppler-21.10.0/share/poppler/COPYING.adobe diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/COPYING.gpl2 b/src/lib/win32/poppler-21.10.0/share/poppler/COPYING.gpl2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/COPYING.gpl2 rename to src/lib/win32/poppler-21.10.0/share/poppler/COPYING.gpl2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/Makefile b/src/lib/win32/poppler-21.10.0/share/poppler/Makefile similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/Makefile rename to src/lib/win32/poppler-21.10.0/share/poppler/Makefile diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/README b/src/lib/win32/poppler-21.10.0/share/poppler/README similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/README rename to src/lib/win32/poppler-21.10.0/share/poppler/README diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-0 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-0 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-0 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-0 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-1 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-1 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-1 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-2 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-2 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-3 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-3 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-3 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-3 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-4 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-4 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-4 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-4 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-5 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-5 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-5 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-5 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-6 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-6 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-6 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-6 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-7 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-7 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-7 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-7 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-B5pc b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-B5pc similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-B5pc rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-B5pc diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-ETen-B5 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-ETen-B5 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-ETen-B5 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-ETen-B5 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-CID b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-CID similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-CID rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-CID diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-Host b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-Host similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-Host rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-Host diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-Mac b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-Mac similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-Mac rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-Mac diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-UCS2 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-UCS2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-UCS2 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-UCS2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/B5-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/B5-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/B5-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/B5-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/B5-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/B5-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/B5-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/B5-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/B5pc-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/B5pc-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/B5pc-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/B5pc-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/B5pc-UCS2 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/B5pc-UCS2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/B5pc-UCS2 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/B5pc-UCS2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/B5pc-UCS2C b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/B5pc-UCS2C similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/B5pc-UCS2C rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/B5pc-UCS2C diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/B5pc-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/B5pc-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/B5pc-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/B5pc-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/CNS-EUC-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/CNS-EUC-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/CNS-EUC-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/CNS-EUC-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/CNS-EUC-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/CNS-EUC-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/CNS-EUC-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/CNS-EUC-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/CNS1-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/CNS1-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/CNS1-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/CNS1-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/CNS1-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/CNS1-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/CNS1-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/CNS1-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/CNS2-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/CNS2-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/CNS2-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/CNS2-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/CNS2-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/CNS2-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/CNS2-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/CNS2-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/ETHK-B5-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/ETHK-B5-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/ETHK-B5-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/ETHK-B5-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/ETHK-B5-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/ETHK-B5-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/ETHK-B5-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/ETHK-B5-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/ETen-B5-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/ETen-B5-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/ETen-B5-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/ETen-B5-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/ETen-B5-UCS2 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/ETen-B5-UCS2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/ETen-B5-UCS2 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/ETen-B5-UCS2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/ETen-B5-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/ETen-B5-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/ETen-B5-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/ETen-B5-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/ETenms-B5-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/ETenms-B5-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/ETenms-B5-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/ETenms-B5-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/ETenms-B5-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/ETenms-B5-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/ETenms-B5-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/ETenms-B5-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKdla-B5-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKdla-B5-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKdla-B5-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKdla-B5-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKdla-B5-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKdla-B5-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKdla-B5-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKdla-B5-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKdlb-B5-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKdlb-B5-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKdlb-B5-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKdlb-B5-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKdlb-B5-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKdlb-B5-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKdlb-B5-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKdlb-B5-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKgccs-B5-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKgccs-B5-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKgccs-B5-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKgccs-B5-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKgccs-B5-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKgccs-B5-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKgccs-B5-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKgccs-B5-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKm314-B5-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKm314-B5-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKm314-B5-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKm314-B5-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKm314-B5-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKm314-B5-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKm314-B5-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKm314-B5-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKm471-B5-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKm471-B5-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKm471-B5-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKm471-B5-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKm471-B5-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKm471-B5-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKm471-B5-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKm471-B5-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKscs-B5-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKscs-B5-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKscs-B5-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKscs-B5-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKscs-B5-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKscs-B5-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/HKscs-B5-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/HKscs-B5-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UCS2-B5pc b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UCS2-B5pc similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UCS2-B5pc rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UCS2-B5pc diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UCS2-ETen-B5 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UCS2-ETen-B5 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UCS2-ETen-B5 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UCS2-ETen-B5 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UCS2-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UCS2-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UCS2-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UCS2-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UCS2-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UCS2-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UCS2-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UCS2-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF16-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF16-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF16-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF16-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF16-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF16-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF16-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF16-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF32-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF32-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF32-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF32-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF32-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF32-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF32-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF32-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF8-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF8-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF8-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF8-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF8-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF8-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF8-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-CNS1/UniCNS-UTF8-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-0 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-0 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-0 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-0 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-1 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-1 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-1 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-2 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-2 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-3 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-3 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-3 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-3 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-4 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-4 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-4 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-4 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-5 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-5 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-5 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-5 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-GBK-EUC b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-GBK-EUC similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-GBK-EUC rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-GBK-EUC diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-GBpc-EUC b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-GBpc-EUC similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-GBpc-EUC rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-GBpc-EUC diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-CID b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-CID similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-CID rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-CID diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-Host b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-Host similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-Host rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-Host diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-Mac b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-Mac similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-Mac rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-Mac diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-UCS2 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-UCS2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-UCS2 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/Adobe-GB1-UCS2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GB-EUC-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GB-EUC-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GB-EUC-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GB-EUC-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GB-EUC-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GB-EUC-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GB-EUC-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GB-EUC-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GB-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GB-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GB-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GB-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GB-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GB-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GB-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GB-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBK-EUC-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBK-EUC-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBK-EUC-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBK-EUC-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBK-EUC-UCS2 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBK-EUC-UCS2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBK-EUC-UCS2 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBK-EUC-UCS2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBK-EUC-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBK-EUC-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBK-EUC-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBK-EUC-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBK2K-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBK2K-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBK2K-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBK2K-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBK2K-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBK2K-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBK2K-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBK2K-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBKp-EUC-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBKp-EUC-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBKp-EUC-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBKp-EUC-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBKp-EUC-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBKp-EUC-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBKp-EUC-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBKp-EUC-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBT-EUC-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBT-EUC-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBT-EUC-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBT-EUC-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBT-EUC-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBT-EUC-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBT-EUC-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBT-EUC-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBT-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBT-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBT-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBT-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBT-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBT-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBT-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBT-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBTpc-EUC-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBTpc-EUC-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBTpc-EUC-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBTpc-EUC-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBTpc-EUC-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBTpc-EUC-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBTpc-EUC-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBTpc-EUC-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBpc-EUC-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBpc-EUC-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBpc-EUC-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBpc-EUC-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBpc-EUC-UCS2 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBpc-EUC-UCS2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBpc-EUC-UCS2 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBpc-EUC-UCS2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBpc-EUC-UCS2C b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBpc-EUC-UCS2C similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBpc-EUC-UCS2C rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBpc-EUC-UCS2C diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBpc-EUC-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBpc-EUC-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/GBpc-EUC-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/GBpc-EUC-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UCS2-GBK-EUC b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UCS2-GBK-EUC similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UCS2-GBK-EUC rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UCS2-GBK-EUC diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UCS2-GBpc-EUC b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UCS2-GBpc-EUC similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UCS2-GBpc-EUC rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UCS2-GBpc-EUC diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UniGB-UCS2-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UniGB-UCS2-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UniGB-UCS2-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UniGB-UCS2-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UniGB-UCS2-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UniGB-UCS2-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UniGB-UCS2-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UniGB-UCS2-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF16-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF16-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF16-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF16-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF16-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF16-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF16-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF16-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF32-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF32-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF32-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF32-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF32-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF32-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF32-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF32-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF8-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF8-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF8-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF8-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF8-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF8-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF8-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-GB1/UniGB-UTF8-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/78-EUC-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/78-EUC-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/78-EUC-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/78-EUC-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/78-EUC-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/78-EUC-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/78-EUC-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/78-EUC-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/78-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/78-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/78-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/78-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/78-RKSJ-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/78-RKSJ-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/78-RKSJ-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/78-RKSJ-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/78-RKSJ-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/78-RKSJ-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/78-RKSJ-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/78-RKSJ-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/78-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/78-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/78-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/78-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/78ms-RKSJ-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/78ms-RKSJ-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/78ms-RKSJ-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/78ms-RKSJ-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/78ms-RKSJ-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/78ms-RKSJ-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/78ms-RKSJ-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/78ms-RKSJ-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/83pv-RKSJ-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/83pv-RKSJ-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/83pv-RKSJ-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/83pv-RKSJ-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-UCS2 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-UCS2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-UCS2 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-UCS2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/90msp-RKSJ-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/90msp-RKSJ-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/90msp-RKSJ-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/90msp-RKSJ-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/90msp-RKSJ-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/90msp-RKSJ-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/90msp-RKSJ-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/90msp-RKSJ-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-UCS2 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-UCS2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-UCS2 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-UCS2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-UCS2C b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-UCS2C similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-UCS2C rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-UCS2C diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Add-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Add-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Add-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Add-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Add-RKSJ-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Add-RKSJ-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Add-RKSJ-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Add-RKSJ-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Add-RKSJ-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Add-RKSJ-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Add-RKSJ-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Add-RKSJ-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Add-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Add-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Add-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Add-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-0 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-0 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-0 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-0 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-1 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-1 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-1 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-2 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-2 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-3 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-3 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-3 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-3 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-4 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-4 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-4 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-4 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-5 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-5 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-5 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-5 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-6 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-6 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-6 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-6 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-7 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-7 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-7 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-7 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-90ms-RKSJ b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-90ms-RKSJ similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-90ms-RKSJ rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-90ms-RKSJ diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-90pv-RKSJ b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-90pv-RKSJ similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-90pv-RKSJ rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-90pv-RKSJ diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-CID b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-CID similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-CID rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-CID diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-Host b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-Host similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-Host rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-Host diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-Mac b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-Mac similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-Mac rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-Mac diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-PS-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-PS-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-PS-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-PS-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-PS-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-PS-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-PS-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-PS-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-UCS2 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-UCS2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-UCS2 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-UCS2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/EUC-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/EUC-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/EUC-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/EUC-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/EUC-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/EUC-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/EUC-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/EUC-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Ext-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Ext-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Ext-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Ext-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Ext-RKSJ-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Ext-RKSJ-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Ext-RKSJ-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Ext-RKSJ-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Ext-RKSJ-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Ext-RKSJ-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Ext-RKSJ-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Ext-RKSJ-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Ext-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Ext-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Ext-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Ext-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Hankaku b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Hankaku similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Hankaku rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Hankaku diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Hiragana b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Hiragana similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Hiragana rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Hiragana diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Hojo-EUC-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Hojo-EUC-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Hojo-EUC-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Hojo-EUC-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Hojo-EUC-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Hojo-EUC-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Hojo-EUC-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Hojo-EUC-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Hojo-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Hojo-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Hojo-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Hojo-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Hojo-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Hojo-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Hojo-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Hojo-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Katakana b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Katakana similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Katakana rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Katakana diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/NWP-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/NWP-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/NWP-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/NWP-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/NWP-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/NWP-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/NWP-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/NWP-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/RKSJ-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/RKSJ-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/RKSJ-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/RKSJ-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/RKSJ-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/RKSJ-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/RKSJ-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/RKSJ-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Roman b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Roman similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/Roman rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/Roman diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UCS2-90ms-RKSJ b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UCS2-90ms-RKSJ similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UCS2-90ms-RKSJ rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UCS2-90ms-RKSJ diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UCS2-90pv-RKSJ b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UCS2-90pv-RKSJ similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UCS2-90pv-RKSJ rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UCS2-90pv-RKSJ diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UCS2-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UCS2-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UCS2-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UCS2-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UCS2-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UCS2-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UCS2-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UCS2-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF16-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF16-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF16-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF16-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF16-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF16-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF16-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF16-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF32-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF32-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF32-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF32-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF32-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF32-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF32-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF32-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF8-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF8-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF8-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF8-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF8-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF8-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF8-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniHojo-UTF8-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-HW-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-HW-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-HW-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-HW-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-HW-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-HW-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-HW-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-HW-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UCS2-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF16-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF16-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF16-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF16-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF16-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF16-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF16-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF16-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF32-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF32-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF32-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF32-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF32-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF32-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF32-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF32-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF8-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF8-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF8-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF8-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF8-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF8-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF8-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS-UTF8-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF16-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF16-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF16-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF16-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF16-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF16-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF16-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF16-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF32-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF32-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF32-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF32-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF32-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF32-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF32-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF32-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF8-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF8-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF8-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF8-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF8-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF8-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF8-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJIS2004-UTF8-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJISPro-UCS2-HW-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJISPro-UCS2-HW-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJISPro-UCS2-HW-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJISPro-UCS2-HW-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJISPro-UCS2-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJISPro-UCS2-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJISPro-UCS2-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJISPro-UCS2-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJISPro-UTF8-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJISPro-UTF8-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJISPro-UTF8-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJISPro-UTF8-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJISX0213-UTF32-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJISX0213-UTF32-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJISX0213-UTF32-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJISX0213-UTF32-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJISX0213-UTF32-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJISX0213-UTF32-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJISX0213-UTF32-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJISX0213-UTF32-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJISX02132004-UTF32-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJISX02132004-UTF32-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJISX02132004-UTF32-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJISX02132004-UTF32-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJISX02132004-UTF32-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJISX02132004-UTF32-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/UniJISX02132004-UTF32-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/UniJISX02132004-UTF32-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/WP-Symbol b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/WP-Symbol similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan1/WP-Symbol rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan1/WP-Symbol diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan2/Adobe-Japan2-0 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan2/Adobe-Japan2-0 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Japan2/Adobe-Japan2-0 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Japan2/Adobe-Japan2-0 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-0 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-0 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-0 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-0 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-1 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-1 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-1 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-2 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-2 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-3 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-3 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-3 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-3 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-4 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-4 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-4 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-4 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-5 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-5 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-5 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-5 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-6 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-6 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-6 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-6 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-7 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-7 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-7 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-7 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-8 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-8 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-8 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-8 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-9 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-9 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-9 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-9 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-UCS2 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-UCS2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/Adobe-KR-UCS2 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/Adobe-KR-UCS2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/UniAKR-UTF16-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/UniAKR-UTF16-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/UniAKR-UTF16-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/UniAKR-UTF16-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/UniAKR-UTF32-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/UniAKR-UTF32-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/UniAKR-UTF32-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/UniAKR-UTF32-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/UniAKR-UTF8-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/UniAKR-UTF8-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-KR/UniAKR-UTF8-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-KR/UniAKR-UTF8-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-0 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-0 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-0 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-0 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-1 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-1 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-1 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-2 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-2 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-CID b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-CID similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-CID rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-CID diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-Host b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-Host similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-Host rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-Host diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-Mac b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-Mac similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-Mac rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-Mac diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-KSCms-UHC b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-KSCms-UHC similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-KSCms-UHC rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-KSCms-UHC diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-KSCpc-EUC b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-KSCpc-EUC similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-KSCpc-EUC rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-KSCpc-EUC diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-UCS2 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-UCS2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-UCS2 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-UCS2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSC-EUC-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSC-EUC-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSC-EUC-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSC-EUC-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSC-EUC-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSC-EUC-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSC-EUC-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSC-EUC-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSC-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSC-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSC-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSC-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSC-Johab-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSC-Johab-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSC-Johab-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSC-Johab-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSC-Johab-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSC-Johab-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSC-Johab-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSC-Johab-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSC-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSC-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSC-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSC-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-HW-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-HW-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-HW-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-HW-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-HW-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-HW-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-HW-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-HW-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-UCS2 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-UCS2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-UCS2 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-UCS2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSCms-UHC-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-UCS2 b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-UCS2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-UCS2 rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-UCS2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-UCS2C b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-UCS2C similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-UCS2C rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-UCS2C diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UCS2-KSCms-UHC b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UCS2-KSCms-UHC similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UCS2-KSCms-UHC rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UCS2-KSCms-UHC diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UCS2-KSCpc-EUC b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UCS2-KSCpc-EUC similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UCS2-KSCpc-EUC rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UCS2-KSCpc-EUC diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UniKS-UCS2-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UniKS-UCS2-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UniKS-UCS2-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UniKS-UCS2-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UniKS-UCS2-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UniKS-UCS2-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UniKS-UCS2-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UniKS-UCS2-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF16-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF16-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF16-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF16-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF16-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF16-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF16-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF16-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF32-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF32-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF32-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF32-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF32-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF32-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF32-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF32-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF8-H b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF8-H similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF8-H rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF8-H diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF8-V b/src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF8-V similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF8-V rename to src/lib/win32/poppler-21.10.0/share/poppler/cMap/Adobe-Korea1/UniKS-UTF8-V diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cidToUnicode/Adobe-CNS1 b/src/lib/win32/poppler-21.10.0/share/poppler/cidToUnicode/Adobe-CNS1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cidToUnicode/Adobe-CNS1 rename to src/lib/win32/poppler-21.10.0/share/poppler/cidToUnicode/Adobe-CNS1 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cidToUnicode/Adobe-GB1 b/src/lib/win32/poppler-21.10.0/share/poppler/cidToUnicode/Adobe-GB1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cidToUnicode/Adobe-GB1 rename to src/lib/win32/poppler-21.10.0/share/poppler/cidToUnicode/Adobe-GB1 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cidToUnicode/Adobe-Japan1 b/src/lib/win32/poppler-21.10.0/share/poppler/cidToUnicode/Adobe-Japan1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cidToUnicode/Adobe-Japan1 rename to src/lib/win32/poppler-21.10.0/share/poppler/cidToUnicode/Adobe-Japan1 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/cidToUnicode/Adobe-Korea1 b/src/lib/win32/poppler-21.10.0/share/poppler/cidToUnicode/Adobe-Korea1 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/cidToUnicode/Adobe-Korea1 rename to src/lib/win32/poppler-21.10.0/share/poppler/cidToUnicode/Adobe-Korea1 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/nameToUnicode/Bulgarian b/src/lib/win32/poppler-21.10.0/share/poppler/nameToUnicode/Bulgarian similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/nameToUnicode/Bulgarian rename to src/lib/win32/poppler-21.10.0/share/poppler/nameToUnicode/Bulgarian diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/nameToUnicode/Greek b/src/lib/win32/poppler-21.10.0/share/poppler/nameToUnicode/Greek similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/nameToUnicode/Greek rename to src/lib/win32/poppler-21.10.0/share/poppler/nameToUnicode/Greek diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/nameToUnicode/Thai b/src/lib/win32/poppler-21.10.0/share/poppler/nameToUnicode/Thai similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/nameToUnicode/Thai rename to src/lib/win32/poppler-21.10.0/share/poppler/nameToUnicode/Thai diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/poppler-data.pc b/src/lib/win32/poppler-21.10.0/share/poppler/poppler-data.pc similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/poppler-data.pc rename to src/lib/win32/poppler-21.10.0/share/poppler/poppler-data.pc diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/poppler-data.pc.in b/src/lib/win32/poppler-21.10.0/share/poppler/poppler-data.pc.in similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/poppler-data.pc.in rename to src/lib/win32/poppler-21.10.0/share/poppler/poppler-data.pc.in diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/Big5 b/src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/Big5 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/Big5 rename to src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/Big5 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/Big5ascii b/src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/Big5ascii similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/Big5ascii rename to src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/Big5ascii diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/EUC-CN b/src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/EUC-CN similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/EUC-CN rename to src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/EUC-CN diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/EUC-JP b/src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/EUC-JP similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/EUC-JP rename to src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/EUC-JP diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/GBK b/src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/GBK similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/GBK rename to src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/GBK diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/ISO-2022-CN b/src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/ISO-2022-CN similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/ISO-2022-CN rename to src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/ISO-2022-CN diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/ISO-2022-JP b/src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/ISO-2022-JP similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/ISO-2022-JP rename to src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/ISO-2022-JP diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/ISO-2022-KR b/src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/ISO-2022-KR similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/ISO-2022-KR rename to src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/ISO-2022-KR diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/ISO-8859-6 b/src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/ISO-8859-6 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/ISO-8859-6 rename to src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/ISO-8859-6 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/ISO-8859-7 b/src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/ISO-8859-7 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/ISO-8859-7 rename to src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/ISO-8859-7 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/ISO-8859-8 b/src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/ISO-8859-8 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/ISO-8859-8 rename to src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/ISO-8859-8 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/ISO-8859-9 b/src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/ISO-8859-9 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/ISO-8859-9 rename to src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/ISO-8859-9 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/KOI8-R b/src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/KOI8-R similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/KOI8-R rename to src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/KOI8-R diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/Latin2 b/src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/Latin2 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/Latin2 rename to src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/Latin2 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/Shift-JIS b/src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/Shift-JIS similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/Shift-JIS rename to src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/Shift-JIS diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/TIS-620 b/src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/TIS-620 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/TIS-620 rename to src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/TIS-620 diff --git a/src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/Windows-1255 b/src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/Windows-1255 similarity index 100% rename from src/lib/win32/poppler-21.09.0/share/poppler/unicodeMap/Windows-1255 rename to src/lib/win32/poppler-21.10.0/share/poppler/unicodeMap/Windows-1255