node-poppler 5.1.1 → 5.1.2

package/src/lib/win32/{poppler-21.11.0 → poppler-22.01.0}/Library/include/poppler/PSOutputDev.h

@@ -29,6 +29,7 @@
 // Copyright (C) 2018, 2020 Philipp Knechtges <philipp-dev@knechtges.com>
 // Copyright (C) 2019 Oliver Sander <oliver.sander@tu-dresden.de>
 // Copyright (C) 2021 Hubert Figuiere <hub@figuiere.net>
+// 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
@@ -124,6 +125,10 @@ public:
                 int imgURXA = 0, int imgURYA = 0, PSForceRasterize forceRasterizeA = psRasterizeWhenNeeded, bool manualCtrlA = false, PSOutCustomCodeCbk customCodeCbkA = nullptr, void *customCodeCbkDataA = nullptr,
                 PSLevel levelA = psLevel2);
 
+    // Open a PSOutputDev that will write to a file descriptor
+    PSOutputDev(int fdA, PDFDoc *docA, char *psTitleA, const std::vector<int> &pages, PSOutMode modeA, int paperWidthA = -1, int paperHeightA = -1, bool noCrop = false, bool duplexA = true, int imgLLXA = 0, int imgLLYA = 0, int imgURXA = 0,
+                int imgURYA = 0, PSForceRasterize forceRasterizeA = psRasterizeWhenNeeded, bool manualCtrlA = false, PSOutCustomCodeCbk customCodeCbkA = nullptr, void *customCodeCbkDataA = nullptr, PSLevel levelA = psLevel2);
+
     // Open a PSOutputDev that will write to a generic stream.
     // pages has to be sorted in increasing order
     PSOutputDev(PSOutputFunc outputFuncA, void *outputStreamA, char *psTitleA, PDFDoc *docA, const std::vector<int> &pages, PSOutMode modeA, int paperWidthA = -1, int paperHeightA = -1, bool noCrop = false, bool duplexA = true,

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

@@ -31,6 +31,8 @@
 // Copyright (C) 2020, 2021 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>
+// 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
@@ -516,7 +518,7 @@ private:
 
 #define fileStreamBufSize 256
 
-class FileStream : public BaseStream
+class POPPLER_PRIVATE_EXPORT FileStream : public BaseStream
 {
 public:
     FileStream(GooFile *fileA, Goffset startA, bool limitedA, Goffset lengthA, Object &&dictA);
@@ -733,9 +735,17 @@ public:
 
 class AutoFreeMemStream : public BaseMemStream<char>
 {
+    bool filterRemovalForbidden = false;
+
 public:
+    // AutoFreeMemStream takes ownership over the buffer.
+    // The buffer should be created using gmalloc().
     AutoFreeMemStream(char *bufA, Goffset startA, Goffset lengthA, Object &&dictA) : BaseMemStream(bufA, startA, lengthA, std::move(dictA)) { }
     ~AutoFreeMemStream() override;
+
+    // A hack to deal with the strange behaviour of PDFDoc::writeObject().
+    bool isFilterRemovalForbidden() const;
+    void setFilterRemovalForbidden(bool forbidden);
 };
 
 //------------------------------------------------------------------------

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

@@ -525,7 +525,7 @@ public:
     TextWord *get(int idx);
 
 private:
-    std::vector<TextWord *> *words;
+    std::vector<TextWord *> words;
 };
 
 #endif // TEXTOUT_WORD_LIST
@@ -596,6 +596,7 @@ public:
 
     // Coalesce strings that look like parts of the same line.
     void coalesce(bool physLayout, double fixedPitch, bool doHTML);
+    void coalesce(bool physLayout, double fixedPitch, bool doHTML, double minColSpacing1);
 
     // Find a string.  If <startAtTop> is true, starts looking at the
     // top of the page; else if <startAtLast> is true, starts looking
@@ -689,7 +690,7 @@ private:
                           //   previous char
     bool diagonal; // whether the current text is diagonal
 
-    TextPool *pools[4]; // a "pool" of TextWords for each rotation
+    std::unique_ptr<TextPool> pools[4]; // a "pool" of TextWords for each rotation
     TextFlow *flows; // linked list of flows
     TextBlock **blocks; // array of blocks, in yx order
     int nBlocks; // number of blocks
@@ -700,14 +701,14 @@ private:
                         //   rawOrder is set)
     TextWord *rawLastWord; // last word on rawWords list
 
-    std::vector<TextFontInfo *> *fonts; // all font info objects used on this page
+    std::vector<std::unique_ptr<TextFontInfo>> fonts; // all font info objects used on this page
 
     double lastFindXMin, // coordinates of the last "find" result
             lastFindYMin;
     bool haveLastFind;
 
-    std::vector<TextUnderline *> *underlines;
-    std::vector<TextLink *> *links;
+    std::vector<std::unique_ptr<TextUnderline>> underlines;
+    std::vector<std::unique_ptr<TextLink>> links;
 
     int refCnt;
 
@@ -756,6 +757,8 @@ private:
 class POPPLER_PRIVATE_EXPORT TextOutputDev : public OutputDev
 {
 public:
+    static double minColSpacing1_default;
+
     // Open a text output file.  If <fileName> is NULL, no file is
     // written (this is useful, e.g., for searching text).  If
     // <physLayoutA> is true, the original physical layout of the text
@@ -885,6 +888,8 @@ public:
     }
     void setTextEOL(EndOfLineKind textEOLA) { textEOL = textEOLA; }
     void setTextPageBreaks(bool textPageBreaksA) { textPageBreaks = textPageBreaksA; }
+    double getMinColSpacing1() const { return minColSpacing1; }
+    void setMinColSpacing1(double val) { minColSpacing1 = val; }
 
 private:
     TextOutputFunc outputFunc; // output function
@@ -897,6 +902,7 @@ private:
     double fixedPitch; // if physLayout is true and this is non-zero,
                        //   assume fixed-pitch characters with this
                        //   width
+    double minColSpacing1; // see default value defined with same name at TextOutputDev.cc
     bool rawOrder; // keep text in content stream order
     bool discardDiag; // Diagonal text, i.e., text that is not close to one of the
                       // 0, 90, 180, or 270 degree axes, is discarded. This is useful

package/src/lib/win32/{poppler-21.11.0 → poppler-22.01.0}/Library/include/poppler/XRef.h

@@ -26,6 +26,7 @@
 // Copyright (C) 2018 Adam Reichold <adam.reichold@t-online.de>
 // Copyright (C) 2018 Marek Kasik <mkasik@redhat.com>
 // Copyright (C) 2021 Mahmoud 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
@@ -204,10 +205,16 @@ public:
 
     // Write access
     void setModifiedObject(const Object *o, Ref r);
-    Ref addIndirectObject(const Object *o);
+    Ref addIndirectObject(const Object &o);
     void removeIndirectObject(Ref r);
     void add(int num, int gen, Goffset offs, bool used);
     void add(Ref ref, Goffset offs, bool used);
+    // Adds a stream object using AutoFreeMemStream.
+    // The function takes ownership over dict and buffer.
+    // The buffer should be created using gmalloc().
+    // Returns ref to a new object.
+    Ref addStreamObject(Dict *dict, char *buffer, const Goffset bufferSize);
+    Ref addStreamObject(Dict *dict, uint8_t *buffer, const Goffset bufferSize);
 
     // Output XRef table to stream
     void writeTableToFile(OutStream *outStr, bool writeAllEntries);

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

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

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

@@ -111,6 +111,10 @@ POPPLER_PUBLIC
 gsize poppler_attachment_get_size(PopplerAttachment *attachment);
 POPPLER_PUBLIC
 gboolean poppler_attachment_save(PopplerAttachment *attachment, const char *filename, GError **error);
+#ifndef G_OS_WIN32
+POPPLER_PUBLIC
+gboolean poppler_attachment_save_to_fd(PopplerAttachment *attachment, int fd, GError **error);
+#endif
 POPPLER_PUBLIC
 gboolean poppler_attachment_save_to_callback(PopplerAttachment *attachment, PopplerAttachmentSaveFunc save_func, gpointer user_data, GError **error);
 

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

@@ -2,8 +2,9 @@
  * Copyright (C) 2004, Red Hat, Inc.
  *
  * Copyright (C) 2016 Jakub Alba <jakubalba@gmail.com>
- * Copyright (C) 2018-2019 Marek Kasik <mkasik@redhat.com>
+ * Copyright (C) 2018, 2019, 2021 Marek Kasik <mkasik@redhat.com>
  * Copyright (C) 2019 Masamichi Hosoda <trueroad@trueroad.jp>
+ * Copyright (C) 2021 André Guerreiro <aguerreiro1985@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -290,6 +291,7 @@ typedef enum
 
 POPPLER_PUBLIC
 GType poppler_document_get_type(void) G_GNUC_CONST;
+
 POPPLER_PUBLIC
 PopplerDocument *poppler_document_new_from_file(const char *uri, const char *password, GError **error);
 POPPLER_PUBLIC
@@ -300,10 +302,18 @@ POPPLER_PUBLIC
 PopplerDocument *poppler_document_new_from_stream(GInputStream *stream, goffset length, const char *password, GCancellable *cancellable, GError **error);
 POPPLER_PUBLIC
 PopplerDocument *poppler_document_new_from_gfile(GFile *file, const char *password, GCancellable *cancellable, GError **error);
+#ifndef G_OS_WIN32
+POPPLER_PUBLIC
+PopplerDocument *poppler_document_new_from_fd(int fd, const char *password, GError **error);
+#endif
 POPPLER_PUBLIC
 gboolean poppler_document_save(PopplerDocument *document, const char *uri, GError **error);
 POPPLER_PUBLIC
 gboolean poppler_document_save_a_copy(PopplerDocument *document, const char *uri, GError **error);
+#ifndef G_OS_WIN32
+POPPLER_PUBLIC
+gboolean poppler_document_save_to_fd(PopplerDocument *document, int fd, gboolean include_changes, GError **error);
+#endif
 POPPLER_PUBLIC
 gboolean poppler_document_get_id(PopplerDocument *document, gchar **permanent_id, gchar **update_id);
 POPPLER_PUBLIC
@@ -407,6 +417,10 @@ void poppler_document_reset_form(PopplerDocument *document, GList *fields, gbool
 POPPLER_PUBLIC
 gboolean poppler_document_has_javascript(PopplerDocument *document);
 
+/* Signatures */
+POPPLER_PUBLIC
+gint poppler_document_get_n_signatures(const PopplerDocument *document);
+
 /* Interface for getting the Index of a poppler_document */
 #define POPPLER_TYPE_INDEX_ITER (poppler_index_iter_get_type())
 POPPLER_PUBLIC
@@ -494,6 +508,10 @@ POPPLER_PUBLIC
 GType poppler_ps_file_get_type(void) G_GNUC_CONST;
 POPPLER_PUBLIC
 PopplerPSFile *poppler_ps_file_new(PopplerDocument *document, const char *filename, int first_page, int n_pages);
+#ifndef G_OS_WIN32
+POPPLER_PUBLIC
+PopplerPSFile *poppler_ps_file_new_fd(PopplerDocument *document, int fd, int first_page, int n_pages);
+#endif
 POPPLER_PUBLIC
 void poppler_ps_file_set_paper_size(PopplerPSFile *ps_file, double width, double height);
 POPPLER_PUBLIC

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

@@ -79,6 +79,15 @@ GType poppler_pdf_conformance_get_type (void) G_GNUC_CONST;
 
 /* enumerations from "poppler-form-field.h" */
 POPPLER_PUBLIC
+GType poppler_signature_status_get_type (void) G_GNUC_CONST;
+#define POPPLER_TYPE_SIGNATURE_STATUS (poppler_signature_status_get_type ())
+POPPLER_PUBLIC
+GType poppler_certificate_status_get_type (void) G_GNUC_CONST;
+#define POPPLER_TYPE_CERTIFICATE_STATUS (poppler_certificate_status_get_type ())
+POPPLER_PUBLIC
+GType poppler_signature_validation_flags_get_type (void) G_GNUC_CONST;
+#define POPPLER_TYPE_SIGNATURE_VALIDATION_FLAGS (poppler_signature_validation_flags_get_type ())
+POPPLER_PUBLIC
 GType poppler_form_field_type_get_type (void) G_GNUC_CONST;
 #define POPPLER_TYPE_FORM_FIELD_TYPE (poppler_form_field_type_get_type ())
 POPPLER_PUBLIC

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

@@ -45,7 +45,7 @@
  *
  * Since: 0.12
  */
-#define POPPLER_MAJOR_VERSION (21)
+#define POPPLER_MAJOR_VERSION (22)
 
 /**
  * POPPLER_MINOR_VERSION:
@@ -55,7 +55,7 @@
  *
  * Since: 0.12
  */
-#define POPPLER_MINOR_VERSION (11)
+#define POPPLER_MINOR_VERSION (1)
 
 /**
  * POPPLER_MICRO_VERSION:

package/src/lib/win32/{poppler-21.11.0 → poppler-22.01.0}/Library/include/poppler/glib/poppler-form-field.h

@@ -1,6 +1,8 @@
 /* poppler-form-field.h: glib interface to poppler
  *
  * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org>
+ * Copyright (C) 2021 André Guerreiro <aguerreiro1985@gmail.com>
+ * Copyright (C) 2021 Marek Kasik <mkasik@redhat.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +31,73 @@ G_BEGIN_DECLS
 #define POPPLER_FORM_FIELD(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_FORM_FIELD, PopplerFormField))
 #define POPPLER_IS_FORM_FIELD(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_FORM_FIELD))
 
+/**
+ * PopplerSignatureStatus
+ * @POPPLER_SIGNATURE_VALID: signature is cryptographically valid
+ * @POPPLER_SIGNATURE_INVALID: signature is cryptographically invalid
+ * @POPPLER_SIGNATURE_DIGEST_MISMATCH: document content was changed after the signature was applied
+ * @POPPLER_SIGNATURE_DECODING_ERROR: signature CMS/PKCS7 structure is malformed
+ * @POPPLER_SIGNATURE_GENERIC_ERROR: failed to verify signature
+ * @POPPLER_SIGNATURE_NOT_FOUND: requested signature is not present in the document
+ * @POPPLER_SIGNATURE_NOT_VERIFIED: signature not yet verified
+ *
+ * Signature verification results
+ *
+ * Since: 21.12.0
+ */
+typedef enum
+{
+    POPPLER_SIGNATURE_VALID,
+    POPPLER_SIGNATURE_INVALID,
+    POPPLER_SIGNATURE_DIGEST_MISMATCH,
+    POPPLER_SIGNATURE_DECODING_ERROR,
+    POPPLER_SIGNATURE_GENERIC_ERROR,
+    POPPLER_SIGNATURE_NOT_FOUND,
+    POPPLER_SIGNATURE_NOT_VERIFIED
+} PopplerSignatureStatus;
+
+/**
+ * PopplerCertificateStatus
+ * @POPPLER_CERTIFICATE_TRUSTED: certificate is considered trusted
+ * @POPPLER_CERTIFICATE_UNTRUSTED_ISSUER: the issuer of this certificate has been marked as untrusted by the user
+ * @POPPLER_CERTIFICATE_UNKNOWN_ISSUER: this certificate trust chain has not finished in a trusted root certificate
+ * @POPPLER_CERTIFICATE_REVOKED: certificate was revoked by the issuing certificate authority
+ * @POPPLER_CERTIFICATE_EXPIRED: signing time is outside the validity bounds of this certificate
+ * @POPPLER_CERTIFICATE_GENERIC_ERROR: failed to verify certificate
+ * @POPPLER_CERTIFICATE_NOT_VERIFIED: certificate not yet verified
+ *
+ * Signature certificate verification results
+ *
+ * Since: 21.12.0
+ */
+typedef enum
+{
+    POPPLER_CERTIFICATE_TRUSTED,
+    POPPLER_CERTIFICATE_UNTRUSTED_ISSUER,
+    POPPLER_CERTIFICATE_UNKNOWN_ISSUER,
+    POPPLER_CERTIFICATE_REVOKED,
+    POPPLER_CERTIFICATE_EXPIRED,
+    POPPLER_CERTIFICATE_GENERIC_ERROR,
+    POPPLER_CERTIFICATE_NOT_VERIFIED
+} PopplerCertificateStatus;
+
+/**
+ * PopplerSignatureValidationFlags
+ * @POPPLER_SIGNATURE_VALIDATION_FLAG_VALIDATE_CERTIFICATE: Whether to validate also the certificate of the signature
+ * @POPPLER_SIGNATURE_VALIDATION_FLAG_WITHOUT_OCSP_REVOCATION_CHECK: Whether to not do OCSP (Online Certificate Status Protocol) revocation check
+ * @POPPLER_SIGNATURE_VALIDATION_FLAG_USE_AIA_CERTIFICATE_FETCH: Whether to use AIA (Authority Information Access) extension for certificate fetching
+ *
+ * Signature validation flags
+ *
+ * Since: 21.12.0
+ */
+typedef enum /*< flags >*/
+{
+    POPPLER_SIGNATURE_VALIDATION_FLAG_VALIDATE_CERTIFICATE = 1 << 0,
+    POPPLER_SIGNATURE_VALIDATION_FLAG_WITHOUT_OCSP_REVOCATION_CHECK = 1 << 1,
+    POPPLER_SIGNATURE_VALIDATION_FLAG_USE_AIA_CERTIFICATE_FETCH = 1 << 2,
+} PopplerSignatureValidationFlags;
+
 typedef enum
 {
     POPPLER_FORM_FIELD_UNKNOWN,
@@ -156,6 +225,29 @@ POPPLER_PUBLIC
 void poppler_form_field_choice_set_text(PopplerFormField *field, const gchar *text);
 POPPLER_PUBLIC
 gchar *poppler_form_field_choice_get_text(PopplerFormField *field);
+POPPLER_PUBLIC
+PopplerSignatureInfo *poppler_form_field_signature_validate_sync(PopplerFormField *field, PopplerSignatureValidationFlags flags, GCancellable *cancellable, GError **error);
+POPPLER_PUBLIC
+void poppler_form_field_signature_validate_async(PopplerFormField *field, PopplerSignatureValidationFlags flags, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+POPPLER_PUBLIC
+PopplerSignatureInfo *poppler_form_field_signature_validate_finish(PopplerFormField *field, GAsyncResult *result, GError **error);
+
+/* Signature Field */
+#define POPPLER_TYPE_SIGNATURE_INFO (poppler_signature_info_get_type())
+POPPLER_PUBLIC
+GType poppler_signature_info_get_type(void) G_GNUC_CONST;
+POPPLER_PUBLIC
+PopplerSignatureInfo *poppler_signature_info_copy(const PopplerSignatureInfo *siginfo);
+POPPLER_PUBLIC
+void poppler_signature_info_free(PopplerSignatureInfo *siginfo);
+POPPLER_PUBLIC
+PopplerSignatureStatus poppler_signature_info_get_signature_status(const PopplerSignatureInfo *siginfo);
+POPPLER_PUBLIC
+PopplerCertificateStatus poppler_signature_info_get_certificate_status(const PopplerSignatureInfo *siginfo);
+POPPLER_PUBLIC
+const gchar *poppler_signature_info_get_signer_name(const PopplerSignatureInfo *siginfo);
+POPPLER_PUBLIC
+GDateTime *poppler_signature_info_get_local_signing_time(const PopplerSignatureInfo *siginfo);
 
 G_END_DECLS
 

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

@@ -68,6 +68,10 @@ POPPLER_PUBLIC
 gfloat poppler_media_get_repeat_count(PopplerMedia *poppler_media);
 POPPLER_PUBLIC
 gboolean poppler_media_save(PopplerMedia *poppler_media, const char *filename, GError **error);
+#ifndef G_OS_WIN32
+POPPLER_PUBLIC
+gboolean poppler_media_save_to_fd(PopplerMedia *poppler_media, int fd, GError **error);
+#endif
 POPPLER_PUBLIC
 gboolean poppler_media_save_to_callback(PopplerMedia *poppler_media, PopplerMediaSaveFunc save_func, gpointer user_data, GError **error);
 

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

@@ -1,5 +1,6 @@
 /* poppler.h: glib interface to poppler
  * Copyright (C) 2004, Red Hat, Inc.
+ * Copyright (C) 2021 André Guerreiro <aguerreiro1985@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -217,6 +218,7 @@ typedef struct _PopplerStructureElement PopplerStructureElement;
 typedef struct _PopplerStructureElementIter PopplerStructureElementIter;
 typedef struct _PopplerTextSpan PopplerTextSpan;
 typedef struct _PopplerPageRange PopplerPageRange;
+typedef struct _PopplerSignatureInfo PopplerSignatureInfo;
 
 /**
  * PopplerBackend:

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

@@ -37,6 +37,8 @@ inline bool checkedAssign(long long lz, T *z)
 template<typename T>
 inline bool checkedAdd(T x, T y, T *z)
 {
+// The __GNUC__ checks can not be removed until we depend on GCC >= 10.1
+// which is the first version that returns true for __has_builtin(__builtin_add_overflow)
 #if __GNUC__ >= 5 || __has_builtin(__builtin_add_overflow)
     return __builtin_add_overflow(x, y, z);
 #else
@@ -87,6 +89,21 @@ inline bool checkedMultiply(T x, T y, T *z)
 #endif
 }
 
+template<>
+inline bool checkedMultiply<long long>(long long x, long long y, long long *z)
+{
+#if __GNUC__ >= 5 || __has_builtin(__builtin_mul_overflow)
+    return __builtin_mul_overflow(x, y, z);
+#else
+    if (x != 0 && (std::numeric_limits<long long>::max)() / x < y) {
+        return true;
+    }
+
+    *z = x * y;
+    return false;
+#endif
+}
+
 template<typename T>
 inline T safeAverage(T a, T b)
 {

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

@@ -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>
@@ -121,7 +122,10 @@ public:
     int read(char *buf, int n, Goffset offset) const;
     Goffset size() const;
 
-    static GooFile *open(const GooString *fileName);
+    static GooFile *open(const std::string &fileName);
+#ifndef _WIN32
+    static GooFile *open(int fdA);
+#endif
 
 #ifdef _WIN32
     static GooFile *open(const wchar_t *fileName);