node-poppler 5.1.1 → 5.1.4

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

@@ -60,6 +60,8 @@ public:
     // Copy array with new xref
     Array *copy(XRef *xrefA) const;
 
+    Array *deepCopy() const;
+
     // Add an element
     // elem becomes a dead object after this call
     void add(Object &&elem);

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

@@ -14,7 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2008 Koji Otani <sho@bbr.jp>
-// Copyright (C) 2009, 2018-2020 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2018-2020, 2022 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2012, 2017 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2018 Adam Reichold <adam.reichold@t-online.de>
 //
@@ -26,7 +26,9 @@
 #ifndef CMAP_H
 #define CMAP_H
 
+#include <array>
 #include <atomic>
+#include <memory>
 
 #include "poppler-config.h"
 #include "CharTypes.h"
@@ -44,24 +46,21 @@ class CMap
 public:
     // Parse a CMap from <obj>, which can be a name or a stream.  Sets
     // the initial reference count to 1.  Returns NULL on failure.
-    static CMap *parse(CMapCache *cache, const GooString *collectionA, Object *obj);
+    static std::shared_ptr<CMap> parse(CMapCache *cache, const GooString *collectionA, Object *obj);
 
     // Create the CMap specified by <collection> and <cMapName>.  Sets
     // the initial reference count to 1.  Returns NULL on failure.
-    static CMap *parse(CMapCache *cache, const GooString *collectionA, const GooString *cMapNameA);
+    static std::shared_ptr<CMap> parse(CMapCache *cache, const GooString *collectionA, const GooString *cMapNameA);
 
     // Parse a CMap from <str>.  Sets the initial reference count to 1.
     // Returns NULL on failure.
-    static CMap *parse(CMapCache *cache, const GooString *collectionA, Stream *str);
+    static std::shared_ptr<CMap> parse(CMapCache *cache, const GooString *collectionA, Stream *str);
 
     ~CMap();
 
     CMap(const CMap &) = delete;
     CMap &operator=(const CMap &) = delete;
 
-    void incRefCnt();
-    void decRefCnt();
-
     // Return collection name (<registry>-<ordering>).
     const GooString *getCollection() const { return collection; }
 
@@ -99,7 +98,6 @@ private:
     int wMode; // writing mode (0=horizontal, 1=vertical)
     CMapVectorEntry *vector; // vector for first byte (NULL for
                              //   identity CMap)
-    std::atomic_int refCnt;
 };
 
 //------------------------------------------------------------------------
@@ -110,7 +108,7 @@ class CMapCache
 {
 public:
     CMapCache();
-    ~CMapCache();
+    ~CMapCache() = default;
 
     CMapCache(const CMapCache &) = delete;
     CMapCache &operator=(const CMapCache &) = delete;
@@ -121,10 +119,10 @@ public:
     // Stream is a stream containing the CMap, can be NULL and
     // this means the CMap will be searched in the CMap files
     // Returns NULL on failure.
-    CMap *getCMap(const GooString *collection, const GooString *cMapName);
+    std::shared_ptr<CMap> getCMap(const GooString *collection, const GooString *cMapName);
 
 private:
-    CMap *cache[cMapCacheSize];
+    std::array<std::shared_ptr<CMap>, cMapCacheSize> cache;
 };
 
 #endif

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

@@ -8,7 +8,7 @@
 //
 // Copyright 2009 Stefan Thomas <thomas@eload24.com>
 // Copyright 2010 Hib Eris <hib@hiberis.nl>
-// Copyright 2010, 2018-2020 Albert Astals Cid <aacid@kde.org>
+// Copyright 2010, 2018-2020, 2022 Albert Astals Cid <aacid@kde.org>
 //
 //========================================================================
 
@@ -45,7 +45,7 @@ class POPPLER_PRIVATE_EXPORT CachedFile
     friend class CachedFileWriter;
 
 public:
-    CachedFile(CachedFileLoader *cacheLoader, GooString *uri);
+    explicit CachedFile(CachedFileLoader *cacheLoader);
 
     CachedFile(const CachedFile &) = delete;
     CachedFile &operator=(const CachedFile &) = delete;
@@ -79,7 +79,6 @@ private:
     int cache(size_t offset, size_t length);
 
     CachedFileLoader *loader;
-    GooString *uri;
 
     size_t length;
     size_t streamPos;
@@ -136,8 +135,8 @@ public:
 
     // Initializes the file load.
     // Returns the length of the file.
