node-poppler 5.0.2 → 5.1.2

package/src/lib/win32/{poppler-21.10.0 → poppler-22.01.0}/Library/include/poppler/Annot.h

@@ -40,6 +40,7 @@
 // Copyright (C) 2021 Klarälvdalens Datakonsult AB, a KDAB Group company, <info@kdab.com>.
 // Copyright (C) 2021 Zachary Travis <ztravis@everlaw.com>
 // Copyright (C) 2021 Mahmoud Ahmed Khalil <mahmoudkhalil11@gmail.com>
+// Copyright (C) 2021 Georgiy Sgibnev <georgiy@sgibnev.com>. 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
@@ -597,7 +598,8 @@ private:
                              XRef *xref, Dict *resourcesDict);
     bool drawSignatureFieldText(const FormFieldSignature *field, const Form *form, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect,
                                 XRef *xref, Dict *resourcesDict);
-    void drawSignatureFieldText(const GooString &text, const DefaultAppearance &da, const AnnotBorder *border, const PDFRectangle *rect, XRef *xref, Dict *resourcesDict, double leftMargin, bool centerVertically, bool centerHorizontally);
+    void drawSignatureFieldText(const GooString &text, const DefaultAppearance &da, const AnnotBorder *border, const PDFRectangle *rect, XRef *xref, Dict *resourcesDict, double leftMargin, bool centerVertically, bool centerHorizontally,
+                                const Ref imageResourceRef = Ref::INVALID());
     bool drawText(const GooString *text, const GooString *da, const GfxResources *resources, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect, bool multiline, int comb, int quadding,
                   bool txField, bool forceZapfDingbats, XRef *xref, bool password, Dict *resourcesDict, const char *defaultFallback = "Helvetica");
     void drawArrowPath(double x, double y, const Matrix &m, int orientation = 1);

package/src/lib/win32/{poppler-21.10.0 → poppler-22.01.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.10.0 → poppler-22.01.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
@@ -238,7 +239,7 @@ public:
         printing = printingA;
         needFontUpdate = true;
     }
-    void setAntialias(cairo_antialias_t antialias);
+    void copyAntialias(cairo_t *cr, cairo_t *source_cr);
 
     void setInType3Char(bool inType3CharA) { inType3Char = inType3CharA; }
     void getType3GlyphWidth(double *wx, double *wy)
@@ -264,7 +265,6 @@ protected:
 #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 15, 10)
     bool setMimeDataForCCITTParams(Stream *str, cairo_surface_t *image, int height);
 #endif
-    static void setContextAntialias(cairo_t *cr, cairo_antialias_t antialias);
 
     GfxRGB fill_color, stroke_color;
     cairo_pattern_t *fill_pattern, *stroke_pattern;
@@ -317,7 +317,6 @@ protected:
     double t3_glyph_wx, t3_glyph_wy;
     bool t3_glyph_has_bbox;
     double t3_glyph_bbox[4];
-    cairo_antialias_t antialias;
     bool prescaleImages;
 
     TextPage *textPage; // text for the current page

package/src/lib/win32/{poppler-21.10.0 → poppler-22.01.0}/Library/include/poppler/Catalog.h

@@ -80,7 +80,7 @@ public:
     int numEntries() { return length; };
     // iterator accessor, note it returns a pointer to the internal object, do not free nor delete it
     Object *getValue(int i);
-    GooString *getName(int i);
+    const GooString *getName(int i) const;
 
 private:
     struct Entry
@@ -174,7 +174,7 @@ public:
     int numDestNameTree() { return getDestNameTree()->numEntries(); }
 
     // Get the i'th named destination name in name-tree
-    GooString *getDestNameTreeName(int i) { return getDestNameTree()->getName(i); }
+    const GooString *getDestNameTreeName(int i) { return getDestNameTree()->getName(i); }
 
     // Get the i'th named destination link destination in name-tree
     std::unique_ptr<LinkDest> getDestNameTreeDest(int i);
@@ -195,7 +195,7 @@ public:
 
     // Get the number of javascript scripts
     int numJS() { return getJSNameTree()->numEntries(); }
-    GooString *getJSName(int i) { return getJSNameTree()->getName(i); }
+    const GooString *getJSName(int i) { return getJSNameTree()->getName(i); }
 
     // Get the i'th JavaScript script (at the Document level) in the document
     GooString *getJS(int i);

package/src/lib/win32/{poppler-21.10.0 → poppler-22.01.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-21.10.0/Library/include/poppler/StdinPDFDocBuilder.h → poppler-22.01.0/Library/include/poppler/FDPDFDocBuilder.h}

