Implement fillGooString in terms of fillString

This requires to add a method to GooString that allows access
as a mutable std::string&.

2 files changed, 2 insertions, 6 deletions

diff --git a/goo/GooString.h b/goo/GooString.h
index 11baa8ae..78824455 100644
--- a/goo/GooString.h
+++ b/goo/GooString.h
@@ -68,6 +68,7 @@ public:
   explicit GooString(std::string&& str) : std::string(std::move(str)) {}
 
   const std::string& toStr() const { return *this; }
+  std::string& toNonConstStr() { return *this; }
 
   // Create a string from <lengthA> chars at <sA>.  This string
   // can contain null characters.
diff --git a/poppler/Stream.h b/poppler/Stream.h
index e19790e5..04dfd053 100644
--- a/poppler/Stream.h
+++ b/poppler/Stream.h
@@ -142,12 +142,7 @@ public:
 
   inline void fillGooString(GooString *s)
   {
-    unsigned char readBuf[4096];
-    int readChars;
-    reset();
-    while ((readChars = doGetChars(4096, readBuf)) != 0) {
-      s->append((const char *)readBuf, readChars);
-    }
+    fillString(s->toNonConstStr());
   }
   
   inline unsigned char *toUnsignedChars(int *length, int initialSize = 4096, int sizeIncrement = 4096)