node-poppler 5.1.3 → 5.1.4

package/src/lib/win32/{poppler-22.01.0 → poppler-22.04.0}/Library/include/poppler/Stream.h

@@ -28,7 +28,7 @@
 // Copyright (C) 2013 Pino Toscano <pino@kde.org>
 // Copyright (C) 2019 Volker Krause <vkrause@kde.org>
 // Copyright (C) 2019 Alexander Volkov <a.volkov@rusbitech.ru>
-// Copyright (C) 2020, 2021 Oliver Sander <oliver.sander@tu-dresden.de>
+// Copyright (C) 2020-2022 Oliver Sander <oliver.sander@tu-dresden.de>
 // Copyright (C) 2020 Philipp Knechtges <philipp-dev@knechtges.com>
 // Copyright (C) 2021 Hubert Figuiere <hub@figuiere.net>
 // Copyright (C) 2021 Christian Persch <chpe@src.gnome.org>
@@ -44,6 +44,7 @@
 
 #include <atomic>
 #include <cstdio>
+#include <vector>
 
 #include "poppler-config.h"
 #include "poppler_private_export.h"
@@ -133,10 +134,11 @@ public:
         } else {
             for (int i = 0; i < nChars; ++i) {
                 const int c = getChar();
-                if (likely(c != EOF))
+                if (likely(c != EOF)) {
                     buffer[i] = c;
-                else
+                } else {
                     return i;
+                }
             }
             return nChars;
         }
@@ -154,22 +156,23 @@ public:
 
     inline void fillGooString(GooString *s) { fillString(s->toNonConstStr()); }
 
-    inline unsigned char *toUnsignedChars(int *length, int initialSize = 4096, int sizeIncrement = 4096)
+    inline std::vector<unsigned char> toUnsignedChars(int initialSize = 4096, int sizeIncrement = 4096)
     {
+        std::vector<unsigned char> buf(initialSize);
+
         int readChars;
-        unsigned char *buf = (unsigned char *)gmalloc(initialSize);
         int size = initialSize;
-        *length = 0;
+        int length = 0;
         int charsToRead = initialSize;
         bool continueReading = true;
         reset();
-        while (continueReading && (readChars = doGetChars(charsToRead, &buf[*length])) != 0) {
-            *length += readChars;
+        while (continueReading && (readChars = doGetChars(charsToRead, buf.data() + length)) != 0) {
+            length += readChars;
             if (readChars == charsToRead) {
                 if (lookChar() != EOF) {
                     size += sizeIncrement;
                     charsToRead = sizeIncrement;
-                    buf = (unsigned char *)grealloc(buf, size);
+                    buf.resize(size);
                 } else {
                     continueReading = false;
                 }
@@ -177,6 +180,8 @@ public:
                 continueReading = false;
             }
         }
+
+        buf.resize(length);
         return buf;
     }
 
@@ -1001,8 +1006,9 @@ private:
     short lookBits(int n);
     void eatBits(int n)
     {
-        if ((inputBits -= n) < 0)
+        if ((inputBits -= n) < 0) {
             inputBits = 0;
+        }
     }
 };
 
@@ -1166,8 +1172,9 @@ private:
         int c;
 
         while (remain == 0) {
-            if (endOfBlock && eof)
+            if (endOfBlock && eof) {
                 return EOF;
+            }
             readSome();
         }
         c = buf[index];

package/src/lib/win32/{poppler-22.01.0 → poppler-22.04.0}/Library/include/poppler/StructElement.h

@@ -254,14 +254,16 @@ public:
     // Optional ISO language name, e.g. en_US
     GooString *getLanguage()
     {
-        if (!isContent() && s->language)
+        if (!isContent() && s->language) {
             return s->language;
+        }
         return parent ? parent->getLanguage() : nullptr;
     }
     const GooString *getLanguage() const
     {
-        if (!isContent() && s->language)
+        if (!isContent() && s->language) {
             return s->language;
+        }
         return parent ? parent->getLanguage() : nullptr;
     }
 
@@ -269,8 +271,9 @@ public:
     unsigned int getRevision() const { return isContent() ? 0 : s->revision; }
     void setRevision(unsigned int revision)
     {
-        if (isContent())
+        if (isContent()) {
             s->revision = revision;
+        }
     }
 
     // Optional element title, in human-readable form.