@@ -1,32 +1,36 @@
 //========================================================================
 //
-// StdinPDFDocBuilder.h
+// FileDescriptorPDFDocBuilder.h
 //
 // 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 2021 Oliver Sander <oliver.sander@tu-dresden.de>
+// Copyright 2021 Christian Persch <chpe@src.gnome.org>
 //
 //========================================================================
 
-#ifndef STDINPDFDOCBUILDER_H
-#define STDINPDFDOCBUILDER_H
+#ifndef FDPDFDOCBUILDER_H
+#define FDPDFDOCBUILDER_H
 
 #include "PDFDocBuilder.h"
 
 //------------------------------------------------------------------------
-// StdinPDFDocBuilder
+// FileDescriptorPDFDocBuilder
 //
-// The StdinPDFDocBuilder implements a PDFDocBuilder that read from stdin.
+// The FileDescriptorPDFDocBuilder implements a PDFDocBuilder that read from a file descriptor.
 //------------------------------------------------------------------------
 
-class StdinPDFDocBuilder : public PDFDocBuilder
+class FileDescriptorPDFDocBuilder : public PDFDocBuilder
 {
 
 public:
     std::unique_ptr<PDFDoc> buildPDFDoc(const GooString &uri, GooString *ownerPassword = nullptr, GooString *userPassword = nullptr, void *guiDataA = nullptr) override;
     bool supports(const GooString &uri) override;
+
+private:
+    int parseFdFromUri(const GooString &uri);
 };
 
-#endif /* STDINPDFDOCBUILDER_H */
+#endif /* FDPDFDOCBUILDER_H */

package/src/lib/win32/{poppler-21.10.0/Library/include/poppler/StdinCachedFile.h → poppler-22.01.0/Library/include/poppler/FILECacheLoader.h}

@@ -1,23 +1,32 @@
 //========================================================================
 //
-// StdinCachedFile.h
+// FILECacheLoader.h
 //
 // 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 2021 Christian Persch <chpe@src.gnome.org>
 //
 //========================================================================
 
-#ifndef STDINCACHELOADER_H
-#define STDINCACHELOADER_H
+#ifndef FILECACHELOADER_H
+#define FILECACHELOADER_H
 
 #include "CachedFile.h"
 
-class StdinCacheLoader : public CachedFileLoader
+#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(GooString *dummy, CachedFile *cachedFile) override;
     int load(const std::vector<ByteRange> &ranges, CachedFileWriter *writer) override;
 };

package/src/lib/win32/{poppler-21.10.0 → poppler-22.01.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>
 
@@ -310,18 +311,19 @@ 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 GooString *ownerPassword = nullptr,
+                      const GooString *userPassword = 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)
     // 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(GooString *filename, int objNum, Goffset *objStart, Goffset *objEnd, const GooString *ownerPassword, const 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);
@@ -496,10 +498,10 @@ public:
     void print(int indent) override;
     void reset(const std::vector<std::string> &excludedFields) override;
 
-    static int tokenizeDA(const GooString *daString, std::vector<GooString *> *daToks, const char *searchTok);
+    static int tokenizeDA(const std::string &daString, std::vector<std::string> *daToks, const char *searchTok);
 
 protected:
-    int parseDA(std::vector<GooString *> *daToks);
+    int parseDA(std::vector<std::string> *daToks);
     void fillContent(FillValueType fillType);
 
     GooString *content;
@@ -606,7 +608,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 +626,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 +645,7 @@ private:
     GooString customAppearanceContent;
     GooString customAppearanceLeftContent;
     double customAppearanceLeftFontSize = 20;
+    Ref imageResource = Ref::INVALID();
     std::unique_ptr<X509CertificateInfo> certificate_info;
 
     void print(int indent) override;

package/src/lib/win32/{poppler-21.10.0 → poppler-22.01.0}/Library/include/poppler/GfxFont.h

@@ -13,7 +13,7 @@
 // All changes made under the Poppler project to this file are licensed
 // under GPL version 2 or later
 //
-// Copyright (C) 2005, 2008, 2015, 2017-2020 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2008, 2015, 2017-2021 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
 // Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
@@ -131,10 +131,6 @@ public:
                      //   (if locType == gfxFontLocResident)
     int fontNum; // for TrueType collections
                  //   (if locType == gfxFontLocExternal)
