[poppler] 2 commits - poppler/XRef.cc

[Albert Astals Cid]

 poppler/XRef.cc |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a92f87b83e3c6c9078508c644aa09f4f2b14e9cc
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Apr 23 00:06:18 2012 +0200

    Do not complain if the entry is missing
    
    Since we are actually looking for non existing entries :D

diff --git a/poppler/XRef.cc b/poppler/XRef.cc
index ddb9ed3..dfc6d73 100644
--- a/poppler/XRef.cc
+++ b/poppler/XRef.cc
@@ -1199,7 +1199,7 @@ void XRef::setModifiedObject (Object* o, Ref r) {
 Ref XRef::addIndirectObject (Object* o) {
   int entryIndexToUse = -1;
   for (int i = 1; entryIndexToUse == -1 && i < size; ++i) {
-    XRefEntry *e = getEntry(i);
+    XRefEntry *e = getEntry(i, false /* complainIfMissing */);
     if (e->type == xrefEntryFree && e->gen != 65535) {
       entryIndexToUse = i;
     }
commit 114e113e3278d02baaffd6c0da7fda266283c176
Author: Fabio D'Urso <fabiodurso at hotmail.it>
Date:   Sat Apr 21 21:08:55 2012 +0200

    Do not allocate XRef entries whose generation number is 65535

diff --git a/poppler/XRef.cc b/poppler/XRef.cc
index e025107..ddb9ed3 100644
--- a/poppler/XRef.cc
+++ b/poppler/XRef.cc
@@ -1199,7 +1199,10 @@ void XRef::setModifiedObject (Object* o, Ref r) {
 Ref XRef::addIndirectObject (Object* o) {
   int entryIndexToUse = -1;
   for (int i = 1; entryIndexToUse == -1 && i < size; ++i) {
-    if (getEntry(i)->type == xrefEntryFree) entryIndexToUse = i;
+    XRefEntry *e = getEntry(i);
+    if (e->type == xrefEntryFree && e->gen != 65535) {
+      entryIndexToUse = i;
+    }
   }
 
   XRefEntry *e;