@@ -328,8 +331,9 @@ public:
 
     const TextSpanArray getTextSpans() const
     {
-        if (!isContent())
+        if (!isContent()) {
             return TextSpanArray();
+        }
         MarkedContentOutputDev mcdev(getMCID(), stmRef);
         return getTextSpansInternal(mcdev);
     }

package/src/lib/win32/{poppler-22.01.0 → poppler-22.04.0}/Library/include/poppler/TextOutputDev.h

@@ -24,7 +24,7 @@
 // Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info@kdab.com>. Work sponsored by the LiMux project of the city of Munich
 // Copyright (C) 2018 Sanchit Anand <sanxchit@gmail.com>
 // Copyright (C) 2018, 2020, 2021 Nelson Benítez León <nbenitezl@gmail.com>
-// Copyright (C) 2019 Oliver Sander <oliver.sander@tu-dresden.de>
+// Copyright (C) 2019, 2022 Oliver Sander <oliver.sander@tu-dresden.de>
 // Copyright (C) 2019 Dan Shea <dan.shea@logical-innovations.com>
 // Copyright (C) 2020 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
 //
@@ -119,7 +119,7 @@ public:
 #endif
 
 private:
-    GfxFont *gfxFont;
+    std::shared_ptr<GfxFont> gfxFont;
 #ifdef TEXTOUT_WORD_LIST
     GooString *fontName;
     int flags;

package/src/lib/win32/{poppler-22.01.0 → poppler-22.04.0}/Library/include/poppler/UTF.h

@@ -8,7 +8,7 @@
 // Copyright (C) 2016 Jason Crain <jason@aquaticape.us>
 // Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info@kdab.com>. Work sponsored by the LiMux project of the city of Munich
 // Copyright (C) 2018 Nelson Benítez León <nbenitezl@gmail.com>
-// Copyright (C) 2019-2021 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2019-2022 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2021 Georgiy Sgibnev <georgiy@sgibnev.com>. Work sponsored by lab50.net.
 //
 //========================================================================
@@ -18,6 +18,7 @@
 
 #include <cstdint>
 #include <climits>
+#include <memory>
 
 #include "goo/GooString.h"
 #include "CharTypes.h"
@@ -76,7 +77,7 @@ uint16_t POPPLER_PRIVATE_EXPORT *utf8ToUtf16(const char *utf8, int *len = nullpt
 // 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 std::string &utf8);
+std::unique_ptr<GooString> POPPLER_PRIVATE_EXPORT utf8ToUtf16WithBom(const std::string &utf8);
 
 // Count number of UTF-8 bytes required to convert a UTF-16 string to
 // UTF-8 (excluding terminating NULL).

package/src/lib/win32/{poppler-22.01.0 → poppler-22.04.0}/Library/include/poppler/UnicodeMap.h

@@ -16,7 +16,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
-// Copyright (C) 2018-2021 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2018-2022 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2018 Adam Reichold <adam.reichold@t-online.de>
 // Copyright (C) 2019 Volker Krause <vkrause@kde.org>
 //
@@ -33,6 +33,7 @@
 #include "CharTypes.h"
 
 #include <atomic>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -62,7 +63,7 @@ class POPPLER_PRIVATE_EXPORT UnicodeMap
 public:
     // Create the UnicodeMap specified by <encodingName>.  Sets the
     // initial reference count to 1.  Returns NULL on failure.
-    static UnicodeMap *parse(const std::string &encodingNameA);
+    static std::unique_ptr<UnicodeMap> parse(const std::string &encodingNameA);
 
     // Create a resident UnicodeMap.
     UnicodeMap(const char *encodingNameA, bool unicodeOutA, const UnicodeMapRange *rangesA, int lenA);
@@ -116,16 +117,12 @@ class UnicodeMapCache
 {
 public:
     UnicodeMapCache();
-    ~UnicodeMapCache();
-
-    UnicodeMapCache(const UnicodeMapCache &) = delete;
-    UnicodeMapCache &operator=(const UnicodeMapCache &) = delete;
 
     // Get the UnicodeMap for <encodingName>.  Returns NULL on failure.
     const UnicodeMap *getUnicodeMap(const std::string &encodingName);
 
 private:
-    std::vector<UnicodeMap *> cache;
+    std::vector<std::unique_ptr<UnicodeMap>> cache;
 };
 
 #endif

package/src/lib/win32/{poppler-22.01.0 → poppler-22.04.0}/Library/include/poppler/ViewerPreferences.h

@@ -6,7 +6,7 @@
 //
 // Copyright 2011 Pino Toscano <pino@kde.org>
 // Copyright 2019 Marek Kasik <mkasik@redhat.com>
-// Copyright 2021 Albert Astals Cid <aacid@kde.org>
+// Copyright 2021, 2022 Albert Astals Cid <aacid@kde.org>
 //
 //========================================================================
 
@@ -75,12 +75,12 @@ private:
     bool fitWindow;
     bool centerWindow;
     bool displayDocTitle;
-    NonFullScreenPageMode nonFullScreenPageMode;
-    Direction direction;
-    PrintScaling printScaling;
-    Duplex duplex;
+    NonFullScreenPageMode nonFullScreenPageMode = nfpmUseNone;
+    Direction direction = directionL2R;
+    PrintScaling printScaling = printScalingAppDefault;
+    Duplex duplex = duplexNone;
     bool pickTrayByPDFSize;
-    int numCopies;
+    int numCopies = 1;
     std::vector<std::pair<int, int>> printPageRange;
 };
 

