diff options
| author | Max Kellermann <max@musicpd.org> | 2021-04-28 09:15:06 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2021-04-28 13:00:42 +0200 |
| commit | 8c51440057a52436322f7ba538d88b18f73490c8 (patch) | |
| tree | 0d464ddc61c7dec61549a84fb3c8d70557775252 | |
| parent | 018858ec975702d3fce20b9e6c48545b7f846a92 (diff) | |
test/test_mixramp: workaround for -Wdouble-promotion
| -rw-r--r-- | test/test_mixramp.cxx | 16 | ||||
| -rw-r--r-- | test/test_pcm_volume.cxx | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/test/test_mixramp.cxx b/test/test_mixramp.cxx index ca010f246..6f32fec04 100644 --- a/test/test_mixramp.cxx +++ b/test/test_mixramp.cxx @@ -13,25 +13,25 @@ TEST(MixRamp, Interpolate) const char *input = "1.0 0.00;3.0 0.10;6.0 2.50;"; char *foo = strdup(input); - EXPECT_NEAR(double(0), + EXPECT_NEAR(0., mixramp_interpolate(foo, 0).count(), 0.05); free(foo); foo = strdup(input); - EXPECT_NEAR(float(0), + EXPECT_NEAR(0., mixramp_interpolate(foo, 1).count(), 0.005); free(foo); foo = strdup(input); - EXPECT_NEAR(float(0.1), + EXPECT_NEAR(0.1, mixramp_interpolate(foo, 3).count(), 0.005); free(foo); foo = strdup(input); - EXPECT_NEAR(float(2.5), + EXPECT_NEAR(2.5, mixramp_interpolate(foo, 6).count(), 0.01); free(foo); @@ -41,25 +41,25 @@ TEST(MixRamp, Interpolate) free(foo); foo = strdup(input); - EXPECT_NEAR(float(0.05), + EXPECT_NEAR(0.05, mixramp_interpolate(foo, 2).count(), 0.05); free(foo); foo = strdup(input); - EXPECT_NEAR(float(1.3), + EXPECT_NEAR(1.3, mixramp_interpolate(foo, 4.5).count(), 0.05); free(foo); foo = strdup(input); - EXPECT_NEAR(float(0.9), + EXPECT_NEAR(0.9, mixramp_interpolate(foo, 4).count(), 0.05); free(foo); foo = strdup(input); - EXPECT_NEAR(float(1.7), + EXPECT_NEAR(1.7, mixramp_interpolate(foo, 5).count(), 0.05); free(foo); diff --git a/test/test_pcm_volume.cxx b/test/test_pcm_volume.cxx index f8b3fec59..11ea75303 100644 --- a/test/test_pcm_volume.cxx +++ b/test/test_pcm_volume.cxx @@ -154,7 +154,7 @@ TEST(PcmTest, VolumeFloat) const auto _dest = ConstBuffer<float>::FromVoid(dest); for (unsigned i = 0; i < N; ++i) - EXPECT_NEAR(_src[i] / 2, _dest[i], 1); + EXPECT_NEAR((double)_src[i] / 2., (double)_dest[i], 1.); pv.Close(); } |