tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Fix google-default-arguments errors in header files

Browse Source 
As reported by clang-tidy-8.
This commit is contained in:
Thiago Marcos P. Santos
2020-03-27 18:30:35 +02:00
parent c92be2965c
commit 7751e4be76
9 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mbgl/storage/file_source.hpp
View File

@@ -48,7 +48,7 @@ public:
// Allows to forward response from one source to another.
// Optionally, callback can be provided to receive notification for forward
// operation.
virtual void forward(const Resource&, const Response&, std::function<void()> = {}) {}
virtual void forward(const Resource&, const Response&, std::function<void()>) {}
// When a file source supports consulting a local cache only, it must return true.
// Cache-only requests are requests that aren't as urgent, but could be useful, e.g.

2
include/mbgl/style/sources/geojson_source.hpp
View File

@@ -50,7 +50,7 @@ public:
// SuperclusterData
virtual Features getChildren(std::uint32_t) = 0;
virtual Features getLeaves(std::uint32_t, std::uint32_t limit = 10u, std::uint32_t offset = 0u) = 0;
virtual Features getLeaves(std::uint32_t, std::uint32_t limit, std::uint32_t offset) = 0;
virtual std::uint8_t getClusterExpansionZoom(std::uint32_t) = 0;
virtual std::shared_ptr<Scheduler> getScheduler() { return nullptr; }

2
platform/default/src/mbgl/storage/main_resource_loader.cpp
View File

