diff --git a/plugins/icebridge/test/IcebridgeReaderTest.cpp b/plugins/icebridge/test/IcebridgeReaderTest.cpp index 174b8ad225..cadf54baae 100644 --- a/plugins/icebridge/test/IcebridgeReaderTest.cpp +++ b/plugins/icebridge/test/IcebridgeReaderTest.cpp @@ -48,8 +48,8 @@ template void checkDimension(const PointView& data, std::size_t index, Dimension::Id dim, T expected) { - float actual = data.getFieldAs(dim, index); - EXPECT_FLOAT_EQ(expected, actual); + T actual = data.getFieldAs(dim, index); + EXPECT_FLOAT_EQ((float)expected, (float)actual); } void checkPoint( @@ -108,9 +108,9 @@ TEST(IcebridgeReaderTest, testRead) checkPoint( *view, 0, - 141437548, // time - 82.605319, // latitude - -58.593811, // longitude + 1414375e2f, // time + 82.60531f, // latitude + -58.59381f, // longitude 18.678, // elevation 2408, // xmtSig 181, // rcvSig @@ -124,9 +124,9 @@ TEST(IcebridgeReaderTest, testRead) checkPoint( *view, 1, - 141437548, // time - 82.605287, // latitude - -58.595123, // longitude + 1414375e2f, // time + 82.60528f, // latitude + -58.59512f, // longitude 18.688, // elevation 2642, // xmtSig 173, // rcvSig diff --git a/plugins/nitf/test/NitfReaderTest.cpp b/plugins/nitf/test/NitfReaderTest.cpp index d6673253d4..f245b961e4 100644 --- a/plugins/nitf/test/NitfReaderTest.cpp +++ b/plugins/nitf/test/NitfReaderTest.cpp @@ -58,7 +58,7 @@ TEST(NitfReaderTest, test_one) PointTable table; Stage* nitf_reader(f.createStage("readers.nitf")); - EXPECT_TRUE(nitf_reader); + EXPECT_TRUE(nitf_reader != nullptr); nitf_reader->setOptions(nitf_opts); nitf_reader->prepare(table); PointViewSet pbSet = nitf_reader->execute(table);