summaryrefslogtreecommitdiff
path: root/platform/default
diff options
context:
space:
mode:
Diffstat (limited to 'platform/default')
-rw-r--r--platform/default/bidi.cpp2
-rw-r--r--platform/default/default_file_source.cpp10
-rw-r--r--platform/default/jpeg_reader.cpp4
-rw-r--r--platform/default/local_file_source.cpp6
-rw-r--r--platform/default/mbgl/storage/offline_database.cpp4
-rw-r--r--platform/default/mbgl/storage/offline_database.hpp2
-rw-r--r--platform/default/mbgl/storage/offline_download.cpp4
-rw-r--r--platform/default/mbgl/storage/offline_download.hpp2
-rw-r--r--platform/default/online_file_source.cpp4
9 files changed, 19 insertions, 19 deletions
diff --git a/platform/default/bidi.cpp b/platform/default/bidi.cpp
index 25b4dbe3a7..eb4e658733 100644
--- a/platform/default/bidi.cpp
+++ b/platform/default/bidi.cpp
@@ -18,7 +18,7 @@ public:
UBiDi* bidiText = nullptr;
UBiDi* bidiLine = nullptr;
};
-
+
BiDi::BiDi() : impl(std::make_unique<BiDiImpl>()) {}
BiDi::~BiDi() = default;
diff --git a/platform/default/default_file_source.cpp b/platform/default/default_file_source.cpp
index c4222b5a12..894ec65a5e 100644
--- a/platform/default/default_file_source.cpp
+++ b/platform/default/default_file_source.cpp
@@ -29,11 +29,11 @@ public:
Impl(const std::string& cachePath, uint64_t maximumCacheSize)
: offlineDatabase(cachePath, maximumCacheSize) {
}
-
+
void setAPIBaseURL(const std::string& url) {
onlineFileSource.setAPIBaseURL(url);
}
-
+
std::string getAPIBaseURL() const{
return onlineFileSource.getAPIBaseURL();
}
@@ -63,7 +63,7 @@ public:
callback(std::current_exception(), {});
}
}
-
+
void updateMetadata(const int64_t regionID,
const OfflineRegionMetadata& metadata,
std::function<void (std::exception_ptr, optional<OfflineRegionMetadata>)> callback) {
@@ -174,11 +174,11 @@ DefaultFileSource::~DefaultFileSource() = default;
void DefaultFileSource::setAPIBaseURL(const std::string& baseURL) {
thread->invokeSync(&Impl::setAPIBaseURL, baseURL);
}
-
+
std::string DefaultFileSource::getAPIBaseURL() const {
return thread->invokeSync(&Impl::getAPIBaseURL);
}
-
+
void DefaultFileSource::setAccessToken(const std::string& accessToken) {
thread->invokeSync(&Impl::setAccessToken, accessToken);
}
diff --git a/platform/default/jpeg_reader.cpp b/platform/default/jpeg_reader.cpp
index 78c74f2fd7..c5e9d880c0 100644
--- a/platform/default/jpeg_reader.cpp
+++ b/platform/default/jpeg_reader.cpp
@@ -35,7 +35,7 @@ static boolean fill_input_buffer(j_decompress_ptr cinfo) {
}
static void skip(j_decompress_ptr cinfo, long count) {
- if (count <= 0) return; //A zero or negative skip count should be treated as a no-op.
+ if (count <= 0) return; // A zero or negative skip count should be treated as a no-op.
jpeg_stream_wrapper* wrap = reinterpret_cast<jpeg_stream_wrapper*>(cinfo->src);
if (wrap->manager.bytes_in_buffer > 0 && count < static_cast<long>(wrap->manager.bytes_in_buffer))
@@ -48,7 +48,7 @@ static void skip(j_decompress_ptr cinfo, long count) {
wrap->stream->seekg(count - wrap->manager.bytes_in_buffer, std::ios_base::cur);
// trigger buffer fill
wrap->manager.next_input_byte = nullptr;
- wrap->manager.bytes_in_buffer = 0; //bytes_in_buffer may be zero on return.
+ wrap->manager.bytes_in_buffer = 0; // bytes_in_buffer may be zero on return.
}
}
diff --git a/platform/default/local_file_source.cpp b/platform/default/local_file_source.cpp
index 5686b453dc..93b42f5fa0 100644
--- a/platform/default/local_file_source.cpp
+++ b/platform/default/local_file_source.cpp
@@ -14,7 +14,7 @@ namespace {
const char* protocol = "file://";
const std::size_t protocolLength = 7;
-
+
} // namespace
namespace mbgl {
@@ -22,7 +22,7 @@ namespace mbgl {
class LocalFileSource::Impl {
public:
void request(const std::string& url, FileSource::Callback callback) {
- //Cut off the protocol
+ // Cut off the protocol
std::string path = mbgl::util::percentDecode(url.substr(protocolLength));
Response response;
@@ -58,7 +58,7 @@ LocalFileSource::~LocalFileSource() = default;
std::unique_ptr<AsyncRequest> LocalFileSource::request(const Resource& resource, Callback callback) {
return thread->invokeWithCallback(&Impl::request, resource.url, callback);
}
-
+
bool LocalFileSource::acceptsURL(const std::string& url) {
return url.compare(0, protocolLength, protocol) == 0;
}
diff --git a/platform/default/mbgl/storage/offline_database.cpp b/platform/default/mbgl/storage/offline_database.cpp
index 9f531bcac4..02736f10a4 100644
--- a/platform/default/mbgl/storage/offline_database.cpp
+++ b/platform/default/mbgl/storage/offline_database.cpp
@@ -578,7 +578,7 @@ OfflineRegionMetadata OfflineDatabase::updateMetadata(const int64_t regionID, co
stmt->bindBlob(1, metadata);
stmt->bind(2, regionID);
stmt->run();
-
+
return metadata;
}
@@ -815,7 +815,7 @@ bool OfflineDatabase::evict(uint64_t neededFreeSize) {
return false;
}
Timestamp accessed = accessedStmt->get<Timestamp>(0);
-
+
// clang-format off
Statement stmt1 = getStatement(
"DELETE FROM resources "
diff --git a/platform/default/mbgl/storage/offline_database.hpp b/platform/default/mbgl/storage/offline_database.hpp
index 875677f7cf..57ffcee4eb 100644
--- a/platform/default/mbgl/storage/offline_database.hpp
+++ b/platform/default/mbgl/storage/offline_database.hpp
@@ -41,7 +41,7 @@ public:
const OfflineRegionMetadata&);
OfflineRegionMetadata updateMetadata(const int64_t regionID, const OfflineRegionMetadata&);
-
+
void deleteRegion(OfflineRegion&&);
// Return value is (response, stored size)
diff --git a/platform/default/mbgl/storage/offline_download.cpp b/platform/default/mbgl/storage/offline_download.cpp
index 3edc75845c..c8aa98d874 100644
--- a/platform/default/mbgl/storage/offline_download.cpp
+++ b/platform/default/mbgl/storage/offline_download.cpp
@@ -252,7 +252,7 @@ void OfflineDownload::ensureResource(const Resource& resource,
auto workRequestsIt = requests.insert(requests.begin(), nullptr);
*workRequestsIt = util::RunLoop::Get()->invokeCancellable([=]() {
requests.erase(workRequestsIt);
-
+
auto getResourceSizeInDatabase = [&] () -> optional<int64_t> {
if (!callback) {
return offlineDatabase.hasRegionResource(id, resource);
@@ -264,7 +264,7 @@ void OfflineDownload::ensureResource(const Resource& resource,
callback(response->first);
return response->second;
};
-
+
optional<int64_t> offlineResponse = getResourceSizeInDatabase();
if (offlineResponse) {
status.completedResourceCount++;
diff --git a/platform/default/mbgl/storage/offline_download.hpp b/platform/default/mbgl/storage/offline_download.hpp
index f29a053a87..c978ded931 100644
--- a/platform/default/mbgl/storage/offline_download.hpp
+++ b/platform/default/mbgl/storage/offline_download.hpp
@@ -47,7 +47,7 @@ private:
*/
void ensureResource(const Resource&, std::function<void (Response)> = {});
bool checkTileCountLimit(const Resource& resource);
-
+
int64_t id;
OfflineRegionDefinition definition;
OfflineDatabase& offlineDatabase;
diff --git a/platform/default/online_file_source.cpp b/platform/default/online_file_source.cpp
index 0f2bc5ff56..33168b7973 100644
--- a/platform/default/online_file_source.cpp
+++ b/platform/default/online_file_source.cpp
@@ -122,11 +122,11 @@ public:
activateRequest(request);
assert(pendingRequestsMap.size() == pendingRequestsList.size());
}
-
+
bool isPending(OnlineFileRequest* request) {
return pendingRequestsMap.find(request) != pendingRequestsMap.end();
}
-
+
bool isActive(OnlineFileRequest* request) {
return activeRequests.find(request) != activeRequests.end();
}