[poppler] 2 commits - poppler/CurlCachedFile.cc poppler/CurlCachedFile.h poppler/Form.cc

[Albert Astals Cid]

 poppler/CurlCachedFile.cc |    3 +--
 poppler/CurlCachedFile.h  |    2 +-
 poppler/Form.cc           |    8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 1802ddef374cb1451975480b2427e5d23ee2c737
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Nov 20 18:58:17 2010 +0000

    Forgot to port this away from GooVector :-S

diff --git a/poppler/CurlCachedFile.cc b/poppler/CurlCachedFile.cc
index 35f5104..f4beec2 100644
--- a/poppler/CurlCachedFile.cc
+++ b/poppler/CurlCachedFile.cc
@@ -15,7 +15,6 @@
 #include "CurlCachedFile.h"
 
 #include "goo/GooString.h"
-#include "goo/GooVector.h"
 
 //------------------------------------------------------------------------
 
@@ -68,7 +67,7 @@ size_t load_cb(const char *ptr, size_t size, size_t nmemb, void *data)
   return (writer->write) (ptr, size*nmemb);
 }
 
-int CurlCachedFileLoader::load(const GooVector<ByteRange> &ranges, CachedFileWriter *writer)
+int CurlCachedFileLoader::load(const std::vector<ByteRange> &ranges, CachedFileWriter *writer)
 {
   CURLcode r = CURLE_OK;
   size_t fromByte, toByte;
diff --git a/poppler/CurlCachedFile.h b/poppler/CurlCachedFile.h
index b5f2e7d..49882ab 100644
--- a/poppler/CurlCachedFile.h
+++ b/poppler/CurlCachedFile.h
@@ -26,7 +26,7 @@ public:
   CurlCachedFileLoader();
   ~CurlCachedFileLoader();
   size_t init(GooString *url, CachedFile* cachedFile);
-  int load(const GooVector<ByteRange> &ranges, CachedFileWriter *writer);
+  int load(const std::vector<ByteRange> &ranges, CachedFileWriter *writer);
 
 private:
 
commit 32e53c5436b8c3654e7043f1d86596a79511a4cf
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Nov 20 18:54:59 2010 +0000

    fix spacing

diff --git a/poppler/Form.cc b/poppler/Form.cc
index 5194f66..78e46ef 100644
--- a/poppler/Form.cc
+++ b/poppler/Form.cc
@@ -795,9 +795,9 @@ FormField::FormField(XRef* xrefA, Object *aobj, const Ref& aref, FormFieldType t
         // are widgets, create widgets for them
         Object obj4;
 
-	if (obj2.dictLookup("Subtype",&obj4)->isName()) {
-	  _createWidget(&obj2, childRef.getRef());
-	}
+        if (obj2.dictLookup("Subtype",&obj4)->isName()) {
+          _createWidget(&obj2, childRef.getRef());
+        }
         obj4.free();
       } else if(obj2.dictLookup("FT", &obj3)->isName() || obj2.dictLookup("Kids", &obj3)->isArray()) {
         if(terminal) error(-1, "Field can't have both Widget AND Field as kids\n");
@@ -806,7 +806,7 @@ FormField::FormField(XRef* xrefA, Object *aobj, const Ref& aref, FormFieldType t
         children = (FormField**)greallocn(children, numChildren, sizeof(FormField*));
 
         obj3.free();
-	children[numChildren-1] = Form::createFieldFromDict (&obj2, xrefA, childRef.getRef());
+        children[numChildren-1] = Form::createFieldFromDict (&obj2, xrefA, childRef.getRef());
       }
       // 1 - we will handle 'collapsed' fields (field + annot in the same dict)
       // as if the annot was in the Kids array of the field