commit e56461bb8208ad028c2c1673e80a2a23e3eef795
author Albert Astals Cid <aacid@kde.org> Fri Apr 05 17:07:52 2019 +0200
committer Albert Astals Cid <aacid@kde.org> Wed Jun 05 21:00:35 2019 +0200
tree 21e1870fa08d5b15ac0385225d56a29a97b281a4
parent 20cb86345288063294532c03b123c1f08921ff93

AnnotInk(): Rename inkList to inkListArray

to not collide with AnnotInk::inkList

poppler/Annot.cc

diff --git a/poppler/Annot.cc b/poppler/Annot.cc
index faac7ef..8ff40d6 100644
--- a/poppler/Annot.cc
+++ b/poppler/Annot.cc
@@ -5769,12 +5769,12 @@
   annotObj.dictSet ("Subtype", Object(objName, "Ink"));
 
   // Store dummy path with one null vertex only
-  Array *inkList = new Array(doc->getXRef());
+  Array *inkListArray = new Array(doc->getXRef());
   Array *vList = new Array(doc->getXRef());
   vList->add(Object(0.));
   vList->add(Object(0.));
-  inkList->add(Object(vList));
-  annotObj.dictSet("InkList", Object(inkList));
+  inkListArray->add(Object(vList));
+  annotObj.dictSet("InkList", Object(inkListArray));
 
   initialize(docA, annotObj.getDict());
 }