-    // The caller is responsible for deleting uri and cachedFile.
-    virtual size_t init(GooString *uri, CachedFile *cachedFile) = 0;
+    // The caller is responsible for deleting cachedFile.
+    virtual size_t init(CachedFile *cachedFile) = 0;
 
     // Loads specified byte ranges and passes it to the writer to store them.
     // Returns 0 on success, Anything but 0 on failure.

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

@@ -21,6 +21,7 @@
 // Copyright (C) 2008, 2017 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // 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
@@ -83,7 +84,7 @@ private:
 class CairoType3Font : public CairoFont
 {
 public:
-    static CairoType3Font *create(GfxFont *gfxFont, PDFDoc *doc, CairoFontEngine *fontEngine, bool printing, XRef *xref);
+    static CairoType3Font *create(const std::shared_ptr<const GfxFont> &gfxFont, PDFDoc *doc, CairoFontEngine *fontEngine, bool printing, XRef *xref);
     ~CairoType3Font() override;
 
     bool matches(Ref &other, bool printing) override;
@@ -109,7 +110,7 @@ public:
     CairoFontEngine(const CairoFontEngine &) = delete;
     CairoFontEngine &operator=(const CairoFontEngine &other) = delete;
 
-    CairoFont *getFont(GfxFont *gfxFont, PDFDoc *doc, bool printing, XRef *xref);
+    CairoFont *getFont(const std::shared_ptr<GfxFont> &gfxFont, PDFDoc *doc, bool printing, XRef *xref);
 
 private:
     CairoFont *fontCache[cairoFontCacheSize];

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

@@ -26,6 +26,7 @@
 // Copyright (C) 2018, 2019, 2021 Albert Astals Cid <aacid@kde.org>
 // 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) 2020 Michal <sudolskym@gmail.com>
+// Copyright (C) 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

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

@@ -14,7 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2005, 2007, 2009-2011, 2013, 2017-2021 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2007, 2009-2011, 2013, 2017-2022 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
 // Copyright (C) 2005, 2006, 2008 Brad Hards <bradh@frogmouth.net>
 // Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
@@ -46,8 +46,9 @@
 #include "Object.h"
 #include "Link.h"
 
-#include <vector>
 #include <memory>
+#include <optional>
+#include <vector>
 
 class PDFDoc;
 class XRef;
@@ -132,7 +133,7 @@ public:
     Ref *getPageRef(int i);
 
     // Return base URI, or NULL if none.
-    GooString *getBaseURI() { return baseURI; }
+    const std::optional<std::string> &getBaseURI() const { return baseURI; }
 
     // Return the contents of the metadata stream, or NULL if there is
     // no metadata.
@@ -183,7 +184,7 @@ public:
     int numEmbeddedFiles() { return getEmbeddedFileNameTree()->numEntries(); }
 
     // Get the i'th file embedded (at the Document level) in the document
-    FileSpec *embeddedFile(int i);
+    std::unique_ptr<FileSpec> embeddedFile(int i);
 
     // Is there an embedded file with the given name?
     bool hasEmbeddedFile(const std::string &fileName);
@@ -285,7 +286,7 @@ private:
     NameTree *destNameTree; // named destination name-tree
     NameTree *embeddedFileNameTree; // embedded file name-tree
     NameTree *jsNameTree; // Java Script name-tree
-    GooString *baseURI; // base URI for URI-type links
+    std::optional<std::string> baseURI; // base URI for URI-type links
     Object metadata; // metadata stream
     StructTreeRoot *structTreeRoot; // structure tree root
     unsigned int markInfo; // Flags from MarkInfo dictionary

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

@@ -17,7 +17,7 @@
 //
 // Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
 // Copyright (C) 2007 Koji Otani <sho@bbr.jp>
-// Copyright (C) 2008, 2011, 2012, 2018, 2019, 2021 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2011, 2012, 2018, 2019, 2021, 2022 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
 // 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 Adam Reichold <adam.reichold@t-online.de>
@@ -32,6 +32,7 @@
 #define CHARCODETOUNICODE_H
 
 #include <atomic>
+#include <optional>
 
 #include "poppler-config.h"
 #include "CharTypes.h"
@@ -103,10 +104,10 @@ private:
     void addMapping(CharCode code, char *uStr, int n, int offset);
     void addMappingInt(CharCode code, Unicode u);
     CharCodeToUnicode();
-    explicit CharCodeToUnicode(GooString *tagA);
-    CharCodeToUnicode(GooString *tagA, Unicode *mapA, CharCode mapLenA, bool copyMap, CharCodeToUnicodeString *sMapA, int sMapLenA, int sMapSizeA);
+    explicit CharCodeToUnicode(const std::optional<std::string> &tagA);
+    CharCodeToUnicode(const std::optional<std::string> &tagA, Unicode *mapA, CharCode mapLenA, bool copyMap, CharCodeToUnicodeString *sMapA, int sMapLenA, int sMapSizeA);
 
-    GooString *tag;
+    const std::optional<std::string> tag;
     Unicode *map;
     CharCode mapLen;
     CharCodeToUnicodeString *sMap;

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

@@ -5,7 +5,7 @@
 // This file is licensed under the GPLv2 or later
 //
 // Copyright 2010 Hib Eris <hib@hiberis.nl>
-// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright 2010, 2022 Albert Astals Cid <aacid@kde.org>
 //
 //========================================================================
 
@@ -23,13 +23,13 @@ class CurlCachedFileLoader : public CachedFileLoader
 {
 
 public:
-    CurlCachedFileLoader();
+    explicit CurlCachedFileLoader(const std::string &urlA);
     ~CurlCachedFileLoader() override;
-    size_t init(GooString *url, CachedFile *cachedFile) override;
+    size_t init(CachedFile *cachedFile) override;
     int load(const std::vector<ByteRange> &ranges, CachedFileWriter *writer) override;
 
 private:
-    GooString *url;
+    const std::string url;
     CachedFile *cachedFile;
     CURL *curl;
 };

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

@@ -5,7 +5,7 @@
 // This file is licensed under the GPLv2 or later
 //
 // Copyright 2010 Hib Eris <hib@hiberis.nl>
-// Copyright 2010, 2018 Albert Astals Cid <aacid@kde.org>
+// Copyright 2010, 2018, 2022 Albert Astals Cid <aacid@kde.org>
 // Copyright 2021 Oliver Sander <oliver.sander@tu-dresden.de>
 //
 //========================================================================
@@ -25,7 +25,7 @@ class CurlPDFDocBuilder : public PDFDocBuilder
 {
 
 public:
-    std::unique_ptr<PDFDoc> buildPDFDoc(const GooString &uri, GooString *ownerPassword = nullptr, GooString *userPassword = nullptr, void *guiDataA = nullptr) override;
+    std::unique_ptr<PDFDoc> buildPDFDoc(const GooString &uri, const std::optional<GooString> &ownerPassword = {}, const std::optional<GooString> &userPassword = {}, void *guiDataA = nullptr) override;
     bool supports(const GooString &uri) override;
 };
 

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

@@ -52,6 +52,8 @@ public:
     explicit Dict(const Dict *dictA);
     Dict *copy(XRef *xrefA) const;
 
+    Dict *deepCopy() const;
+
     Dict(const Dict &) = delete;
     Dict &operator=(const Dict &) = delete;
 

package/src/lib/win32/poppler-22.04.0/Library/include/poppler/FDPDFDocBuilder.h

@@ -0,0 +1,36 @@
+//========================================================================
+//
+// FileDescriptorPDFDocBuilder.h
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+// Copyright 2010, 2018, 2022 Albert Astals Cid <aacid@kde.org>
+// Copyright 2021 Oliver Sander <oliver.sander@tu-dresden.de>
+// Copyright 2021 Christian Persch <chpe@src.gnome.org>
+//
+//========================================================================
+
+#ifndef FDPDFDOCBUILDER_H
+#define FDPDFDOCBUILDER_H
+
+#include "PDFDocBuilder.h"
+
+//------------------------------------------------------------------------
+// FileDescriptorPDFDocBuilder
+//
+// The FileDescriptorPDFDocBuilder implements a PDFDocBuilder that read from a file descriptor.
+//------------------------------------------------------------------------
+
+class FileDescriptorPDFDocBuilder : public PDFDocBuilder
+{
+
+public:
+    std::unique_ptr<PDFDoc> buildPDFDoc(const GooString &uri, const std::optional<GooString> &ownerPassword = {}, const std::optional<GooString> &userPassword = {}, void *guiDataA = nullptr) override;
+    bool supports(const GooString &uri) override;
+
+private:
+    int parseFdFromUri(const GooString &uri);
+};
+
+#endif /* FDPDFDOCBUILDER_H */

package/src/lib/win32/poppler-22.04.0/Library/include/poppler/FILECacheLoader.h

@@ -0,0 +1,34 @@
+//========================================================================
+//
+// FILECacheLoader.h
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+// Copyright 2010, 2022 Albert Astals Cid <aacid@kde.org>
+// Copyright 2021 Christian Persch <chpe@src.gnome.org>
+//
+//========================================================================
+
+#ifndef FILECACHELOADER_H
+#define FILECACHELOADER_H
+
+#include "CachedFile.h"
+
+#include <cstdio>
+
+class POPPLER_PRIVATE_EXPORT FILECacheLoader : public CachedFileLoader
+{
+    FILE *file = stdin;
+
+public:
+    FILECacheLoader() = default;
+    ~FILECacheLoader() override;
+
+    explicit FILECacheLoader(FILE *fileA) : file(fileA) { }
+
+    size_t init(CachedFile *cachedFile) override;
+    int load(const std::vector<ByteRange> &ranges, CachedFileWriter *writer) override;
+};
+
+#endif

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

@@ -8,7 +8,7 @@
 // Copyright (C) 2009 Pino Toscano <pino@kde.org>
 // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
-// Copyright (C) 2019, 2021 Oliver Sander <oliver.sander@tu-dresden.de>
+// Copyright (C) 2019, 2021, 2022 Oliver Sander <oliver.sander@tu-dresden.de>
 // Copyright (C) 2019 Adam Reichold <adam.reichold@t-online.de>
 //
 // To see a description of the changes please see the Changelog file that
@@ -30,6 +30,8 @@
 #include "Object.h"
 #include "poppler_private_export.h"
 
+#include <optional>
+#include <string>
 #include <unordered_set>
 
 class GfxFont;
@@ -57,15 +59,13 @@ public:
     // Constructor.
     FontInfo(GfxFont *fontA, XRef *xrefA);
     // Copy constructor
-    FontInfo(const FontInfo &f);
-    // Destructor.
-    ~FontInfo();
+    FontInfo(const FontInfo &f) = default;
 
     FontInfo &operator=(const FontInfo &) = delete;
 
-    const GooString *getName() const { return name; };
-    const GooString *getSubstituteName() const { return substituteName; };
-    const GooString *getFile() const { return file; };
+    const std::optional<std::string> &getName() const { return name; };
+    const std::optional<std::string> &getSubstituteName() const { return substituteName; };
+    const std::optional<std::string> &getFile() const { return file; };
     const std::string &getEncoding() const { return encoding; };
     Type getType() const { return type; };
     bool getEmbedded() const { return emb; };
@@ -75,9 +75,9 @@ public:
     Ref getEmbRef() const { return embRef; };
 
 private:
-    GooString *name;
-    GooString *substituteName;
-    GooString *file;
+    std::optional<std::string> name;
+    std::optional<std::string> substituteName;
+    std::optional<std::string> file;
     std::string encoding;
     Type type;
     bool emb;

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

@@ -6,7 +6,7 @@
 //
 // Copyright 2006 Julien Rebetez <julienr@svn.gnome.org>
 // Copyright 2007, 2008, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright 2007-2010, 2012, 2015-2021 Albert Astals Cid <aacid@kde.org>
+// Copyright 2007-2010, 2012, 2015-2022 Albert Astals Cid <aacid@kde.org>
 // Copyright 2010 Mark Riedesel <mark@klowner.com>
 // Copyright 2011 Pino Toscano <pino@kde.org>
 // Copyright 2012 Fabio D'Urso <fabiodurso@hotmail.it>
@@ -38,6 +38,7 @@
 
 #include <ctime>
 
+#include <optional>
 #include <set>
 #include <vector>
 
@@ -70,19 +71,13 @@ enum FormButtonType
     formButtonRadio
 };
 
