node-poppler 5.1.1 → 5.1.4

package/src/lib/win32/{poppler-21.11.0 → poppler-22.04.0}/Library/include/poppler/goo/GooString.h

@@ -17,7 +17,7 @@
 //
 // Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
-// Copyright (C) 2008-2010, 2012, 2014, 2017-2021 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008-2010, 2012, 2014, 2017-2022 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2012-2014 Fabio D'Urso <fabiodurso@hotmail.it>
 // Copyright (C) 2013 Jason Crain <jason@aquaticape.us>
 // Copyright (C) 2015, 2018 Adam Reichold <adam.reichold@t-online.de>
@@ -29,6 +29,7 @@
 // Copyright (C) 2019, 2020 Oliver Sander <oliver.sander@tu-dresden.de>
 // Copyright (C) 2019 Hans-Ulrich Jüttner <huj@froreich-bioscientia.de>
 // Copyright (C) 2020 Thorsten Behrens <Thorsten.Behrens@CIB.de>
+// Copyright (C) 2022 Even Rouault <even.rouault@spatialys.com>
 //
 // 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
@@ -41,6 +42,7 @@
 #include "poppler_private_export.h"
 
 #include <cstdarg>
+#include <memory>
 #include <string>
 
 #ifdef __clang__
@@ -49,7 +51,7 @@
 #    define GOOSTRING_FORMAT
 #endif
 
-class POPPLER_PRIVATE_EXPORT GooString : private std::string
+class GooString : private std::string
 {
 public:
     // Create an empty string.
@@ -138,8 +140,8 @@ public:
     //     t -- GooString *
     //     w -- blank space; arg determines width
     // To get literal curly braces, use {{ or }}.
-    static GooString *format(const char *fmt, ...) GOOSTRING_FORMAT;
-    static GooString *formatv(const char *fmt, va_list argList);
+    POPPLER_PRIVATE_EXPORT static std::unique_ptr<GooString> format(const char *fmt, ...) GOOSTRING_FORMAT;
+    POPPLER_PRIVATE_EXPORT static std::unique_ptr<GooString> formatv(const char *fmt, va_list argList);
 
     // Get length.
     int getLength() const { return size(); }
@@ -188,8 +190,8 @@ public:
     }
 
     // Append a formatted string.
-    GooString *appendf(const char *fmt, ...) GOOSTRING_FORMAT;
-    GooString *appendfv(const char *fmt, va_list argList);
+    POPPLER_PRIVATE_EXPORT GooString *appendf(const char *fmt, ...) GOOSTRING_FORMAT;
+    POPPLER_PRIVATE_EXPORT GooString *appendfv(const char *fmt, va_list argList);
 
     // Insert a character or string.
     GooString *insert(int i, char c)
@@ -221,7 +223,11 @@ public:
     }
 
     // Convert string to all-lower case.
-    GooString *lowerCase();
+    POPPLER_PRIVATE_EXPORT GooString *lowerCase();
+    POPPLER_PRIVATE_EXPORT static void lowerCase(std::string &s);
+
+    // Returns a new string converted to all-lower case.
+    POPPLER_PRIVATE_EXPORT static std::string toLowerCase(const std::string &s);
 
     // Compare two strings:  -1:<  0:=  +1:>
     int cmp(const GooString *str) const { return compare(*str); }
@@ -231,9 +237,12 @@ public:
     int cmpN(const char *sA, int n) const { return compare(0, n, sA); }
 
     // Return true if strings starts with prefix
-    bool startsWith(const char *prefix) const;
+    POPPLER_PRIVATE_EXPORT bool startsWith(const char *prefix) const;
     // Return true if string ends with suffix
-    bool endsWith(const char *suffix) const;
+    POPPLER_PRIVATE_EXPORT bool endsWith(const char *suffix) const;
+
+    static bool startsWith(std::string_view str, std::string_view prefix) { return str.size() >= prefix.size() && 0 == str.compare(0, prefix.size(), prefix); }
+    static bool endsWith(std::string_view str, std::string_view suffix) { return str.size() >= suffix.size() && 0 == str.compare(str.size() - suffix.size(), suffix.size(), suffix); }
 
     bool hasUnicodeMarker() const { return hasUnicodeMarker(*this); }
     static bool hasUnicodeMarker(const std::string &s) { return s.size() >= 2 && s[0] == '\xfe' && s[1] == '\xff'; }
