From d0e6c8dd6ebb984fa621420ae886da9c29093e14 Mon Sep 17 00:00:00 2001
From: Michael Nilsson <michaelnilsson90@hotmail.com>
Date: Thu, 5 May 2016 11:07:00 -0400
Subject: [PATCH] removed progresscallback from downloadToMemory

---
 include/openspace/engine/downloadmanager.h |  3 +--
 src/engine/downloadmanager.cpp             | 17 ++++-------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/include/openspace/engine/downloadmanager.h b/include/openspace/engine/downloadmanager.h
index 7b35ea282d..fdea67f210 100644
--- a/include/openspace/engine/downloadmanager.h
+++ b/include/openspace/engine/downloadmanager.h
@@ -78,8 +78,7 @@ public:
 
     std::shared_ptr<FileFuture> downloadToMemory(
         const std::string& url, std::string& memoryBuffer,
-        DownloadFinishedCallback finishedCallback = DownloadFinishedCallback(),
-        DownloadProgressCallback progressCallback = DownloadProgressCallback()
+        DownloadFinishedCallback finishedCallback = DownloadFinishedCallback()
     );
 
     std::vector<std::shared_ptr<FileFuture>> downloadRequestFiles(const std::string& identifier,
diff --git a/src/engine/downloadmanager.cpp b/src/engine/downloadmanager.cpp
index 7af3b084e8..2628741de4 100644
--- a/src/engine/downloadmanager.cpp
+++ b/src/engine/downloadmanager.cpp
@@ -205,28 +205,19 @@ std::shared_ptr<DownloadManager::FileFuture> DownloadManager::downloadFile(
 
 std::shared_ptr<DownloadManager::FileFuture> DownloadManager::downloadToMemory(
     const std::string& url, std::string& memoryBuffer,
-    DownloadFinishedCallback finishedCallback, DownloadProgressCallback progressCallback)
+    DownloadFinishedCallback finishedCallback)
 {
 
     std::shared_ptr<FileFuture> future = std::make_shared<FileFuture>(std::string("memory"));
     LDEBUG("Start downloading file: '" << url << "' into memory");
     
-    auto downloadFunction = [url, finishedCallback, progressCallback, future, &memoryBuffer]() {
+    auto downloadFunction = [url, finishedCallback, future, &memoryBuffer]() {
         CURL* curl = curl_easy_init();
         if (curl) {
             curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
             curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
             curl_easy_setopt(curl, CURLOPT_WRITEDATA, &memoryBuffer);
             curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writeToMemory);
-            
-            ProgressInformation p = {
-                future,
-                std::chrono::system_clock::now(),
-                &progressCallback
-            };
-            curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, xferinfo);
-            curl_easy_setopt(curl, CURLOPT_XFERINFODATA, &p);
-            curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L);
             curl_easy_setopt(curl, CURLOPT_TIMEOUT, 5L);
             
             CURLcode res = curl_easy_perform(curl);
@@ -238,14 +229,14 @@ std::shared_ptr<DownloadManager::FileFuture> DownloadManager::downloadToMemory(
                     future->format = std::string(ct);
                     future->isFinished = true;
                 }
-            } else{
+            } else {
                 future->errorMessage = curl_easy_strerror(res);
                 future->isAborted = true;
             }
 
             if (finishedCallback)
                 finishedCallback(*future);
-    
+
             curl_easy_cleanup(curl);
             
         }