-enum VariableTextQuadding
-{
-    quaddingLeftJustified,
-    quaddingCentered,
-    quaddingRightJustified
-};
-
 enum FormSignatureType
 {
     adbe_pkcs7_sha1,
     adbe_pkcs7_detached,
     ETSI_CAdES_detached,
-    unknown_signature_type
+    unknown_signature_type,
+    unsigned_signature_field
 };
 
 enum FillValueType
@@ -310,18 +305,24 @@ public:
     // 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);
+    bool signDocument(const char *filename, const char *certNickname, const char *digestName, const char *password, const GooString *reason = nullptr, const GooString *location = nullptr, const std::optional<GooString> &ownerPassword = {},
+                      const std::optional<GooString> &userPassword = {});
+
+    // Same as above but adds text, font color, etc.
+    bool signDocumentWithAppearance(const char *filename, const char *certNickname, const char *digestName, const char *password, const GooString *reason = nullptr, const GooString *location = nullptr,
+                                    const std::optional<GooString> &ownerPassword = {}, const std::optional<GooString> &userPassword = {}, const GooString &signatureText = {}, const GooString &signatureTextLeft = {}, double fontSize = {},
+                                    std::unique_ptr<AnnotColor> &&fontColor = {}, double borderWidth = {}, std::unique_ptr<AnnotColor> &&borderColor = {}, std::unique_ptr<AnnotColor> &&backgroundColor = {});
 
     // 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)
     // otherwise a nullptr is returned
