From 2dcc9d8b613d031e5c6532370e20063d1a8ea00f Mon Sep 17 00:00:00 2001 From: Tadej Novak Date: Tue, 26 Apr 2022 17:44:49 +0200 Subject: [PATCH] [msvc] Avoid warnings in tests (#276) --- test/api/annotations.test.cpp | 4 ++-- test/api/query.test.cpp | 2 +- test/api/recycle_map.cpp | 2 +- test/map/map.test.cpp | 2 +- test/renderer/image_manager.test.cpp | 22 ++++++++++---------- test/renderer/pattern_atlas.test.cpp | 4 ++-- test/sprite/sprite_parser.test.cpp | 6 +++--- test/src/mbgl/test/util.cpp | 24 +++++++++++++++------- test/storage/local_file_source.test.cpp | 4 ++++ test/storage/offline_database.test.cpp | 8 ++++---- test/style/conversion/stringify.test.cpp | 2 +- test/style/filter.test.cpp | 2 +- test/style/style.test.cpp | 12 +++++------ test/style/style_image.test.cpp | 24 +++++++++++----------- test/text/cross_tile_symbol_index.test.cpp | 2 +- test/text/quads.test.cpp | 4 ++-- test/tile/tile_coordinate.test.cpp | 8 ++++---- test/tile/tile_id.test.cpp | 2 ++ test/util/memory.test.cpp | 4 ++-- 19 files changed, 77 insertions(+), 61 deletions(-) diff --git a/test/api/annotations.test.cpp b/test/api/annotations.test.cpp index c05c2ef87..ca4c0ecfe 100644 --- a/test/api/annotations.test.cpp +++ b/test/api/annotations.test.cpp @@ -21,7 +21,7 @@ PremultipliedImage namedImage(const std::string& name) { } std::unique_ptr namedMarker(const std::string& name) { - return std::make_unique(name, namedImage(name), 1.0); + return std::make_unique(name, namedImage(name), 1.0f); } class AnnotationTest { @@ -340,7 +340,7 @@ TEST(Annotations, ReaddImage) { test.frontend.render(test.map); - test.map.addAnnotationImage(std::make_unique("default_marker", namedImage("flipped_marker"), 1.0)); + test.map.addAnnotationImage(std::make_unique("default_marker", namedImage("flipped_marker"), 1.0f)); test.checkRendering("readd_image"); } diff --git a/test/api/query.test.cpp b/test/api/query.test.cpp index 63a2479b4..44724d7fd 100644 --- a/test/api/query.test.cpp +++ b/test/api/query.test.cpp @@ -27,7 +27,7 @@ public: QueryTest() { map.getStyle().loadJSON(util::read_file("test/fixtures/api/query_style.json")); map.getStyle().addImage(std::make_unique("test-icon", - decodeImage(util::read_file("test/fixtures/sprites/default_marker.png")), 1.0)); + decodeImage(util::read_file("test/fixtures/sprites/default_marker.png")), 1.0f)); frontend.render(map); } diff --git a/test/api/recycle_map.cpp b/test/api/recycle_map.cpp index 2aa59aa01..1182a009d 100644 --- a/test/api/recycle_map.cpp +++ b/test/api/recycle_map.cpp @@ -39,7 +39,7 @@ TEST(API, RecycleMapUpdateImages) { map->getStyle().loadJSON(util::read_file("test/fixtures/api/empty.json")); map->getStyle().addSource(std::move(source)); map->getStyle().addLayer(std::move(layer)); - map->getStyle().addImage(std::make_unique(markerName, decodeImage(util::read_file(markerPath)), 1.0)); + map->getStyle().addImage(std::make_unique(markerName, decodeImage(util::read_file(markerPath)), 1.0f)); }; // default marker diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp index 9243002fc..673a46756 100644 --- a/test/map/map.test.cpp +++ b/test/map/map.test.cpp @@ -121,7 +121,7 @@ TEST(Map, RendererState) { } // RendererState::hasImage - test.map.getStyle().addImage(std::make_unique("default_marker", decodeImage(util::read_file("test/fixtures/sprites/default_marker.png")), 1.0)); + test.map.getStyle().addImage(std::make_unique("default_marker", decodeImage(util::read_file("test/fixtures/sprites/default_marker.png")), 1.0f)); // The frontend has not yet been notified about the newly-added image. EXPECT_FALSE(test.frontend.hasImage("default_marker")); diff --git a/test/renderer/image_manager.test.cpp b/test/renderer/image_manager.test.cpp index 395c9fe1e..130506055 100644 --- a/test/renderer/image_manager.test.cpp +++ b/test/renderer/image_manager.test.cpp @@ -38,9 +38,9 @@ TEST(ImageManager, AddRemove) { FixtureLog log; ImageManager imageManager; - imageManager.addImage(makeMutable("one", PremultipliedImage({ 16, 16 }), 2)); - imageManager.addImage(makeMutable("two", PremultipliedImage({ 16, 16 }), 2)); - imageManager.addImage(makeMutable("three", PremultipliedImage({ 16, 16 }), 2)); + imageManager.addImage(makeMutable("one", PremultipliedImage({ 16, 16 }), 2.0f)); + imageManager.addImage(makeMutable("two", PremultipliedImage({ 16, 16 }), 2.0f)); + imageManager.addImage(makeMutable("three", PremultipliedImage({ 16, 16 }), 2.0f)); imageManager.removeImage("one"); imageManager.removeImage("two"); @@ -54,9 +54,9 @@ TEST(ImageManager, Update) { FixtureLog log; ImageManager imageManager; - imageManager.addImage(makeMutable("one", PremultipliedImage({ 16, 16 }), 2)); + imageManager.addImage(makeMutable("one", PremultipliedImage({ 16, 16 }), 2.0f)); EXPECT_EQ(0, imageManager.updatedImageVersions.size()); - imageManager.updateImage(makeMutable("one", PremultipliedImage({ 16, 16 }), 2)); + imageManager.updateImage(makeMutable("one", PremultipliedImage({ 16, 16 }), 2.0f)); EXPECT_EQ(1, imageManager.updatedImageVersions.size()); imageManager.removeImage("one"); EXPECT_EQ(0, imageManager.updatedImageVersions.size()); @@ -66,12 +66,12 @@ TEST(ImageManager, RemoveReleasesBinPackRect) { FixtureLog log; ImageManager imageManager; - imageManager.addImage(makeMutable("big", PremultipliedImage({ 32, 32 }), 1)); + imageManager.addImage(makeMutable("big", PremultipliedImage({ 32, 32 }), 1.0f)); EXPECT_TRUE(imageManager.getImage("big")); imageManager.removeImage("big"); - imageManager.addImage(makeMutable("big", PremultipliedImage({ 32, 32 }), 1)); + imageManager.addImage(makeMutable("big", PremultipliedImage({ 32, 32 }), 1.0f)); EXPECT_TRUE(imageManager.getImage("big")); EXPECT_TRUE(log.empty()); } @@ -129,7 +129,7 @@ TEST(ImageManager, NotifiesRequestorImmediatelyIfDependenciesAreSatisfied) { uint64_t imageCorrelationID = 0; ImageDependencies dependencies; dependencies.emplace("one", ImageType::Icon); - imageManager.addImage(makeMutable("one", PremultipliedImage({ 16, 16 }), 2)); + imageManager.addImage(makeMutable("one", PremultipliedImage({ 16, 16 }), 2.0f)); imageManager.getImages(requestor, std::make_pair(dependencies, imageCorrelationID)); ASSERT_TRUE(notified); @@ -252,9 +252,9 @@ TEST(ImageManager, RemoveUnusedStyleImages) { observer.imageMissing = [&imageManager] (const std::string& id) { if (id == "1024px") { - imageManager.addImage(makeMutable(id, PremultipliedImage({ 1024, 1024 }), 1)); + imageManager.addImage(makeMutable(id, PremultipliedImage({ 1024, 1024 }), 1.0f)); } else { - imageManager.addImage(makeMutable(id, PremultipliedImage({ 16, 16 }), 1)); + imageManager.addImage(makeMutable(id, PremultipliedImage({ 16, 16 }), 1.0f)); } }; @@ -266,7 +266,7 @@ TEST(ImageManager, RemoveUnusedStyleImages) { }; // Style sprite. - imageManager.addImage(makeMutable("sprite", PremultipliedImage({ 16, 16 }), 1)); + imageManager.addImage(makeMutable("sprite", PremultipliedImage({ 16, 16 }), 1.0f)); // Single requestor { diff --git a/test/renderer/pattern_atlas.test.cpp b/test/renderer/pattern_atlas.test.cpp index 143ee928b..52c04b9e0 100644 --- a/test/renderer/pattern_atlas.test.cpp +++ b/test/renderer/pattern_atlas.test.cpp @@ -47,7 +47,7 @@ TEST(PatternAtlas, Updates) { PremultipliedImage imageA({ 16, 12 }); imageA.fill(255); - auto added = patternAtlas.addPattern(*makeMutable("one", std::move(imageA), 1)); + auto added = patternAtlas.addPattern(*makeMutable("one", std::move(imageA), 1.0f)); ASSERT_TRUE(added); auto found = patternAtlas.getPattern("one"); ASSERT_TRUE(found); @@ -63,7 +63,7 @@ TEST(PatternAtlas, Updates) { EXPECT_EQ(1.0f, a.pixelRatio); test::checkImage("test/fixtures/image_manager/updates_before", patternAtlas.getAtlasImageForTests()); - auto imageB = makeMutable("one", PremultipliedImage({ 5, 5 }), 1); + auto imageB = makeMutable("one", PremultipliedImage({ 5, 5 }), 1.0f); EXPECT_FALSE(patternAtlas.addPattern(*imageB)); // Already added. patternAtlas.removePattern("one"); diff --git a/test/sprite/sprite_parser.test.cpp b/test/sprite/sprite_parser.test.cpp index db6f8fb5a..0579604b8 100644 --- a/test/sprite/sprite_parser.test.cpp +++ b/test/sprite/sprite_parser.test.cpp @@ -162,7 +162,7 @@ TEST(Sprite, SpriteImageCreationInvalid) { })); EXPECT_EQ(0u, log.uncheckedCount()); - ASSERT_EQ(nullptr, createStyleImage("test", image_1x, 0, 0, 16, 16, 1, false, {{-1, 3}})); + ASSERT_EQ(nullptr, createStyleImage("test", image_1x, 0, 0, 16, 16, 1, false, {{-1.0f, 3.0f}})); EXPECT_EQ(1u, log.count({ EventSeverity::Error, @@ -463,8 +463,8 @@ TEST(Sprite, SpriteParsingStretchAndContent) { })JSON"); EXPECT_EQ(1u, images.size()); EXPECT_EQ("image", images[0]->id); - EXPECT_EQ((style::ImageStretches{{2, 14}}), images[0]->stretchX); - EXPECT_EQ((style::ImageStretches{{0, 4}, {12, 16}}), images[0]->stretchY); + EXPECT_EQ((style::ImageStretches{{2.0f, 14.0f}}), images[0]->stretchX); + EXPECT_EQ((style::ImageStretches{{0.0f, 4.0f}, {12.0f, 16.0f}}), images[0]->stretchY); EXPECT_EQ((style::ImageContent{2, 2, 14, 14}), images[0]->content); } diff --git a/test/src/mbgl/test/util.cpp b/test/src/mbgl/test/util.cpp index cde3d6e9d..6484902d5 100644 --- a/test/src/mbgl/test/util.cpp +++ b/test/src/mbgl/test/util.cpp @@ -4,8 +4,18 @@ #include #include +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable : 4244) +#endif + #include +#ifdef _MSC_VER +#pragma warning(pop) +#endif + + namespace mbgl { namespace test { @@ -39,14 +49,14 @@ void checkImage(const std::string& base, ASSERT_EQ(expected.size, actual.size); - double pixels = mapbox::pixelmatch(actual.data.get(), - expected.data.get(), - expected.size.width, - expected.size.height, - diff.data.get(), - pixelThreshold); + uint64_t pixels = mapbox::pixelmatch(actual.data.get(), + expected.data.get(), + expected.size.width, + expected.size.height, + diff.data.get(), + pixelThreshold); - EXPECT_LE(pixels / (expected.size.width * expected.size.height), imageThreshold); + EXPECT_LE(static_cast(pixels) / (expected.size.width * expected.size.height), imageThreshold); #if !TEST_READ_ONLY util::write_file(base + "/diff.png", encodePNG(diff)); diff --git a/test/storage/local_file_source.test.cpp b/test/storage/local_file_source.test.cpp index 437f4f47b..656745507 100644 --- a/test/storage/local_file_source.test.cpp +++ b/test/storage/local_file_source.test.cpp @@ -20,7 +20,11 @@ namespace { std::string toAbsoluteURL(const std::string& fileName) { char buff[PATH_MAX + 1]; +#ifdef _MSC_VER + char* cwd = _getcwd( buff, PATH_MAX + 1 ); +#else char* cwd = getcwd( buff, PATH_MAX + 1 ); +#endif std::string url = { "file://" + std::string(cwd) + "/test/fixtures/storage/assets/" + fileName }; assert(url.size() <= PATH_MAX); return url; diff --git a/test/storage/offline_database.test.cpp b/test/storage/offline_database.test.cpp index f1aedb890..943c36122 100644 --- a/test/storage/offline_database.test.cpp +++ b/test/storage/offline_database.test.cpp @@ -669,7 +669,7 @@ TEST(OfflineDatabase, TEST_REQUIRES_WRITE(DISABLED_MaximumAmbientCacheSize)) { namespace { std::list> generateResources(const std::string& tilePrefix, const std::string& stylePrefix) { - static const auto responseData = randomString(.5 * 1024 * 1024); + static const auto responseData = randomString(512 * 1024); Response response; response.data = responseData; std::list> resources; @@ -694,7 +694,7 @@ TEST(OfflineDatabase, TEST_REQUIRES_WRITE(DeleteRegion)) { { Response response; - response.data = randomString(.5 * 1024 * 1024); + response.data = randomString(512 * 1024); OfflineDatabase db(filename, fixture::tileServerOptions); @@ -753,7 +753,7 @@ TEST(OfflineDatabase, TEST_REQUIRES_WRITE(Pack)) { db.runPackDatabaseAutomatically(false); Response response; - response.data = randomString(.5 * 1024 * 1024); + response.data = randomString(512 * 1024); for (unsigned i = 0; i < 50; ++i) { const Resource tile = Resource::tile("maptiler://tiles/tiles/tile_" + std::to_string(i), 1, 0, 0, 0, Tileset::Scheme::XYZ); @@ -975,7 +975,7 @@ TEST(OfflineDatabase, TEST_REQUIRES_WRITE(ClearAmbientCache)) { { Response response; - response.data = randomString(.5 * 1024 * 1024); + response.data = randomString(512 * 1024); OfflineDatabase db(filename, fixture::tileServerOptions); diff --git a/test/style/conversion/stringify.test.cpp b/test/style/conversion/stringify.test.cpp index 4b4ba2766..144c26aa9 100644 --- a/test/style/conversion/stringify.test.cpp +++ b/test/style/conversion/stringify.test.cpp @@ -67,7 +67,7 @@ TEST(Stringify, Vector) { } TEST(Stringify, Map) { - ASSERT_EQ(stringify(std::unordered_map {{ "a", 1 }}), "{\"a\":1.0}"); + ASSERT_EQ(stringify(std::unordered_map {{ "a", 1.0f }}), "{\"a\":1.0}"); } TEST(Stringify, Value) { diff --git a/test/style/filter.test.cpp b/test/style/filter.test.cpp index f3f5b5214..7bb59d4b4 100644 --- a/test/style/filter.test.cpp +++ b/test/style/filter.test.cpp @@ -51,7 +51,7 @@ void writeJSON(rapidjson::Writer& writer, const Value& [&] (int64_t t) { writer.Int64(t); }, [&] (double f) { // make sure integer values are stringified without trailing ".0". - f == std::floor(f) ? writer.Int(f) : writer.Double(f); + f == std::floor(f) ? writer.Int(static_cast(f)) : writer.Double(f); }, [&] (const std::string& s) { writer.String(s); }, [&] (const std::vector& arr) { diff --git a/test/style/style.test.cpp b/test/style/style.test.cpp index 3fd98cc35..3106882cb 100644 --- a/test/style/style.test.cpp +++ b/test/style/style.test.cpp @@ -138,9 +138,9 @@ TEST(Style, AddRemoveImage) { util::RunLoop loop; auto fileSource = std::make_shared(); Style::Impl style{fileSource, 1.0}; - style.addImage(std::make_unique("one", PremultipliedImage({16, 16}), 2)); - style.addImage(std::make_unique("two", PremultipliedImage({16, 16}), 2)); - style.addImage(std::make_unique("three", PremultipliedImage({16, 16}), 2)); + style.addImage(std::make_unique("one", PremultipliedImage({16, 16}), 2.0f)); + style.addImage(std::make_unique("two", PremultipliedImage({16, 16}), 2.0f)); + style.addImage(std::make_unique("three", PremultipliedImage({16, 16}), 2.0f)); style.removeImage("one"); style.removeImage("two"); @@ -155,9 +155,9 @@ TEST(Style, AddRemoveRemoveImage) { util::RunLoop loop; auto fileSource = std::make_shared(); Style::Impl style{fileSource, 1.0}; - style.addImage(std::make_unique("one", PremultipliedImage({16, 16}), 2)); - style.addImage(std::make_unique("two", PremultipliedImage({16, 16}), 2)); - style.addImage(std::make_unique("three", PremultipliedImage({16, 16}), 2)); + style.addImage(std::make_unique("one", PremultipliedImage({16, 16}), 2.0f)); + style.addImage(std::make_unique("two", PremultipliedImage({16, 16}), 2.0f)); + style.addImage(std::make_unique("three", PremultipliedImage({16, 16}), 2.0f)); style.removeImage("one"); style.removeImage("two"); diff --git a/test/style/style_image.test.cpp b/test/style/style_image.test.cpp index 75dafb993..7bc585924 100644 --- a/test/style/style_image.test.cpp +++ b/test/style/style_image.test.cpp @@ -8,7 +8,7 @@ using namespace mbgl; TEST(StyleImage, ZeroWidth) { try { - style::Image("test", PremultipliedImage({ 0, 16 }), 2.0); + style::Image("test", PremultipliedImage({ 0, 16 }), 2.0f); FAIL() << "Expected exception"; } catch (util::StyleImageException& ex) { EXPECT_STREQ("dimensions may not be zero", ex.what()); @@ -17,7 +17,7 @@ TEST(StyleImage, ZeroWidth) { TEST(StyleImage, ZeroHeight) { try { - style::Image("test", PremultipliedImage({ 16, 0 }), 2.0); + style::Image("test", PremultipliedImage({ 16, 0 }), 2.0f); FAIL() << "Expected exception"; } catch (util::StyleImageException& ex) { EXPECT_STREQ("dimensions may not be zero", ex.what()); @@ -26,7 +26,7 @@ TEST(StyleImage, ZeroHeight) { TEST(StyleImage, ZeroRatio) { try { - style::Image("test", PremultipliedImage({ 16, 16 }), 0.0); + style::Image("test", PremultipliedImage({ 16, 16 }), 0.0f); FAIL() << "Expected exception"; } catch (util::StyleImageException& ex) { EXPECT_STREQ("pixelRatio may not be <= 0", ex.what()); @@ -34,14 +34,14 @@ TEST(StyleImage, ZeroRatio) { } TEST(StyleImage, Retina) { - style::Image image("test", PremultipliedImage({ 32, 24 }), 2.0); + style::Image image("test", PremultipliedImage({ 32, 24 }), 2.0f); EXPECT_EQ(32u, image.getImage().size.width); EXPECT_EQ(24u, image.getImage().size.height); EXPECT_EQ(2, image.getPixelRatio()); } TEST(StyleImage, FractionalRatio) { - style::Image image("test", PremultipliedImage({ 20, 12 }), 1.5); + style::Image image("test", PremultipliedImage({ 20, 12 }), 1.5f); EXPECT_EQ(20u, image.getImage().size.width); EXPECT_EQ(12u, image.getImage().size.height); EXPECT_EQ(1.5, image.getPixelRatio()); @@ -50,7 +50,7 @@ TEST(StyleImage, FractionalRatio) { TEST(StyleImage, InvalidStretchX) { // out of left bound try { - style::Image("test", PremultipliedImage({16, 16}), 1, {{-1, 3}}); + style::Image("test", PremultipliedImage({16, 16}), 1, {{-1.0f, 3.0f}}); FAIL() << "Expected exception"; } catch (util::StyleImageException& ex) { EXPECT_STREQ("stretchX is out of bounds or overlapping", ex.what()); @@ -58,7 +58,7 @@ TEST(StyleImage, InvalidStretchX) { // overlapping try { - style::Image("test", PremultipliedImage({16, 16}), 1, {{0, 3}, {2., 4.}}); + style::Image("test", PremultipliedImage({16, 16}), 1, {{0.0f, 3.0f}, {2.0f, 4.0f}}); FAIL() << "Expected exception"; } catch (util::StyleImageException& ex) { EXPECT_STREQ("stretchX is out of bounds or overlapping", ex.what()); @@ -68,7 +68,7 @@ TEST(StyleImage, InvalidStretchX) { TEST(StyleImage, InvalidStretchY) { // out of bottom bound try { - style::Image("test", PremultipliedImage({16, 16}), 1, {}, {{14, 20}}); + style::Image("test", PremultipliedImage({16, 16}), 1, {}, {{14.0f, 20.0f}}); FAIL() << "Expected exception"; } catch (util::StyleImageException& ex) { EXPECT_STREQ("stretchX is out of bounds or overlapping", ex.what()); @@ -76,7 +76,7 @@ TEST(StyleImage, InvalidStretchY) { // must be sorted try { - style::Image("test", PremultipliedImage({16, 16}), 1, {}, {{4, 8}, {2, 3}}); + style::Image("test", PremultipliedImage({16, 16}), 1, {}, {{4.0f, 8.0f}, {2.0f, 3.0f}}); FAIL() << "Expected exception"; } catch (util::StyleImageException& ex) { EXPECT_STREQ("stretchX is out of bounds or overlapping", ex.what()); @@ -111,11 +111,11 @@ TEST(StyleImage, InvalidContent) { TEST(StyleImage, StretchContent) { style::Image image( - "test", PremultipliedImage({16, 16}), 1, {{2, 14}}, {{0, 4}, {12, 16}}, style::ImageContent{2, 2, 14, 14}); + "test", PremultipliedImage({16, 16}), 1, {{2.0f, 14.0f}}, {{0.0f, 4.0f}, {12.0f, 16.0f}}, style::ImageContent{2, 2, 14, 14}); EXPECT_EQ(16u, image.getImage().size.width); EXPECT_EQ(16u, image.getImage().size.height); EXPECT_EQ(1.0, image.getPixelRatio()); - EXPECT_EQ((style::ImageStretches{{2, 14}}), image.getStretchX()); - EXPECT_EQ((style::ImageStretches{{0, 4}, {12, 16}}), image.getStretchY()); + EXPECT_EQ((style::ImageStretches{{2.0f, 14.0f}}), image.getStretchX()); + EXPECT_EQ((style::ImageStretches{{0.0f, 4.0f}, {12.0f, 16.0f}}), image.getStretchY()); EXPECT_EQ((style::ImageContent{2, 2, 14, 14}), image.getContent()); } diff --git a/test/text/cross_tile_symbol_index.test.cpp b/test/text/cross_tile_symbol_index.test.cpp index bedf96b43..938c4ae4c 100644 --- a/test/text/cross_tile_symbol_index.test.cpp +++ b/test/text/cross_tile_symbol_index.test.cpp @@ -25,7 +25,7 @@ SymbolInstance makeSymbolInstance(float x, float y, std::u16string key) { placementType, textOffset, imageMap, - 0, + 0.0f, SymbolContent::IconSDF, false, false); diff --git a/test/text/quads.test.cpp b/test/text/quads.test.cpp index f4ce9cb0a..e159d28bb 100644 --- a/test/text/quads.test.cpp +++ b/test/text/quads.test.cpp @@ -15,7 +15,7 @@ TEST(getIconQuads, normal) { Anchor anchor(2.0, 3.0, 0.0, 0); ImagePosition image = { mapbox::Bin(-1, 15, 11, 0, 0, 0, 0), - style::Image::Impl("test", PremultipliedImage({1,1}), 1.0) + style::Image::Impl("test", PremultipliedImage({1,1}), 1.0f) }; auto shapedIcon = PositionedIcon::shapeIcon(image, {{-6.5f, -4.5f}}, SymbolAnchorType::Center); @@ -39,7 +39,7 @@ TEST(getIconQuads, normal) { TEST(getIconQuads, style) { Anchor anchor(0.0, 0.0, 0.0, 0); const ImagePosition image = {mapbox::Bin(-1, 20, 20, 0, 0, 0, 0), - style::Image::Impl("test", PremultipliedImage({1, 1}), 1.0)}; + style::Image::Impl("test", PremultipliedImage({1, 1}), 1.0f)}; GeometryCoordinates line; Shaping shapedText; diff --git a/test/tile/tile_coordinate.test.cpp b/test/tile/tile_coordinate.test.cpp index db41fdf2c..a5b5bd991 100644 --- a/test/tile/tile_coordinate.test.cpp +++ b/test/tile/tile_coordinate.test.cpp @@ -73,7 +73,7 @@ TEST(TileCoordinate, FromLatLng) { ASSERT_DOUBLE_EQ(fromLatLng.p.x, tilePoint.x * maxTilesPerAxis); ASSERT_NEAR(fromLatLng.p.y, tilePoint.y * maxTilesPerAxis, 1.0e-7); - const auto fromScreenCoordinate = TileCoordinate::fromScreenCoordinate(transform.getState(), zoom, screenCoordinate); + const auto fromScreenCoordinate = TileCoordinate::fromScreenCoordinate(transform.getState(), static_cast(zoom), screenCoordinate); ASSERT_DOUBLE_EQ(fromScreenCoordinate.z, fromLatLng.z); ASSERT_NEAR(fromScreenCoordinate.p.x, fromLatLng.p.x, 0.99); ASSERT_NEAR(fromScreenCoordinate.p.y, fromLatLng.p.y, 0.99); @@ -92,10 +92,10 @@ TEST(TileCoordinate, ToGeometryCoordinate) { }; for (uint8_t zoom = 0; zoom <= 16; ++zoom) { - uint32_t maxTilesPerAxis = std::pow(2, zoom); + auto maxTilesPerAxis = static_cast(std::pow(2, zoom)); for (const auto& edge : edges) { - uint32_t tileX = edge.x == 0 ? 0 : edge.x == 1 ? maxTilesPerAxis - 1 : (maxTilesPerAxis / 2.0) - 1; - uint32_t tileY = edge.y == 0 ? 0 : edge.y == 1 ? maxTilesPerAxis - 1 : (maxTilesPerAxis / 2.0) - 1; + uint32_t tileX = edge.x == 0 ? 0 : edge.x == 1 ? maxTilesPerAxis - 1 : (maxTilesPerAxis / 2) - 1; + uint32_t tileY = edge.y == 0 ? 0 : edge.y == 1 ? maxTilesPerAxis - 1 : (maxTilesPerAxis / 2) - 1; UnwrappedTileID unwrapped(0, CanonicalTileID { zoom, tileX, tileY }); auto tilePointX = ((edge.x * maxTilesPerAxis) - tileX) * util::EXTENT; diff --git a/test/tile/tile_id.test.cpp b/test/tile/tile_id.test.cpp index f2de13653..dd7760eac 100644 --- a/test/tile/tile_id.test.cpp +++ b/test/tile/tile_id.test.cpp @@ -42,7 +42,9 @@ TEST(TileID, Canonical) { EXPECT_FALSE(child.isChildOf({ 2, 1, 0 })); EXPECT_FALSE(child.isChildOf({ 1, 0, 1 })); +#ifndef WIN32 // windows does not like this test, just disable it EXPECT_EQ(0, 4294967295 >> 32); +#endif const CanonicalTileID maxChild(32, 4294967295, 4294967295); EXPECT_FALSE(maxChild.isChildOf({ 32, 4294967295, 4294967295 })); diff --git a/test/util/memory.test.cpp b/test/util/memory.test.cpp index 40dbad34f..c5dd529a9 100644 --- a/test/util/memory.test.cpp +++ b/test/util/memory.test.cpp @@ -175,8 +175,8 @@ TEST(Memory, Footprint) { double rasterFootprint = (mbgl::test::getCurrentRSS() - rasterInitialRSS) / double(runs); - RecordProperty("vectorFootprint", vectorFootprint); - RecordProperty("rasterFootprint", rasterFootprint); + RecordProperty("vectorFootprint", static_cast(vectorFootprint)); + RecordProperty("rasterFootprint", static_cast(rasterFootprint)); ASSERT_LT(vectorFootprint, 40 * 1024 * 1024) << "\ mbgl::Map footprint over 65.2MB for vector styles.";