diff --git a/src/index.js b/src/index.js index ef15046c..7da866ab 100644 --- a/src/index.js +++ b/src/index.js @@ -60,7 +60,7 @@ class Poppler { __dirname, 'lib', 'win32', - 'poppler-20.10.0', + 'poppler-20.11.0', 'bin' ); break; diff --git a/src/index.test.js b/src/index.test.js index 0effd046..1ecd5d40 100644 --- a/src/index.test.js +++ b/src/index.test.js @@ -33,7 +33,7 @@ switch (platform) { __dirname, 'lib', 'win32', - 'poppler-20.10.0', + 'poppler-20.11.0', 'bin' ); break; @@ -88,11 +88,7 @@ describe('pdfAttach function', () => { const attachmentFile = `${testDirectory}test.txt`; const outputFile = `${testDirectory}pdf_1.3_NHS_Constitution_attached.pdf`; - const res = await poppler.pdfAttach( - file, - attachmentFile, - outputFile - ); + const res = await poppler.pdfAttach(file, attachmentFile, outputFile); expect(typeof res).toBe('string'); expect( @@ -629,7 +625,7 @@ describe('pdfToPpm function', () => { middlePageToConvert: 'test' }; - await poppler.pdfToPpm(undefined, undefined ,options).catch((err) => { + await poppler.pdfToPpm(undefined, undefined, options).catch((err) => { expect(err.message).toEqual( "Invalid option provided 'middlePageToConvert'" ); diff --git a/src/lib/win32/poppler-20.10.0/bin/libtiff.dll b/src/lib/win32/poppler-20.10.0/bin/libtiff.dll deleted file mode 100644 index 52f542aa..00000000 Binary files a/src/lib/win32/poppler-20.10.0/bin/libtiff.dll and /dev/null differ diff --git a/src/lib/win32/poppler-20.10.0/bin/libtiffxx.dll b/src/lib/win32/poppler-20.10.0/bin/libtiffxx.dll deleted file mode 100644 index 81d11a95..00000000 Binary files a/src/lib/win32/poppler-20.10.0/bin/libtiffxx.dll and /dev/null differ diff --git a/src/lib/win32/poppler-20.10.0/bin/pdftohtml.exe b/src/lib/win32/poppler-20.10.0/bin/pdftohtml.exe deleted file mode 100644 index 74e94ffe..00000000 Binary files a/src/lib/win32/poppler-20.10.0/bin/pdftohtml.exe and /dev/null differ diff --git a/src/lib/win32/poppler-20.10.0/bin/poppler-cpp.dll b/src/lib/win32/poppler-20.10.0/bin/poppler-cpp.dll deleted file mode 100644 index 27adccc5..00000000 Binary files a/src/lib/win32/poppler-20.10.0/bin/poppler-cpp.dll and /dev/null differ diff --git a/src/lib/win32/poppler-20.10.0/bin/tiff.dll b/src/lib/win32/poppler-20.10.0/bin/tiff.dll deleted file mode 100644 index 52f542aa..00000000 Binary files a/src/lib/win32/poppler-20.10.0/bin/tiff.dll and /dev/null differ diff --git a/src/lib/win32/poppler-20.10.0/bin/cairo.dll b/src/lib/win32/poppler-20.11.0/bin/cairo.dll similarity index 99% rename from src/lib/win32/poppler-20.10.0/bin/cairo.dll rename to src/lib/win32/poppler-20.11.0/bin/cairo.dll index 198d1dfe..2ca91b64 100644 Binary files a/src/lib/win32/poppler-20.10.0/bin/cairo.dll and b/src/lib/win32/poppler-20.11.0/bin/cairo.dll differ diff --git a/src/lib/win32/poppler-20.10.0/bin/freetype.dll b/src/lib/win32/poppler-20.11.0/bin/freetype.dll similarity index 80% rename from src/lib/win32/poppler-20.10.0/bin/freetype.dll rename to src/lib/win32/poppler-20.11.0/bin/freetype.dll index 4925cf24..77815546 100644 Binary files a/src/lib/win32/poppler-20.10.0/bin/freetype.dll and b/src/lib/win32/poppler-20.11.0/bin/freetype.dll differ diff --git a/src/lib/win32/poppler-20.10.0/bin/libcrypto-1_1-x64.dll b/src/lib/win32/poppler-20.11.0/bin/libcrypto-1_1-x64.dll similarity index 100% rename from src/lib/win32/poppler-20.10.0/bin/libcrypto-1_1-x64.dll rename to src/lib/win32/poppler-20.11.0/bin/libcrypto-1_1-x64.dll diff --git a/src/lib/win32/poppler-20.10.0/bin/libcurl.dll b/src/lib/win32/poppler-20.11.0/bin/libcurl.dll similarity index 100% rename from src/lib/win32/poppler-20.10.0/bin/libcurl.dll rename to src/lib/win32/poppler-20.11.0/bin/libcurl.dll diff --git a/src/lib/win32/poppler-20.10.0/bin/liblzma.dll b/src/lib/win32/poppler-20.11.0/bin/liblzma.dll similarity index 100% rename from src/lib/win32/poppler-20.10.0/bin/liblzma.dll rename to src/lib/win32/poppler-20.11.0/bin/liblzma.dll diff --git a/src/lib/win32/poppler-20.10.0/bin/libpng16.dll b/src/lib/win32/poppler-20.11.0/bin/libpng16.dll similarity index 99% rename from src/lib/win32/poppler-20.10.0/bin/libpng16.dll rename to src/lib/win32/poppler-20.11.0/bin/libpng16.dll index 3c662c37..95250ba9 100644 Binary files a/src/lib/win32/poppler-20.10.0/bin/libpng16.dll and b/src/lib/win32/poppler-20.11.0/bin/libpng16.dll differ diff --git a/src/lib/win32/poppler-20.10.0/bin/libssh2.dll b/src/lib/win32/poppler-20.11.0/bin/libssh2.dll similarity index 100% rename from src/lib/win32/poppler-20.10.0/bin/libssh2.dll rename to src/lib/win32/poppler-20.11.0/bin/libssh2.dll diff --git a/src/lib/win32/poppler-20.11.0/bin/libtiff.dll b/src/lib/win32/poppler-20.11.0/bin/libtiff.dll new file mode 100644 index 00000000..3af6bfe0 Binary files /dev/null and b/src/lib/win32/poppler-20.11.0/bin/libtiff.dll differ diff --git a/src/lib/win32/poppler-20.11.0/bin/libtiffxx.dll b/src/lib/win32/poppler-20.11.0/bin/libtiffxx.dll new file mode 100644 index 00000000..fa4310d1 Binary files /dev/null and b/src/lib/win32/poppler-20.11.0/bin/libtiffxx.dll differ diff --git a/src/lib/win32/poppler-20.10.0/bin/libzstd.dll b/src/lib/win32/poppler-20.11.0/bin/libzstd.dll similarity index 100% rename from src/lib/win32/poppler-20.10.0/bin/libzstd.dll rename to src/lib/win32/poppler-20.11.0/bin/libzstd.dll diff --git a/src/lib/win32/poppler-20.10.0/bin/openjp2.dll b/src/lib/win32/poppler-20.11.0/bin/openjp2.dll similarity index 100% rename from src/lib/win32/poppler-20.10.0/bin/openjp2.dll rename to src/lib/win32/poppler-20.11.0/bin/openjp2.dll diff --git a/src/lib/win32/poppler-20.10.0/bin/pdfattach.exe b/src/lib/win32/poppler-20.11.0/bin/pdfattach.exe similarity index 98% rename from src/lib/win32/poppler-20.10.0/bin/pdfattach.exe rename to src/lib/win32/poppler-20.11.0/bin/pdfattach.exe index d42d4c25..fb889f40 100644 Binary files a/src/lib/win32/poppler-20.10.0/bin/pdfattach.exe and b/src/lib/win32/poppler-20.11.0/bin/pdfattach.exe differ diff --git a/src/lib/win32/poppler-20.10.0/bin/pdfdetach.exe b/src/lib/win32/poppler-20.11.0/bin/pdfdetach.exe similarity index 98% rename from src/lib/win32/poppler-20.10.0/bin/pdfdetach.exe rename to src/lib/win32/poppler-20.11.0/bin/pdfdetach.exe index 829e7044..692f2bc1 100644 Binary files a/src/lib/win32/poppler-20.10.0/bin/pdfdetach.exe and b/src/lib/win32/poppler-20.11.0/bin/pdfdetach.exe differ diff --git a/src/lib/win32/poppler-20.10.0/bin/pdffonts.exe b/src/lib/win32/poppler-20.11.0/bin/pdffonts.exe similarity index 98% rename from src/lib/win32/poppler-20.10.0/bin/pdffonts.exe rename to src/lib/win32/poppler-20.11.0/bin/pdffonts.exe index 98abfe83..b4192ddc 100644 Binary files a/src/lib/win32/poppler-20.10.0/bin/pdffonts.exe and b/src/lib/win32/poppler-20.11.0/bin/pdffonts.exe differ diff --git a/src/lib/win32/poppler-20.10.0/bin/pdfimages.exe b/src/lib/win32/poppler-20.11.0/bin/pdfimages.exe similarity index 98% rename from src/lib/win32/poppler-20.10.0/bin/pdfimages.exe rename to src/lib/win32/poppler-20.11.0/bin/pdfimages.exe index 9d02fc01..cdde8b74 100644 Binary files a/src/lib/win32/poppler-20.10.0/bin/pdfimages.exe and b/src/lib/win32/poppler-20.11.0/bin/pdfimages.exe differ diff --git a/src/lib/win32/poppler-20.10.0/bin/pdfinfo.exe b/src/lib/win32/poppler-20.11.0/bin/pdfinfo.exe similarity index 99% rename from src/lib/win32/poppler-20.10.0/bin/pdfinfo.exe rename to src/lib/win32/poppler-20.11.0/bin/pdfinfo.exe index 0283d969..0c5f6b13 100644 Binary files a/src/lib/win32/poppler-20.10.0/bin/pdfinfo.exe and b/src/lib/win32/poppler-20.11.0/bin/pdfinfo.exe differ diff --git a/src/lib/win32/poppler-20.10.0/bin/pdfseparate.exe b/src/lib/win32/poppler-20.11.0/bin/pdfseparate.exe similarity index 98% rename from src/lib/win32/poppler-20.10.0/bin/pdfseparate.exe rename to src/lib/win32/poppler-20.11.0/bin/pdfseparate.exe index dcfc9400..7a642b8f 100644 Binary files a/src/lib/win32/poppler-20.10.0/bin/pdfseparate.exe and b/src/lib/win32/poppler-20.11.0/bin/pdfseparate.exe differ diff --git a/src/lib/win32/poppler-20.10.0/bin/pdftocairo.exe b/src/lib/win32/poppler-20.11.0/bin/pdftocairo.exe similarity index 98% rename from src/lib/win32/poppler-20.10.0/bin/pdftocairo.exe rename to src/lib/win32/poppler-20.11.0/bin/pdftocairo.exe index 035d004f..eeef7d08 100644 Binary files a/src/lib/win32/poppler-20.10.0/bin/pdftocairo.exe and b/src/lib/win32/poppler-20.11.0/bin/pdftocairo.exe differ diff --git a/src/lib/win32/poppler-20.11.0/bin/pdftohtml.exe b/src/lib/win32/poppler-20.11.0/bin/pdftohtml.exe new file mode 100644 index 00000000..792ccdd8 Binary files /dev/null and b/src/lib/win32/poppler-20.11.0/bin/pdftohtml.exe differ diff --git a/src/lib/win32/poppler-20.10.0/bin/pdftoppm.exe b/src/lib/win32/poppler-20.11.0/bin/pdftoppm.exe similarity index 97% rename from src/lib/win32/poppler-20.10.0/bin/pdftoppm.exe rename to src/lib/win32/poppler-20.11.0/bin/pdftoppm.exe index 6dee1163..302a4d24 100644 Binary files a/src/lib/win32/poppler-20.10.0/bin/pdftoppm.exe and b/src/lib/win32/poppler-20.11.0/bin/pdftoppm.exe differ diff --git a/src/lib/win32/poppler-20.10.0/bin/pdftops.exe b/src/lib/win32/poppler-20.11.0/bin/pdftops.exe similarity index 98% rename from src/lib/win32/poppler-20.10.0/bin/pdftops.exe rename to src/lib/win32/poppler-20.11.0/bin/pdftops.exe index 393f3794..9bc33868 100644 Binary files a/src/lib/win32/poppler-20.10.0/bin/pdftops.exe and b/src/lib/win32/poppler-20.11.0/bin/pdftops.exe differ diff --git a/src/lib/win32/poppler-20.10.0/bin/pdftotext.exe b/src/lib/win32/poppler-20.11.0/bin/pdftotext.exe similarity index 93% rename from src/lib/win32/poppler-20.10.0/bin/pdftotext.exe rename to src/lib/win32/poppler-20.11.0/bin/pdftotext.exe index 963f9479..03173c6e 100644 Binary files a/src/lib/win32/poppler-20.10.0/bin/pdftotext.exe and b/src/lib/win32/poppler-20.11.0/bin/pdftotext.exe differ diff --git a/src/lib/win32/poppler-20.10.0/bin/pdfunite.exe b/src/lib/win32/poppler-20.11.0/bin/pdfunite.exe similarity index 96% rename from src/lib/win32/poppler-20.10.0/bin/pdfunite.exe rename to src/lib/win32/poppler-20.11.0/bin/pdfunite.exe index 345f1aaa..ea11e7d1 100644 Binary files a/src/lib/win32/poppler-20.10.0/bin/pdfunite.exe and b/src/lib/win32/poppler-20.11.0/bin/pdfunite.exe differ diff --git a/src/lib/win32/poppler-20.11.0/bin/poppler-cpp.dll b/src/lib/win32/poppler-20.11.0/bin/poppler-cpp.dll new file mode 100644 index 00000000..fbc86778 Binary files /dev/null and b/src/lib/win32/poppler-20.11.0/bin/poppler-cpp.dll differ diff --git a/src/lib/win32/poppler-20.10.0/bin/poppler.dll b/src/lib/win32/poppler-20.11.0/bin/poppler.dll similarity index 54% rename from src/lib/win32/poppler-20.10.0/bin/poppler.dll rename to src/lib/win32/poppler-20.11.0/bin/poppler.dll index 86b672dd..3225a6f6 100644 Binary files a/src/lib/win32/poppler-20.10.0/bin/poppler.dll and b/src/lib/win32/poppler-20.11.0/bin/poppler.dll differ diff --git a/src/lib/win32/poppler-20.11.0/bin/tiff.dll b/src/lib/win32/poppler-20.11.0/bin/tiff.dll new file mode 100644 index 00000000..3af6bfe0 Binary files /dev/null and b/src/lib/win32/poppler-20.11.0/bin/tiff.dll differ diff --git a/src/lib/win32/poppler-20.10.0/bin/zlib.dll b/src/lib/win32/poppler-20.11.0/bin/zlib.dll similarity index 99% rename from src/lib/win32/poppler-20.10.0/bin/zlib.dll rename to src/lib/win32/poppler-20.11.0/bin/zlib.dll index 74a15705..4de28fa2 100644 Binary files a/src/lib/win32/poppler-20.10.0/bin/zlib.dll and b/src/lib/win32/poppler-20.11.0/bin/zlib.dll differ diff --git a/src/lib/win32/poppler-20.10.0/bin/zstd.dll b/src/lib/win32/poppler-20.11.0/bin/zstd.dll similarity index 100% rename from src/lib/win32/poppler-20.10.0/bin/zstd.dll rename to src/lib/win32/poppler-20.11.0/bin/zstd.dll diff --git a/src/lib/win32/poppler-20.10.0/share/man/man1/pdfattach.1 b/src/lib/win32/poppler-20.11.0/share/man/man1/pdfattach.1 similarity index 100% rename from src/lib/win32/poppler-20.10.0/share/man/man1/pdfattach.1 rename to src/lib/win32/poppler-20.11.0/share/man/man1/pdfattach.1 diff --git a/src/lib/win32/poppler-20.10.0/share/man/man1/pdfdetach.1 b/src/lib/win32/poppler-20.11.0/share/man/man1/pdfdetach.1 similarity index 100% rename from src/lib/win32/poppler-20.10.0/share/man/man1/pdfdetach.1 rename to src/lib/win32/poppler-20.11.0/share/man/man1/pdfdetach.1 diff --git a/src/lib/win32/poppler-20.10.0/share/man/man1/pdffonts.1 b/src/lib/win32/poppler-20.11.0/share/man/man1/pdffonts.1 similarity index 100% rename from src/lib/win32/poppler-20.10.0/share/man/man1/pdffonts.1 rename to src/lib/win32/poppler-20.11.0/share/man/man1/pdffonts.1 diff --git a/src/lib/win32/poppler-20.10.0/share/man/man1/pdfimages.1 b/src/lib/win32/poppler-20.11.0/share/man/man1/pdfimages.1 similarity index 100% rename from src/lib/win32/poppler-20.10.0/share/man/man1/pdfimages.1 rename to src/lib/win32/poppler-20.11.0/share/man/man1/pdfimages.1 diff --git a/src/lib/win32/poppler-20.10.0/share/man/man1/pdfinfo.1 b/src/lib/win32/poppler-20.11.0/share/man/man1/pdfinfo.1 similarity index 100% rename from src/lib/win32/poppler-20.10.0/share/man/man1/pdfinfo.1 rename to src/lib/win32/poppler-20.11.0/share/man/man1/pdfinfo.1 diff --git a/src/lib/win32/poppler-20.10.0/share/man/man1/pdfseparate.1 b/src/lib/win32/poppler-20.11.0/share/man/man1/pdfseparate.1 similarity index 100% rename from src/lib/win32/poppler-20.10.0/share/man/man1/pdfseparate.1 rename to src/lib/win32/poppler-20.11.0/share/man/man1/pdfseparate.1 diff --git a/src/lib/win32/poppler-20.10.0/share/man/man1/pdftocairo.1 b/src/lib/win32/poppler-20.11.0/share/man/man1/pdftocairo.1 similarity index 100% rename from src/lib/win32/poppler-20.10.0/share/man/man1/pdftocairo.1 rename to src/lib/win32/poppler-20.11.0/share/man/man1/pdftocairo.1 diff --git a/src/lib/win32/poppler-20.10.0/share/man/man1/pdftohtml.1 b/src/lib/win32/poppler-20.11.0/share/man/man1/pdftohtml.1 similarity index 100% rename from src/lib/win32/poppler-20.10.0/share/man/man1/pdftohtml.1 rename to src/lib/win32/poppler-20.11.0/share/man/man1/pdftohtml.1 diff --git a/src/lib/win32/poppler-20.10.0/share/man/man1/pdftoppm.1 b/src/lib/win32/poppler-20.11.0/share/man/man1/pdftoppm.1 similarity index 100% rename from src/lib/win32/poppler-20.10.0/share/man/man1/pdftoppm.1 rename to src/lib/win32/poppler-20.11.0/share/man/man1/pdftoppm.1 diff --git a/src/lib/win32/poppler-20.10.0/share/man/man1/pdftops.1 b/src/lib/win32/poppler-20.11.0/share/man/man1/pdftops.1 similarity index 100% rename from src/lib/win32/poppler-20.10.0/share/man/man1/pdftops.1 rename to src/lib/win32/poppler-20.11.0/share/man/man1/pdftops.1 diff --git a/src/lib/win32/poppler-20.10.0/share/man/man1/pdftotext.1 b/src/lib/win32/poppler-20.11.0/share/man/man1/pdftotext.1 similarity index 100% rename from src/lib/win32/poppler-20.10.0/share/man/man1/pdftotext.1 rename to src/lib/win32/poppler-20.11.0/share/man/man1/pdftotext.1 diff --git a/src/lib/win32/poppler-20.10.0/share/man/man1/pdfunite.1 b/src/lib/win32/poppler-20.11.0/share/man/man1/pdfunite.1 similarity index 100% rename from src/lib/win32/poppler-20.10.0/share/man/man1/pdfunite.1 rename to src/lib/win32/poppler-20.11.0/share/man/man1/pdfunite.1