Avoid implicit casts and make code more portable (#716)

This commit is contained in:
tdcosta100
2023-01-23 07:32:53 -03:00
committed by GitHub
parent e47efe3761
commit d5acff3c74
18 changed files with 63 additions and 61 deletions

View File

@@ -257,13 +257,14 @@ void TestRunner::checkRenderTestResults(mbgl::PremultipliedImage&& actualImage,
expectedImage = mbgl::decodeImage(*maybeExpectedImage);
pixels = // implicitly converting from uint64_t
pixels = static_cast<double>(
mapbox::pixelmatch(actualImage.data.get(),
expectedImage.data.get(),
expectedImage.size.width,
expectedImage.size.height,
imageDiff.data.get(),
0.1285); // Defined in GL JS
0.1285) // Defined in GL JS
);
metadata.diff = mbgl::encodePNG(imageDiff);
@@ -349,7 +350,7 @@ void TestRunner::checkProbingResults(TestMetadata& resultMetadata) {
return;
}
auto result = checkValue(expected.second.size, actual->second.size, actual->second.tolerance);
auto result = checkValue(static_cast<float>(expected.second.size), static_cast<float>(actual->second.size), actual->second.tolerance);
if (!std::get<bool>(result)) {
std::stringstream ss;
ss << "File size does not match at probe \"" << expected.first << "\" for file \""
@@ -663,7 +664,7 @@ LatLng getTileCenterCoordinates(const UnwrappedTileID& tileId) {
}
uint32_t getTileScreenPixelSize(float pixelRatio) {
return util::tileSize_D * pixelRatio;
return static_cast<uint32_t>(util::tileSize_D * pixelRatio);
}
uint32_t getImageTileOffset(const std::set<uint32_t>& dims, uint32_t dim, float pixelRatio) {
@@ -757,7 +758,7 @@ void TestRunner::run(TestMetadata& metadata) {
if (metadata.mapMode == MapMode::Tile) {
assert(camera.zoom);
assert(camera.center);
auto tileIds = util::tileCover(map.latLngBoundsForCamera(camera), *camera.zoom);
auto tileIds = util::tileCover(map.latLngBoundsForCamera(camera), static_cast<uint8_t>(*camera.zoom));
assert(!tileIds.empty());
std::set<uint32_t> xDims;
std::set<uint32_t> yDims;