@@ -241,13 +250,13 @@ public:
     static bool hasUnicodeMarkerLE(const std::string &s) { return s.size() >= 2 && s[0] == '\xff' && s[1] == '\xfe'; }
     bool hasJustUnicodeMarker() const { return size() == 2 && hasUnicodeMarker(); }
 
-    void prependUnicodeMarker();
+    POPPLER_PRIVATE_EXPORT void prependUnicodeMarker();
 
     // Sanitizes the string so that it does
     // not contain any ( ) < > [ ] { } / %
     // The postscript mode also has some more strict checks
     // The caller owns the return value
-    GooString *sanitizedName(bool psmode) const;
+    POPPLER_PRIVATE_EXPORT GooString *sanitizedName(bool psmode) const;
 };
 
 #endif

package/src/lib/win32/{poppler-21.11.0 → poppler-22.04.0}/Library/include/poppler/goo/gdir.h

@@ -16,7 +16,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2009, 2011, 2012, 2017, 2018, 2021 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2011, 2012, 2017, 2018, 2021, 2022 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
 // Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
 // Copyright (C) 2013, 2017 Adrian Johnson <ajohnson@redneon.com>
@@ -37,8 +37,16 @@
 
 #include "poppler-config.h"
 
+#include <memory>
+
 class GooString;
 
+#if defined(_WIN32)
+#    include <windows.h>
+#else
+#    include <dirent.h>
+#endif
+
 //------------------------------------------------------------------------
 // GDir and GDirEntry
 //------------------------------------------------------------------------
@@ -71,7 +79,7 @@ public:
     GDir(const GDir &other) = delete;
     GDir &operator=(const GDir &other) = delete;
 
-    GDirEntry *getNextEntry();
+    std::unique_ptr<GDirEntry> getNextEntry();
     void rewind();
 
 private:

package/src/lib/win32/{poppler-21.11.0 → poppler-22.04.0}/Library/include/poppler/goo/gfile.h

@@ -16,7 +16,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2009, 2011, 2012, 2017, 2018, 2021 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2011, 2012, 2017, 2018, 2021, 2022 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
 // Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
 // Copyright (C) 2013, 2017 Adrian Johnson <ajohnson@redneon.com>
@@ -25,7 +25,7 @@
 // Copyright (C) 2017 Christoph Cullmann <cullmann@kde.org>
 // Copyright (C) 2017 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2018 Mojca Miklavec <mojca@macports.org>
-// Copyright (C) 2019 Christian Persch <chpe@src.gnome.org>
+// Copyright (C) 2019, 2021 Christian Persch <chpe@src.gnome.org>
 //
 // 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
@@ -41,6 +41,7 @@
 #include <cstdlib>
 #include <cstddef>
 #include <ctime>
