From fe0baffe0dfbf369f422e175c0fcf3dda9055118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Mon, 16 Feb 2015 18:30:19 -0800
Subject: update uv_zip and add tests

---
 src/mbgl/storage/default_file_source.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/mbgl/storage/default_file_source.cpp b/src/mbgl/storage/default_file_source.cpp
index e40aaff649..6d27adbe0e 100644
--- a/src/mbgl/storage/default_file_source.cpp
+++ b/src/mbgl/storage/default_file_source.cpp
@@ -4,6 +4,7 @@
 #include <mbgl/storage/default/http_request.hpp>
 
 #include <mbgl/storage/response.hpp>
+#include <mbgl/platform/platform.hpp>
 
 #include <mbgl/util/async_queue.hpp>
 #include <mbgl/util/util.hpp>
@@ -49,8 +50,9 @@ struct DefaultFileSource::StopAction {
 };
 
 
-DefaultFileSource::DefaultFileSource(FileCache *cache_)
-    : loop(uv_loop_new()),
+DefaultFileSource::DefaultFileSource(FileCache *cache_, const std::string &root)
+    : assetRoot(root.empty() ? platform::assetRoot() : root),
+      loop(uv_loop_new()),
       cache(cache_),
       queue(new Queue(loop, [this](Action &action) {
           mapbox::util::apply_visitor(ActionDispatcher{*this}, action);
@@ -63,8 +65,9 @@ DefaultFileSource::DefaultFileSource(FileCache *cache_)
       }) {
 }
 
-DefaultFileSource::DefaultFileSource(FileCache *cache_, uv_loop_t *loop_)
-    : loop(loop_),
+DefaultFileSource::DefaultFileSource(FileCache *cache_, uv_loop_t *loop_, const std::string &root)
+    : assetRoot(root.empty() ? platform::assetRoot() : root),
+      loop(loop_),
       cache(cache_),
       queue(new Queue(loop, [this](Action &action) {
           mapbox::util::apply_visitor(ActionDispatcher{*this}, action);
-- 
cgit v1.2.1