-    GooString *getCheckedSignature(Goffset *checkedFileSize);
+    std::optional<GooString> getCheckedSignature(Goffset *checkedFileSize);
 
     const GooString *getSignature() const;
 
 private:
     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 getObjectStartEnd(const GooString &filename, int objNum, Goffset *objStart, Goffset *objEnd, const std::optional<GooString> &ownerPassword, const std::optional<GooString> &userPassword);
     bool updateOffsets(FILE *f, Goffset objStart, Goffset objEnd, Goffset *sigStart, Goffset *sigEnd, Goffset *fileSize);
 
     bool updateSignature(FILE *f, Goffset sigStart, Goffset sigEnd, const GooString *signature);
@@ -352,6 +353,8 @@ public:
     bool isStandAlone() const { return standAlone; }
 
     GooString *getDefaultAppearance() const { return defaultAppearance; }
+    void setDefaultAppearance(const std::string &appearance);
+
     bool hasTextQuadding() const { return hasQuadding; }
     VariableTextQuadding getTextQuadding() const { return quadding; }
 
@@ -606,7 +609,7 @@ public:
     // 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)
     // otherwise a nullptr is returned
-    GooString *getCheckedSignature(Goffset *checkedFileSize);
+    std::optional<GooString> getCheckedSignature(Goffset *checkedFileSize);
 
     ~FormFieldSignature() override;
     Object *getByteRange() { return &byte_range; }