+#include <string>
 extern "C" {
 #if defined(_WIN32)
 #    include <sys/stat.h>
@@ -74,6 +75,8 @@ extern "C" {
 #endif
 }
 
+#include <memory>
+
 class GooString;
 
 /* Integer type for all file offsets and file sizes */
@@ -121,10 +124,13 @@ public:
     int read(char *buf, int n, Goffset offset) const;
     Goffset size() const;
 
-    static GooFile *open(const GooString *fileName);
+    static std::unique_ptr<GooFile> open(const std::string &fileName);
+#ifndef _WIN32
+    static std::unique_ptr<GooFile> open(int fdA);
+#endif
 
 #ifdef _WIN32
-    static GooFile *open(const wchar_t *fileName);
+    static std::unique_ptr<GooFile> open(const wchar_t *fileName);
 
     ~GooFile() { CloseHandle(handle); }
 

package/src/lib/win32/{poppler-21.11.0 → poppler-22.04.0}/Library/include/poppler/poppler-config.h

@@ -2,7 +2,7 @@
 //
 // poppler-config.h
 //
-// Copyright 1996-2011 Glyph & Cog, LLC
+// Copyright 1996-2011, 2022 Glyph & Cog, LLC
 //
 //========================================================================
 
@@ -36,7 +36,7 @@
 
 /* Defines the poppler version. */
 #ifndef POPPLER_VERSION
-#define POPPLER_VERSION "21.11.0"
+#define POPPLER_VERSION "22.04.0"
 #endif
 
 /* Use single precision arithmetic in the Splash backend */
@@ -122,8 +122,8 @@
 //------------------------------------------------------------------------
 
 // copyright notice
-#define popplerCopyright "Copyright 2005-2021 The Poppler Developers - http://poppler.freedesktop.org"
-#define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC"
+#define popplerCopyright "Copyright 2005-2022 The Poppler Developers - http://poppler.freedesktop.org"
+#define xpdfCopyright "Copyright 1996-2011, 2022 Glyph & Cog, LLC"
 
 //------------------------------------------------------------------------
 // Win32 stuff

package/src/lib/win32/{poppler-21.11.0 → poppler-22.04.0}/Library/include/poppler/splash/SplashFTFontEngine.h

@@ -13,7 +13,7 @@
 //
 // Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
 // Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com>
-// Copyright (C) 2009, 2018 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2018, 2022 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
 // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
@@ -64,7 +64,6 @@ private:
     bool enableFreeTypeHinting;
     bool enableSlightHinting;
     FT_Library lib;
-    bool useCIDs;
 
     friend class SplashFTFontFile;
     friend class SplashFTFont;

package/src/lib/win32/{poppler-21.11.0 → poppler-22.04.0}/Library/include/poppler/splash/SplashFontFile.h

@@ -13,6 +13,7 @@
 //
 // Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
 // Copyright (C) 2008, 2010, 2018 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2022 Oliver Sander <oliver.sander@tu-dresden.de>
 //
 // 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
@@ -22,10 +23,12 @@
 #ifndef SPLASHFONTFILE_H
 #define SPLASHFONTFILE_H
 
+#include <string>
+#include <vector>
+
 #include "SplashTypes.h"
 #include "poppler_private_export.h"
 
-class GooString;
 class SplashFontEngine;
 class SplashFont;
 class SplashFontFileID;
@@ -42,22 +45,20 @@ public:
     SplashFontSrc(const SplashFontSrc &) = delete;
     SplashFontSrc &operator=(const SplashFontSrc &) = delete;
 
-    void setFile(GooString *file, bool del);
-    void setFile(const char *file, bool del);
-    void setBuf(char *bufA, int buflenA, bool del);
+    void setFile(const std::string &file);
+    void setBuf(char *bufA, int buflenA);
+    void setBuf(std::vector<unsigned char> &&bufA);
 
     void ref();
     void unref();
 
     bool isFile;
-    GooString *fileName;
-    char *buf;
-    int bufLen;
+    std::string fileName;
+    std::vector<unsigned char> buf;
 
 private:
     ~SplashFontSrc();
     int refcnt;
-    bool deleteSrc;
 };
 
 class SplashFontFile

package/src/lib/win32/{poppler-21.11.0 → poppler-22.04.0}/Library/include/poppler/splash/SplashMath.h

@@ -78,10 +78,11 @@ static inline int splashFloor(SplashCoord x)
     __asm fldcw WORD PTR oldCW;
     return result;
 #else
-    if (x > 0)
+    if (x > 0) {
         return (int)x;
-    else
+    } else {
         return (int)floor(x);
+    }
 #endif
 }
 

package/src/lib/win32/{poppler-21.11.0 → poppler-22.04.0}/Library/include/poppler/splash/SplashScreen.h

@@ -46,8 +46,9 @@ public:
     int test(int x, int y, unsigned char value)
     {
         int xx, yy;
-        if (mat == nullptr)
+        if (mat == nullptr) {
             createMatrix();
+        }
         xx = x & sizeM1;
         yy = y & sizeM1;
         return value < mat[(yy << log2Size) + xx] ? 0 : 1;
@@ -58,8 +59,9 @@ public:
     // solid white or black.
     bool isStatic(unsigned char value)
     {
-        if (mat == nullptr)
+        if (mat == nullptr) {
             createMatrix();
+        }
         return value < minVal || value >= maxVal;
     }
 

package/src/lib/win32/{poppler-21.11.0 → poppler-22.04.0}/Library/include/poppler/splash/SplashTypes.h

@@ -163,8 +163,9 @@ static inline void splashClearColor(SplashColorPtr dest)
     dest[1] = 0;
     dest[2] = 0;
     dest[3] = 0;
-    for (int i = 4; i < SPOT_NCOMPS + 4; i++)
+    for (int i = 4; i < SPOT_NCOMPS + 4; i++) {
         dest[i] = 0;
+    }
 }
 
 static inline void splashColorCopy(SplashColorPtr dest, SplashColorConstPtr src)
