TileCache: re-factor API to work in terms of vectors, not file references.

Change-Id: Ia9d48773121ab965b79ddb16b55b5d3fdcd7fd5c

3 files changed, 5 insertions, 8 deletions

diff --git a/common/MessageQueue.hpp b/common/MessageQueue.hpp
index d0a7e8054..74acc7ea8 100644
--- a/common/MessageQueue.hpp
+++ b/common/MessageQueue.hpp
@@ -125,7 +125,6 @@ private:
     std::vector<Payload> _queue;
     mutable std::mutex _mutex;
     std::condition_variable _cv;
-
 };
 
 typedef MessageQueueBase<std::vector<char>> MessageQueue;
diff --git a/common/Unit.cpp b/common/Unit.cpp
index 28dba3488..6221cd1e9 100644
--- a/common/Unit.cpp
+++ b/common/Unit.cpp
@@ -170,16 +170,13 @@ void UnitWSD::configure(Poco::Util::LayeredConfiguration &config)
 }
 
 void UnitWSD::lookupTile(int part, int width, int height, int tilePosX, int tilePosY,
-                         int tileWidth, int tileHeight, std::unique_ptr<std::fstream>& cacheFile)
+                         int tileWidth, int tileHeight,
+                         std::shared_ptr<std::vector<char>> &tile)
 {
-    if (cacheFile && cacheFile->is_open())
-    {
+    if (tile)
         onTileCacheHit(part, width, height, tilePosX, tilePosY, tileWidth, tileHeight);
-    }
     else
-    {
         onTileCacheMiss(part, width, height, tilePosX, tilePosY, tileWidth, tileHeight);
-    }
 }
 
 UnitKit::UnitKit()
diff --git a/common/Unit.hpp b/common/Unit.hpp
index 4d018b80b..2c390ad94 100644
--- a/common/Unit.hpp
+++ b/common/Unit.hpp
@@ -214,7 +214,8 @@ public:
     // ---------------- TileCache hooks ----------------
     /// Called before the lookupTile call returns. Should always be called to fire events.
     virtual void lookupTile(int part, int width, int height, int tilePosX, int tilePosY,
-                            int tileWidth, int tileHeight, std::unique_ptr<std::fstream>& cacheFile);
+                            int tileWidth, int tileHeight,
+                            std::shared_ptr<std::vector<char>> &tile);
 
     // ---------------- DocumentBroker hooks ----------------
     virtual bool filterLoad(const std::string& /* sessionId */,