@@ -624,6 +627,10 @@ public:
     double getCustomAppearanceLeftFontSize() const;
     void setCustomAppearanceLeftFontSize(double size);
 
+    // Background image (ref to an object of type XObject). Invalid ref if not required.
+    Ref getImageResource() const;
+    void setImageResource(const Ref imageResourceA);
+
     void setCertificateInfo(std::unique_ptr<X509CertificateInfo> &);
 
     FormWidget *getCreateWidget();
@@ -639,6 +646,7 @@ private:
     GooString customAppearanceContent;
     GooString customAppearanceLeftContent;
     double customAppearanceLeftFontSize = 20;
+    Ref imageResource = Ref::INVALID();
     std::unique_ptr<X509CertificateInfo> certificate_info;
 
     void print(int indent) override;
@@ -653,7 +661,7 @@ private:
 class POPPLER_PRIVATE_EXPORT Form
 {
 public:
-    Form(PDFDoc *docA, Object *acroForm);
+    explicit Form(PDFDoc *doc);
 
     ~Form();
 
@@ -668,7 +676,6 @@ public:
        Page::loadStandaloneFields */
     static FormField *createFieldFromDict(Object &&obj, PDFDoc *docA, const Ref aref, FormField *parent, std::set<int> *usedParents);
 
-    Object *getObj() const { return acroForm; }
     bool getNeedAppearances() const { return needAppearances; }
     int getNumFields() const { return numFields; }
     FormField *getRootField(int i) const { return rootFields[i]; }
@@ -691,9 +698,6 @@ private:
     FormField **rootFields;
     int numFields;
     int size;
-    PDFDoc *doc;
-    XRef *xref;
-    Object *acroForm;
     bool needAppearances;
     GfxResources *defaultResources;
     Object resDict;

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

@@ -24,7 +24,7 @@
 // Copyright (C) 2013 Fabio D'Urso <fabiodurso@hotmail.it>
 // 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 Adam Reichold <adam.reichold@t-online.de>
-// Copyright (C) 2019 Oliver Sander <oliver.sander@tu-dresden.de>
+// Copyright (C) 2019, 2022 Oliver Sander <oliver.sander@tu-dresden.de>
 // Copyright (C) 2019 Volker Krause <vkrause@kde.org>
 //
 // To see a description of the changes please see the Changelog file that
@@ -117,8 +117,8 @@ public:
     GfxResources(const GfxResources &) = delete;
     GfxResources &operator=(const GfxResources &other) = delete;
 
-    GfxFont *lookupFont(const char *name);
-    const GfxFont *lookupFont(const char *name) const;
+    std::shared_ptr<GfxFont> lookupFont(const char *name);
+    std::shared_ptr<const GfxFont> lookupFont(const char *name) const;
     Object lookupXObject(const char *name);
     Object lookupXObjectNF(const char *name);
     Object lookupMarkedContentNF(const char *name);
@@ -131,7 +131,7 @@ public:
     GfxResources *getNext() const { return next; }
 
 private:
-    GfxFont *doLookupFont(const char *name) const;
+    std::shared_ptr<GfxFont> doLookupFont(const char *name) const;
 
     GfxFontDict *fonts;
     Object xObjDict;