[poppler] 2 commits - poppler/XRef.cc

[Albert Astals Cid]

 poppler/XRef.cc |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit a9d7ea2eb549acbf6ca7e2a299ffed46ff3d8758
Merge: 397d7b4... 9bb6845...
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Sep 26 15:31:29 2012 +0200

    Merge remote-tracking branch 'origin/poppler-0.20'
    
    Conflicts:
    	poppler/XRef.cc

diff --cc poppler/XRef.cc
index c8a93b9,a076bb0..8559046
--- a/poppler/XRef.cc
+++ b/poppler/XRef.cc
@@@ -267,10 -267,7 +267,11 @@@ void XRef::init() 
    objStrs = new PopplerCache(5);
    mainXRefEntriesOffset = 0;
    xRefStream = gFalse;
 +  scannedSpecialFlags = gFalse;
 +  encrypted = gFalse;
 +  permFlags = defPermFlags;
 +  ownerPasswordOk = gFalse;
+   rootNum = -1;
  }
  
  XRef::XRef() {
commit 9bb68456de41d24db7acf61204bc3f4e36e98505
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Sep 26 15:13:47 2012 +0200

    Initilize rootNum
    
    Fixes valgrind warnings about uninitialized uses

diff --git a/poppler/XRef.cc b/poppler/XRef.cc
index 4d01320..a076bb0 100644
--- a/poppler/XRef.cc
+++ b/poppler/XRef.cc
@@ -267,6 +267,7 @@ void XRef::init() {
   objStrs = new PopplerCache(5);
   mainXRefEntriesOffset = 0;
   xRefStream = gFalse;
+  rootNum = -1;
 }
 
 XRef::XRef() {