diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-01-08 12:14:39 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-01-08 12:14:39 +0100 |
commit | bc309d84d77a5719a332f2dffdf24006d8610f97 (patch) | |
tree | 44cc87134e9eb59c3a259482cfdca50c84b287d6 /platform/default/online_file_source.cpp | |
parent | b6fca670896e6351a03916fd9fb646e1970d3ebe (diff) | |
download | qtlocation-mapboxgl-bc309d84d77a5719a332f2dffdf24006d8610f97.tar.gz |
[core] unify URL prefix detection (asset:// and mapbox://)
Diffstat (limited to 'platform/default/online_file_source.cpp')
-rw-r--r-- | platform/default/online_file_source.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/platform/default/online_file_source.cpp b/platform/default/online_file_source.cpp index 871bd36d43..c482d6d96f 100644 --- a/platform/default/online_file_source.cpp +++ b/platform/default/online_file_source.cpp @@ -14,21 +14,13 @@ #include <mbgl/util/async_task.hpp> #include <mbgl/util/noncopyable.hpp> #include <mbgl/util/timer.hpp> - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow" -#pragma GCC diagnostic ignored "-Wunknown-pragmas" -#pragma GCC diagnostic ignored "-Wunused-local-typedefs" -#include <boost/algorithm/string.hpp> -#pragma GCC diagnostic pop +#include <mbgl/util/url.hpp> #include <algorithm> #include <cassert> #include <set> #include <unordered_map> -namespace algo = boost::algorithm; - namespace mbgl { class RequestBase; @@ -299,7 +291,7 @@ void OnlineFileSource::Impl::startRealRequest(OnlineFileRequestImpl& request) { reschedule(request); }; - if (algo::starts_with(request.resource.url, "asset://")) { + if (util::isAssetURL(request.resource.url)) { request.realRequest = assetContext->createRequest(request.resource.url, callback, assetRoot); } else { |