summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2019-06-26 22:53:44 +0200
committerAlbert Astals Cid <aacid@kde.org>2019-06-26 22:53:44 +0200
commit67c6f6025fd441e60b3bdcedcfae7121d6f80b30 (patch)
tree244b4eb845362cb929120dee15196af392762669
parenta24536c619a463763517401045eaf251190c7db0 (diff)
Add Jose (C) and move error() message as discussed in gitlab
-rw-r--r--poppler/Annot.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/poppler/Annot.cc b/poppler/Annot.cc
index 18357a9c..bbccd820 100644
--- a/poppler/Annot.cc
+++ b/poppler/Annot.cc
@@ -23,7 +23,7 @@
// Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
// Copyright (C) 2008 Hugo Mercier <hmercier31@gmail.com>
// Copyright (C) 2009 Ilya Gorenbein <igorenbein@finjan.com>
-// Copyright (C) 2011, 2013 José Aliste <jaliste@src.gnome.org>
+// Copyright (C) 2011, 2013, 2019 José Aliste <jaliste@src.gnome.org>
// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
// Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2012, 2015 Tobias Koenig <tokoe@kdab.com>
@@ -5833,12 +5833,13 @@ void AnnotInk::initialize(PDFDoc *docA, Dict* dict) {
} else {
inkListLength = 0;
inkList = nullptr;
- obj1 = dict->lookup("AP");
+ error(errSyntaxError, -1, "Bad Annot Ink List");
+ obj1 = dict->lookup("AP");
// Although InkList is required, it should be ignored
- // when there is an AP entry in the Annot.
+ // when there is an AP entry in the Annot, so do not fail
+ // when that happens
if (!obj1.isDict()) {
- error(errSyntaxError, -1, "Bad Annot Ink List");
ok = false;
}
}