package/src/lib/win32/{poppler-22.01.0 → poppler-22.04.0}/Library/include/poppler/cpp/poppler-version.h

@@ -21,9 +21,9 @@
 
 #include "poppler-global.h"
 
-#define POPPLER_VERSION "22.01.0"
+#define POPPLER_VERSION "22.04.0"
 #define POPPLER_VERSION_MAJOR 22
-#define POPPLER_VERSION_MINOR 1
+#define POPPLER_VERSION_MINOR 4
 #define POPPLER_VERSION_MICRO 0
 
 namespace poppler

package/src/lib/win32/{poppler-22.01.0 → poppler-22.04.0}/Library/include/poppler/fofi/FoFiBase.h

@@ -14,6 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 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
@@ -40,7 +41,7 @@ public:
     virtual ~FoFiBase();
 
 protected:
-    FoFiBase(const char *fileA, int lenA, bool freeFileDataA);
+    FoFiBase(const unsigned char *fileA, int lenA, bool freeFileDataA);
     static char *readFile(const char *fileName, int *fileLen);
 
     // S = signed / U = unsigned

package/src/lib/win32/{poppler-22.01.0 → poppler-22.04.0}/Library/include/poppler/fofi/FoFiTrueType.h

@@ -19,6 +19,7 @@
 // Copyright (C) 2012 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
 // Copyright (C) 2016 William Bader <williambader@hotmail.com>
 // Copyright (C) 2018 Adam Reichold <adam.reichold@t-online.de>
+// 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
@@ -29,6 +30,7 @@
 #define FOFITRUETYPE_H
 
 #include <cstddef>
+#include <memory>
 #include <unordered_map>
 #include <string>
 #include "FoFiBase.h"
