[poppler] poppler/Catalog.cc

[Albert Astals Cid]

 poppler/Catalog.cc |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 7a74c4071f001664c4383ea8e4e9d941bdb438b4
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sun Aug 19 19:52:56 2018 +0200

    Don't give a warning when Marked value is false
    
    Bug #107430

diff --git a/poppler/Catalog.cc b/poppler/Catalog.cc
index d259bda6..e6fde7ab 100644
--- a/poppler/Catalog.cc
+++ b/poppler/Catalog.cc
@@ -14,7 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2005 Kristian Høgsberg <krh at redhat.com>
-// Copyright (C) 2005-2013, 2015, 2017 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005-2013, 2015, 2017, 2018 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2005 Jeff Muizelaar <jrmuizel at nit.ca>
 // Copyright (C) 2005 Jonathan Blandford <jrb at redhat.com>
 // Copyright (C) 2005 Marco Pesenti Gritti <mpg at redhat.com>
@@ -877,10 +877,13 @@ Guint Catalog::getMarkInfo()
       Object markInfoDict = catDict.dictLookup("MarkInfo");
       if (markInfoDict.isDict()) {
         Object value = markInfoDict.dictLookup("Marked");
-        if (value.isBool() && value.getBool())
-          markInfo |= markInfoMarked;
-        else if (!value.isNull())
+        if (value.isBool()) {
+          if (value.getBool()) {
+            markInfo |= markInfoMarked;
+          }
+        } else if (!value.isNull()) {
           error(errSyntaxError, -1, "Marked object is wrong type ({0:s})", value.getTypeName());
+        }
 
         value = markInfoDict.dictLookup("Suspects");
         if (value.isBool() && value.getBool())