-    GooString *encoding; // PS font encoding, only for 16-bit fonts
-                         //   (if locType == gfxFontLocResident)
-    int wMode; // writing mode, only for 16-bit fonts
-               //   (if locType == gfxFontLocResident)
     int substIdx; // substitute font index
                   //   (if locType == gfxFontLocExternal,
                   //   and a Base-14 substitution was made)
@@ -193,13 +189,13 @@ public:
     void decRefCnt();
 
     // Get font tag.
-    const GooString *getTag() const { return tag; }
+    const std::string &getTag() const { return tag; }
 
     // Get font dictionary ID.
     const Ref *getID() const { return &id; }
 
     // Does this font match the tag?
-    bool matches(const char *tagA) const { return !tag->cmp(tagA); }
+    bool matches(const char *tagA) const { return tag == tagA; }
 
     // Get font family name.
     GooString *getFamily() const { return family; }
@@ -309,13 +305,13 @@ protected:
     CharCodeToUnicode *readToUnicodeCMap(Dict *fontDict, int nBits, CharCodeToUnicode *ctu);
     static GfxFontLoc *getExternalFont(GooString *path, bool cid);
 
-    GooString *tag; // PDF font tag
-    Ref id; // reference (used as unique ID)
+    const std::string tag; // PDF font tag
+    const Ref id; // reference (used as unique ID)
     const GooString *name; // font name
     GooString *family; // font family
     Stretch stretch; // font stretch
     Weight weight; // font weight
-    GfxFontType type; // type of font
+    const GfxFontType type; // type of font
     int flags; // font descriptor flags
     GooString *embFontName; // name of embedded font
     Ref embFontID; // ref to embedded font file stream
@@ -455,11 +451,11 @@ public:
     GfxFontDict &operator=(const GfxFontDict &) = delete;
 
     // Get the specified font.
-    GfxFont *lookup(const char *tag);
+    GfxFont *lookup(const char *tag) const;
 
     // Iterative access.
-    int getNumFonts() { return numFonts; }
-    GfxFont *getFont(int i) { return fonts[i]; }
+    int getNumFonts() const { return numFonts; }
+    GfxFont *getFont(int i) const { return fonts[i]; }
 
 private:
     int hashFontObject(Object *obj);

package/src/lib/win32/{poppler-21.10.0 → poppler-22.01.0}/Library/include/poppler/GlobalParams.h

@@ -118,10 +118,7 @@ public:
     GooString *findFontFile(const GooString *fontName);
     GooString *findBase14FontFile(const GooString *base14Name, const GfxFont *font);
     GooString *findSystemFontFile(const GfxFont *font, SysFontType *type, int *fontNum, GooString *substituteFontName = nullptr, const GooString *base14Name = nullptr);
-    bool getPSExpandSmaller();
-    bool getPSShrinkLarger();
     std::string getTextEncodingName() const;
-    bool getOverprintPreview() { return overprintPreview; }
     bool getPrintCommands();
     bool getProfileCommands();
     bool getErrQuiet();
@@ -133,14 +130,11 @@ public:
 
     const UnicodeMap *getUtf8Map();
 
-    std::vector<GooString *> *getEncodingNames();
+    std::vector<std::string> getEncodingNames();
 
     //----- functions to set parameters
     void addFontFile(const GooString *fontName, const GooString *path);
-    void setPSExpandSmaller(bool expand);
-    void setPSShrinkLarger(bool shrink);
     void setTextEncoding(const char *encodingName);
-    void setOverprintPreview(bool overprintPreviewA);
     void setPrintCommands(bool printCommandsA);
     void setProfileCommands(bool profileCommandsA);
     void setErrQuiet(bool errQuietA);
@@ -177,7 +171,7 @@ private:
     std::unordered_map<std::string, std::string> unicodeMaps;
     // list of CMap dirs, indexed by collection
     std::unordered_multimap<std::string, std::string> cMapDirs;
-    std::vector<GooString *> *toUnicodeDirs; // list of ToUnicode CMap dirs
+    std::vector<GooString *> toUnicodeDirs; // list of ToUnicode CMap dirs
     bool baseFontsInitialized;
 #ifdef _WIN32
     // windows font substitutes (for CID fonts)
@@ -186,11 +180,8 @@ private:
     // font files: font name mapped to path
     std::unordered_map<std::string, std::string> fontFiles;
     SysFontList *sysFonts; // system fonts
-    bool psExpandSmaller; // expand smaller pages to fill paper
-    bool psShrinkLarger; // shrink larger pages to fit paper
     GooString *textEncoding; // encoding (unicodeMap) to use for text
                              //   output
-    bool overprintPreview; // enable overprint preview
     bool printCommands; // print the drawing commands
     bool profileCommands; // profile the drawing commands
     bool errQuiet; // suppress error messages?

