[poppler] 2 commits - poppler/Link.h poppler/OutputDev.h

[Albert Astals Cid]

 poppler/Link.h      |    4 ++--
 poppler/OutputDev.h |    7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 97aa11bf135421c1f87f2a46e2f597626f503f10
Author: Oliver Sander <oliver.sander at tu-dresden.de>
Date:   Fri Mar 23 22:04:11 2018 +0100

    Document method drawImageMask

diff --git a/poppler/OutputDev.h b/poppler/OutputDev.h
index da9cf0a8..41518db0 100644
--- a/poppler/OutputDev.h
+++ b/poppler/OutputDev.h
@@ -23,7 +23,7 @@
 // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger at googlemail.com>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
 // Copyright (C) 2012 William Bader <williambader at hotmail.com>
-// Copyright (C) 2017 Oliver Sander <oliver.sander at tu-dresden.de>
+// Copyright (C) 2017, 2018 Oliver Sander <oliver.sander at tu-dresden.de>
 // Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info at kdab.com>. Work sponsored by the LiMux project of the city of Munich
 //
 // To see a description of the changes please see the Changelog file that
@@ -276,6 +276,11 @@ public:
   virtual void endActualText(GfxState * /*state*/) {}
 
   //----- image drawing
+  // Draw an image mask.  An image mask is a one-bit-per-pixel image, where each pixel
+  // can only be 'fill color' or 'transparent'.
+  //
+  // If 'invert' is false, a sample value of 0 marks the page with the current color,
+  // and a 1 leaves the previous contents unchanged. If 'invert' is true, these meanings are reversed.
   virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
 			     int width, int height, GBool invert, GBool interpolate,
 			     GBool inlineImg);
commit ae4349620863a42ae569f1ce05461bb27340c4ea
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Apr 16 22:49:54 2018 +0200

    Make the second parseAction variant private

diff --git a/poppler/Link.h b/poppler/Link.h
index 4388523c..1fc013e0 100644
--- a/poppler/Link.h
+++ b/poppler/Link.h
@@ -86,8 +86,6 @@ public:
 
   // Parse an action dictionary.
   static LinkAction *parseAction(const Object *obj, const GooString *baseURI = nullptr);
-  static LinkAction *parseAction(const Object *obj, const GooString *baseURI,
-                                 std::set<int> *seenNextActions);
 
   // A List of the next actions to execute in order.
   // The list contains pointer to LinkAction objects.
@@ -97,6 +95,8 @@ public:
   void setNextActions(GooList *actions);
 
 private:
+  static LinkAction *parseAction(const Object *obj, const GooString *baseURI, std::set<int> *seenNextActions);
+
   GooList *nextActionList;
 };