From 74e230336f134e5fcffc6073e1a2961eaea913a5 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 22 Jul 2016 15:08:59 -0700 Subject: [PATCH] blockiness_test: fix implicit float conversion float->int as reported by -Wfloat-conversion Change-Id: Icb0ecb9e2d54edb95813d9f2de34cb6c27b63cbd (cherry picked from commit 5e2791b54da066cc8543c066813373c9274ff53f) --- test/blockiness_test.cc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/test/blockiness_test.cc b/test/blockiness_test.cc index 0c60baaa3..8c608f731 100644 --- a/test/blockiness_test.cc +++ b/test/blockiness_test.cc @@ -152,7 +152,7 @@ class BlockinessVP9Test BlockinessVP9Test() : BlockinessTestBase(GET_PARAM(0), GET_PARAM(1)) {} protected: - int CheckBlockiness() { + double GetBlockiness() const { return vp9_get_blockiness(source_data_, source_stride_, reference_data_, reference_stride_, width_, height_); @@ -168,16 +168,17 @@ TEST_P(BlockinessVP9Test, SourceBlockierThanReference) { // Source is blockier than reference. FillRandomBlocky(source_data_, source_stride_); FillConstant(reference_data_, reference_stride_, 128); - int super_blocky = CheckBlockiness(); + const double super_blocky = GetBlockiness(); - EXPECT_EQ(0, super_blocky) << "Blocky source should produce 0 blockiness."; + EXPECT_DOUBLE_EQ(0.0, super_blocky) + << "Blocky source should produce 0 blockiness."; } TEST_P(BlockinessVP9Test, ReferenceBlockierThanSource) { // Source is blockier than reference. FillConstant(source_data_, source_stride_, 128); FillRandomBlocky(reference_data_, reference_stride_); - int super_blocky = CheckBlockiness(); + const double super_blocky = GetBlockiness(); EXPECT_GT(super_blocky, 0.0) << "Blocky reference should score high for blockiness."; @@ -187,10 +188,10 @@ TEST_P(BlockinessVP9Test, BlurringDecreasesBlockiness) { // Source is blockier than reference. FillConstant(source_data_, source_stride_, 128); FillRandomBlocky(reference_data_, reference_stride_); - int super_blocky = CheckBlockiness(); + const double super_blocky = GetBlockiness(); Blur(reference_data_, reference_stride_, 4); - int less_blocky = CheckBlockiness(); + const double less_blocky = GetBlockiness(); EXPECT_GT(super_blocky, less_blocky) << "A straight blur should decrease blockiness."; @@ -201,10 +202,10 @@ TEST_P(BlockinessVP9Test, WorstCaseBlockiness) { FillConstant(source_data_, source_stride_, 128); FillCheckerboard(reference_data_, reference_stride_); - int super_blocky = CheckBlockiness(); + const double super_blocky = GetBlockiness(); Blur(reference_data_, reference_stride_, 4); - int less_blocky = CheckBlockiness(); + const double less_blocky = GetBlockiness(); EXPECT_GT(super_blocky, less_blocky) << "A straight blur should decrease blockiness."; -- 2.49.0