@@ -46,10 +48,10 @@ class POPPLER_PRIVATE_EXPORT FoFiTrueType : public FoFiBase
 {
 public:
     // Create a FoFiTrueType object from a memory buffer.
-    static FoFiTrueType *make(const char *fileA, int lenA, int faceIndexA = 0);
+    static std::unique_ptr<FoFiTrueType> make(const unsigned char *fileA, int lenA, int faceIndexA = 0);
 
     // Create a FoFiTrueType object from a file on disk.
-    static FoFiTrueType *load(const char *fileName, int faceIndexA = 0);
+    static std::unique_ptr<FoFiTrueType> load(const char *fileName, int faceIndexA = 0);
 
     ~FoFiTrueType() override;
 
@@ -154,7 +156,7 @@ public:
     int setupGSUB(const char *scriptName, const char *languageName);
 
 private:
-    FoFiTrueType(const char *fileA, int lenA, bool freeFileDataA, int faceIndexA);
+    FoFiTrueType(const unsigned char *fileA, int lenA, bool freeFileDataA, int faceIndexA);
     void cvtEncoding(char **encoding, FoFiOutputFunc outputFunc, void *outputStream) const;
     void cvtCharStrings(char **encoding, const int *codeToGID, FoFiOutputFunc outputFunc, void *outputStream) const;
     void cvtSfnts(FoFiOutputFunc outputFunc, void *outputStream, const GooString *name, bool needVerticalMetrics, int *maxUsedGlyph) const;

package/src/lib/win32/{poppler-22.01.0 → poppler-22.04.0}/Library/include/poppler/fofi/FoFiType1.h

@@ -14,6 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 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
@@ -33,7 +34,7 @@ class FoFiType1 : public FoFiBase
 {
 public:
     // Create a FoFiType1 object from a memory buffer.
-    static FoFiType1 *make(const char *fileA, int lenA);
+    static FoFiType1 *make(const unsigned char *fileA, int lenA);
 
     // Create a FoFiType1 object from a file on disk.
     static FoFiType1 *load(const char *fileName);
@@ -54,7 +55,7 @@ public:
     void writeEncoded(const char **newEncoding, FoFiOutputFunc outputFunc, void *outputStream) const;
 
 private:
-    FoFiType1(const char *fileA, int lenA, bool freeFileDataA);
+    FoFiType1(const unsigned char *fileA, int lenA, bool freeFileDataA);
 
     char *getNextLine(char *line) const;
     void parse();

package/src/lib/win32/{poppler-22.01.0 → poppler-22.04.0}/Library/include/poppler/fofi/FoFiType1C.h

@@ -16,6 +16,7 @@
 // Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
 // Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2018-2020 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
@@ -154,7 +155,7 @@ class POPPLER_PRIVATE_EXPORT FoFiType1C : public FoFiBase
 {
 public:
     // Create a FoFiType1C object from a memory buffer.
-    static FoFiType1C *make(const char *fileA, int lenA);
+    static FoFiType1C *make(const unsigned char *fileA, int lenA);
 
     // Create a FoFiType1C object from a file on disk.
     static FoFiType1C *load(const char *fileName);
@@ -209,7 +210,7 @@ public:
     void convertToType0(const char *psName, const int *codeMap, int nCodes, FoFiOutputFunc outputFunc, void *outputStream);
 
 private:
-    FoFiType1C(const char *fileA, int lenA, bool freeFileDataA);
+    FoFiType1C(const unsigned char *fileA, int lenA, bool freeFileDataA);
     void eexecCvtGlyph(Type1CEexecBuf *eb, const char *glyphName, int offset, int nBytes, const Type1CIndex *subrIdx, const Type1CPrivateDict *pDict);
     void cvtGlyph(int offset, int nBytes, GooString *charBuf, const Type1CIndex *subrIdx, const Type1CPrivateDict *pDict, bool top, std::set<int> &offsetBeingParsed);
     void cvtGlyphWidth(bool useOp, GooString *charBuf, const Type1CPrivateDict *pDict);

package/src/lib/win32/{poppler-22.01.0 → poppler-22.04.0}/Library/include/poppler/glib/poppler-document.h

@@ -2,7 +2,7 @@
  * Copyright (C) 2004, Red Hat, Inc.
  *
  * Copyright (C) 2016 Jakub Alba <jakubalba@gmail.com>
- * Copyright (C) 2018, 2019, 2021 Marek Kasik <mkasik@redhat.com>
+ * Copyright (C) 2018, 2019, 2021, 2022 Marek Kasik <mkasik@redhat.com>
  * Copyright (C) 2019 Masamichi Hosoda <trueroad@trueroad.jp>
  * Copyright (C) 2021 André Guerreiro <aguerreiro1985@gmail.com>
  *
@@ -419,6 +419,8 @@ gboolean poppler_document_has_javascript(PopplerDocument *document);
 
 /* Signatures */
 POPPLER_PUBLIC
+GList *poppler_document_get_signature_fields(PopplerDocument *document);
+POPPLER_PUBLIC
 gint poppler_document_get_n_signatures(const PopplerDocument *document);
 
 /* Interface for getting the Index of a poppler_document */

package/src/lib/win32/{poppler-22.01.0 → poppler-22.04.0}/Library/include/poppler/glib/poppler-features.h

@@ -55,7 +55,7 @@
  *
  * Since: 0.12
  */
-#define POPPLER_MINOR_VERSION (1)
+#define POPPLER_MINOR_VERSION (4)
 
 /**
  * POPPLER_MICRO_VERSION:

package/src/lib/win32/{poppler-22.01.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-22.01.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: