[poppler] Branch 'better_object' - poppler/CurlPDFDocBuilder.cc poppler/Stream.cc

[Albert Astals Cid]

 poppler/CurlPDFDocBuilder.cc |    5 +----
 poppler/Stream.cc            |    2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 687474e17db59482dc4538740701bdb32bc9d6bd
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Jul 31 16:47:31 2017 +0200

    Build++

diff --git a/poppler/CurlPDFDocBuilder.cc b/poppler/CurlPDFDocBuilder.cc
index 5b02b14a..91d4c307 100644
--- a/poppler/CurlPDFDocBuilder.cc
+++ b/poppler/CurlPDFDocBuilder.cc
@@ -24,14 +24,11 @@ PDFDoc *
 CurlPDFDocBuilder::buildPDFDoc(const GooString &uri,
         GooString *ownerPassword, GooString *userPassword, void *guiDataA)
 {
-    Object obj;
-
     CachedFile *cachedFile = new CachedFile(
         new CurlCachedFileLoader(), uri.copy());
 
-    obj.initNull();
     BaseStream *str = new CachedFileStream(
-         cachedFile, 0, gFalse, cachedFile->getLength(), &obj);
+         cachedFile, 0, gFalse, cachedFile->getLength(), Object(objNull));
 
     return new PDFDoc(str, ownerPassword, userPassword, guiDataA);
 }
diff --git a/poppler/Stream.cc b/poppler/Stream.cc
index ac031a74..649fbbd0 100644
--- a/poppler/Stream.cc
+++ b/poppler/Stream.cc
@@ -2420,7 +2420,7 @@ static const int dctZigZag[64] = {
   63
 };
 
-DCTStream::DCTStream(Stream *strA, int colorXformA, Object *dict, int recursion):
+DCTStream::DCTStream(Stream *strA, int colorXformA, Dict *dict, int recursion):
     FilterStream(strA) {
   int i, j;