@@ -40,7 +40,7 @@ public:
MBGL_TIMING_START(watch);
return onlineFileSource->request(res, [=, ptr = parentKeepAlive](const Response& response) {
if (databaseFileSource) {
databaseFileSource->forward(res, response);
databaseFileSource->forward(res, response, nullptr);
}
if (res.kind == Resource::Kind::Tile) {
// onlineResponse.data will be null if data not modified

5
src/mbgl/gfx/context.hpp
View File

@@ -43,9 +43,8 @@ public:
virtual void reduceMemoryUsage() = 0;
public:
virtual std::unique_ptr<OffscreenTexture>
createOffscreenTexture(Size,
TextureChannelDataType = TextureChannelDataType::UnsignedByte) = 0;
virtual std::unique_ptr<OffscreenTexture> createOffscreenTexture(Size, TextureChannelDataType) = 0;
public:
// Creates an empty texture with the specified dimensions.
Texture createTexture(const Size size,

3
src/mbgl/renderer/layers/render_hillshade_layer.cpp
View File

@@ -140,7 +140,8 @@ void RenderHillshadeLayer::render(PaintParameters& parameters) {
assert(bucket.dem);
const uint16_t stride = bucket.getDEMData().stride;
const uint16_t tilesize = bucket.getDEMData().dim;
auto view = parameters.context.createOffscreenTexture({ tilesize, tilesize });
auto view = parameters.context.createOffscreenTexture({tilesize, tilesize},
gfx::TextureChannelDataType::UnsignedByte);
auto renderPass = parameters.encoder->createRenderPass(
"hillshade prepare", { *view, Color{ 0.0f, 0.0f, 0.0f, 0.0f }, {}, {} });

4
src/mbgl/renderer/sources/render_geojson_source.cpp
View File

@@ -46,11 +46,11 @@ FeatureExtensionValue getLeaves(std::shared_ptr<style::GeoJSONData> clusterData,
static_cast<std::uint32_t>(*limit),
static_cast<std::uint32_t>(*offset));
}
return clusterData->getLeaves(clusterID, static_cast<std::uint32_t>(*limit));
return clusterData->getLeaves(clusterID, static_cast<std::uint32_t>(*limit), 0u);
}
}
return clusterData->getLeaves(clusterID);
return clusterData->getLeaves(clusterID, 10u, 0u);
}
// NOLINTNEXTLINE(performance-unnecessary-value-param)

19
test/map/map.test.cpp
View File

@@ -350,12 +350,13 @@ TEST(Map, Offline) {
const std::string prefix = "http://127.0.0.1:3000/";
std::shared_ptr<FileSource> dbfs =
FileSourceManager::get()->getFileSource(FileSourceType::Database, ResourceOptions{});
dbfs->forward(Resource::style(prefix + "style.json"), expiredItem("style.json"));
dbfs->forward(Resource::source(prefix + "streets.json"), expiredItem("streets.json"));
dbfs->forward(Resource::spriteJSON(prefix + "sprite", 1.0), expiredItem("sprite.json"));
dbfs->forward(Resource::spriteImage(prefix + "sprite", 1.0), expiredItem("sprite.png"));
dbfs->forward(Resource::style(prefix + "style.json"), expiredItem("style.json"), [] {});
dbfs->forward(Resource::source(prefix + "streets.json"), expiredItem("streets.json"), [] {});
dbfs->forward(Resource::spriteJSON(prefix + "sprite", 1.0), expiredItem("sprite.json"), [] {});
dbfs->forward(Resource::spriteImage(prefix + "sprite", 1.0), expiredItem("sprite.png"), [] {});
dbfs->forward(Resource::tile(prefix + "{z}-{x}-{y}.vector.pbf", 1.0, 0, 0, 0, Tileset::Scheme::XYZ),
expiredItem("0-0-0.vector.pbf"));
expiredItem("0-0-0.vector.pbf"),
[] {});
dbfs->forward(Resource::glyphs(prefix + "{fontstack}/{range}.pbf", {{"Helvetica"}}, {0, 255}),
expiredItem("glyph.pbf"),
[&] { test.map.getStyle().loadURL(prefix + "style.json"); });
@@ -1337,10 +1338,10 @@ TEST(Map, TEST_REQUIRES_SERVER(ExpiredSpriteSheet)) {
const std::string prefix = "http://127.0.0.1:3000/online/";
std::shared_ptr<FileSource> dbfs =
FileSourceManager::get()->getFileSource(FileSourceType::Database, ResourceOptions{});
dbfs->forward(Resource::style(prefix + "style.json"), makeResponse("style.json"));
dbfs->forward(Resource::source(prefix + "streets.json"), makeResponse("streets.json"));
dbfs->forward(Resource::spriteJSON(prefix + "sprite", 1.0), makeResponse("sprite.json", true));
dbfs->forward(Resource::spriteImage(prefix + "sprite", 1.0), makeResponse("sprite.png", true));
dbfs->forward(Resource::style(prefix + "style.json"), makeResponse("style.json"), [] {});
dbfs->forward(Resource::source(prefix + "streets.json"), makeResponse("streets.json"), [] {});
dbfs->forward(Resource::spriteJSON(prefix + "sprite", 1.0), makeResponse("sprite.json", true), [] {});
dbfs->forward(Resource::spriteImage(prefix + "sprite", 1.0), makeResponse("sprite.png", true), [] {});
dbfs->forward(Resource::tile(prefix + "{z}-{x}-{y}.vector.pbf", 1.0, 0, 0, 0, Tileset::Scheme::XYZ),
makeResponse("0-0-0.vector.pbf"),
[&] { test.map.getStyle().loadURL(prefix + "style.json"); });

4
test/storage/main_resource_loader.test.cpp
View File

@@ -692,11 +692,11 @@ TEST(MainResourceLoader, TEST_REQUIRES_SERVER(CachedResourceLowPriority)) {
// Put existing values into the cache.
Resource resource1{Resource::Unknown, "http://127.0.0.1:3000/load/3", {}, Resource::LoadingMethod::All};
response.data = std::make_shared<std::string>("Cached Request 3");
dbfs->forward(resource1, response);
dbfs->forward(resource1, response, [] {});
Resource resource2{Resource::Unknown, "http://127.0.0.1:3000/load/4", {}, Resource::LoadingMethod::All};
response.data = std::make_shared<std::string>("Cached Request 4");
dbfs->forward(resource2, response);
dbfs->forward(resource2, response, [] {});
onlineFs->setProperty(MAX_CONCURRENT_REQUESTS_KEY, 1u);
fs.pause();

2
test/util/offscreen_texture.test.cpp
View File

@@ -187,7 +187,7 @@ TEST(OffscreenTexture, ClearRenderPassColor) {
gfx::BackendScope scope { *backend->getRendererBackend() };
auto& context = backend->getRendererBackend()->getContext();
auto encoder = context.createCommandEncoder();
auto offscreenTexture = context.createOffscreenTexture({ 128, 256 });
auto offscreenTexture = context.createOffscreenTexture({128, 256}, gfx::TextureChannelDataType::UnsignedByte);
auto renderPass = encoder->createRenderPass(
"offscreen texture", { *offscreenTexture, Color{ 1.0f, 0.0f, 0.0f, 1.0f }, {}, {} });
renderPass.reset();