@@ -173,15 +174,18 @@ static inline void splashColorCopy(SplashColorPtr dest, SplashColorConstPtr src)
     dest[1] = src[1];
     dest[2] = src[2];
     dest[3] = src[3];
-    for (int i = 4; i < SPOT_NCOMPS + 4; i++)
+    for (int i = 4; i < SPOT_NCOMPS + 4; i++) {
         dest[i] = src[i];
+    }
 }
 
 static inline bool splashColorEqual(SplashColorConstPtr dest, SplashColorConstPtr src)
 {
-    for (int i = 0; i < SPOT_NCOMPS + 4; i++)
-        if (dest[i] != src[i])
+    for (int i = 0; i < SPOT_NCOMPS + 4; i++) {
+        if (dest[i] != src[i]) {
             return false;
+        }
+    }
     return true;
 }
 
@@ -191,8 +195,9 @@ static inline void splashColorXor(SplashColorPtr dest, SplashColorConstPtr src)
     dest[1] ^= src[1];
     dest[2] ^= src[2];
     dest[3] ^= src[3];
-    for (int i = 4; i < SPOT_NCOMPS + 4; i++)
+    for (int i = 4; i < SPOT_NCOMPS + 4; i++) {
         dest[i] ^= src[i];
+    }
 }
 
 //------------------------------------------------------------------------

package/src/lib/win32/poppler-22.04.0/Library/lib/pkgconfig/poppler-cpp.pc

@@ -0,0 +1,12 @@
+prefix=D:/bld/poppler-split_1650986316533/_h_env/Library
+libdir=D:/bld/poppler-split_1650986316533/_h_env/Library/lib
+includedir=D:/bld/poppler-split_1650986316533/_h_env/Library/include
+
+Name: poppler-cpp
+Description: cpp backend for Poppler PDF rendering library
+Version: 22.04.0
+Requires: 
+Requires.private: poppler = 22.04.0
+
+Libs: -L${libdir} -lpoppler-cpp
+Cflags: -I${includedir}/poppler/cpp

package/src/lib/win32/poppler-22.04.0/Library/lib/pkgconfig/poppler-glib.pc

@@ -0,0 +1,12 @@
+prefix=D:/bld/poppler-split_1650986316533/_h_env/Library
+libdir=D:/bld/poppler-split_1650986316533/_h_env/Library/lib
+includedir=D:/bld/poppler-split_1650986316533/_h_env/Library/include
+
+Name: poppler-glib
+Description: GLib wrapper for poppler
+Version: 22.04.0
+Requires: glib-2.0 >= 2.56 gobject-2.0 >= 2.56 cairo >= 1.10.0 
+Requires.private: poppler = 22.04.0
+
+Libs: -L${libdir} -lpoppler-glib
+Cflags: -I${includedir}/poppler/glib

package/src/lib/win32/poppler-22.04.0/Library/lib/pkgconfig/poppler.pc

@@ -0,0 +1,10 @@
+prefix=D:/bld/poppler-split_1650986316533/_h_env/Library
+libdir=D:/bld/poppler-split_1650986316533/_h_env/Library/lib
+includedir=D:/bld/poppler-split_1650986316533/_h_env/Library/include
+
+Name: poppler
+Description: PDF rendering library
+Version: 22.04.0
+
+Libs: -L${libdir} -lpoppler
+Cflags: -I${includedir}/poppler

package/src/lib/win32/{poppler-21.11.0 → poppler-22.04.0}/Library/share/man/man1/pdftotext.1

@@ -85,6 +85,9 @@ block, line, and word in the file.
 .B \-cropbox
 Use the crop box rather than the media box with \-bbox and \-bbox-layout.
 .TP
+.BI \-colspacing " number"
+Specifies how much spacing we allow after a word before considering adjacent text to be a new column, measured as a fraction of the font size. Current default is 0.7, old releases had a 0.3 default.
+.TP
 .BI \-enc " encoding-name"
 Sets the encoding to use for text output. This defaults to "UTF-8".
 .TP