package/src/lib/win32/{poppler-21.10.0 → poppler-22.01.0}/Library/include/poppler/MarkedContentOutputDev.h

@@ -6,6 +6,7 @@
 //
 // Copyright 2013 Igalia S.L.
 // Copyright 2018-2021 Albert Astals Cid <aacid@kde.org>
+// Copyright 2021 Adrian Johnson <ajohnson@redneon.com>
 //
 //========================================================================
 
@@ -88,7 +89,7 @@ typedef std::vector<TextSpan> TextSpanArray;
 class POPPLER_PRIVATE_EXPORT MarkedContentOutputDev : public OutputDev
 {
 public:
-    explicit MarkedContentOutputDev(int mcidA);
+    explicit MarkedContentOutputDev(int mcidA, const Object &stmObj);
     ~MarkedContentOutputDev() override;
 
     virtual bool isOk() { return true; }
@@ -101,6 +102,9 @@ public:
     void startPage(int pageNum, GfxState *state, XRef *xref) override;
     void endPage() override;
 
+    void beginForm(Ref id) override;
+    void endForm(Ref id) override;
+
     void drawChar(GfxState *state, double xx, double yy, double dx, double dy, double ox, double oy, CharCode c, int nBytes, const Unicode *u, int uLen) override;
 
     void beginMarkedContent(const char *name, Dict *properties) override;
@@ -111,6 +115,7 @@ public:
 private:
     void endSpan();
     bool inMarkedContent() const { return mcidStack.size() > 0; }
+    bool contentStreamMatch();
     bool needFontChange(const GfxFont *font) const;
 
     GfxFont *currentFont;
@@ -119,9 +124,11 @@ private:
     TextSpanArray textSpans;
     int mcid;
     std::vector<int> mcidStack;
+    std::vector<Ref> formStack;
     double pageWidth;
     double pageHeight;
     const UnicodeMap *unicodeMap;
+    Object stmRef;
 };
 
 #endif /* !MARKEDCONTENTOUTPUTDEV_H */

package/src/lib/win32/{poppler-21.10.0 → poppler-22.01.0}/Library/include/poppler/Object.h

@@ -263,9 +263,14 @@ public:
         type = objNull;
     }
 
-    // Copy this to obj
+    // Copies all object types except
+    // objArray, objDict, objStream whose refcount is increased by 1
     Object copy() const;
 
+    // Deep copies all object types (recursively)
+    // except objStream whose refcount is increased by 1
+    Object deepCopy() const;
+
     // If object is a Ref, fetch and return the referenced object.
     // Otherwise, return a copy of the object.
     Object fetch(XRef *xref, int recursion = 0) const;
@@ -409,24 +414,11 @@ public:
         OBJECT_TYPE_CHECK(objString);
         return string;
     }
-    // After takeString() the only method that should be called for the object is free().
-    GooString *takeString()
-    {
-        OBJECT_TYPE_CHECK(objString);
-        type = objDead;
-        return string;
-    }
     const GooString *getHexString() const
     {
         OBJECT_TYPE_CHECK(objHexString);
         return string;
     }
-    GooString *takeHexString()
-    {
-        OBJECT_TYPE_CHECK(objHexString);
-        type = objDead;
-        return string;
-    }
     const char *getName() const
     {
         OBJECT_TYPE_CHECK(objName);

package/src/lib/win32/{poppler-21.10.0 → poppler-22.01.0}/Library/include/poppler/OutputDev.h

@@ -16,7 +16,7 @@
 // Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
 // Copyright (C) 2006 Thorkild Stray <thorkild@ifi.uio.no>
 // Copyright (C) 2007 Jeff Muizelaar <jeff@infidigm.net>
-// Copyright (C) 2007, 2011, 2017 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2007, 2011, 2017, 2021 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2009-2013, 2015 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2009, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2009, 2012, 2013, 2018, 2019, 2021 Albert Astals Cid <aacid@kde.org>
@@ -320,7 +320,9 @@ public:
     virtual void type3D1(GfxState * /*state*/, double /*wx*/, double /*wy*/, double /*llx*/, double /*lly*/, double /*urx*/, double /*ury*/) { }
 
     //----- form XObjects
+    virtual void beginForm(Ref /*id*/) { }
     virtual void drawForm(Ref /*id*/) { }
+    virtual void endForm(Ref /*id*/) { }
 
     //----- PostScript XObjects
     virtual void psXObject(Stream * /*psStream*/, Stream * /*level1Stream*/) { }