From: James Zern Date: Sat, 2 Apr 2016 18:17:29 +0000 (-0700) Subject: dct32x32_test: create fn pointers w/'&' ref X-Git-Tag: v1.6.0~258^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=50e05d06518040841c4cb4a437c320ff5575527d;p=libvpx dct32x32_test: create fn pointers w/'&' ref this helps some toolchains (vs9) resolve the type of the parameter Change-Id: I116030361fc956e10de82b64c81d5917cddbcd5a --- diff --git a/test/dct32x32_test.cc b/test/dct32x32_test.cc index 407d9f0b0..87d836630 100644 --- a/test/dct32x32_test.cc +++ b/test/dct32x32_test.cc @@ -364,9 +364,9 @@ INSTANTIATE_TEST_CASE_P( &vpx_idct32x32_1024_add_c, 1, VPX_BITS_8))); INSTANTIATE_TEST_CASE_P( C, PartialTrans32x32Test, - ::testing::Values(make_tuple(vpx_highbd_fdct32x32_1_c, VPX_BITS_8), - make_tuple(vpx_highbd_fdct32x32_1_c, VPX_BITS_10), - make_tuple(vpx_highbd_fdct32x32_1_c, VPX_BITS_12))); + ::testing::Values(make_tuple(&vpx_highbd_fdct32x32_1_c, VPX_BITS_8), + make_tuple(&vpx_highbd_fdct32x32_1_c, VPX_BITS_10), + make_tuple(&vpx_highbd_fdct32x32_1_c, VPX_BITS_12))); #else INSTANTIATE_TEST_CASE_P( C, Trans32x32Test, @@ -376,7 +376,7 @@ INSTANTIATE_TEST_CASE_P( make_tuple(&vpx_fdct32x32_rd_c, &vpx_idct32x32_1024_add_c, 1, VPX_BITS_8))); INSTANTIATE_TEST_CASE_P(C, PartialTrans32x32Test, - ::testing::Values(make_tuple(vpx_fdct32x32_1_c, + ::testing::Values(make_tuple(&vpx_fdct32x32_1_c, VPX_BITS_8))); #endif // CONFIG_VP9_HIGHBITDEPTH @@ -399,7 +399,7 @@ INSTANTIATE_TEST_CASE_P( make_tuple(&vpx_fdct32x32_rd_sse2, &vpx_idct32x32_1024_add_sse2, 1, VPX_BITS_8))); INSTANTIATE_TEST_CASE_P(SSE2, PartialTrans32x32Test, - ::testing::Values(make_tuple(vpx_fdct32x32_1_sse2, + ::testing::Values(make_tuple(&vpx_fdct32x32_1_sse2, VPX_BITS_8))); #endif // HAVE_SSE2 && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE @@ -418,7 +418,7 @@ INSTANTIATE_TEST_CASE_P( make_tuple(&vpx_fdct32x32_rd_sse2, &vpx_idct32x32_1024_add_c, 1, VPX_BITS_8))); INSTANTIATE_TEST_CASE_P(SSE2, PartialTrans32x32Test, - ::testing::Values(make_tuple(vpx_fdct32x32_1_sse2, + ::testing::Values(make_tuple(&vpx_fdct32x32_1_sse2, VPX_BITS_8))); #endif // HAVE_SSE2 && CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE @@ -441,7 +441,7 @@ INSTANTIATE_TEST_CASE_P( make_tuple(&vpx_fdct32x32_rd_msa, &vpx_idct32x32_1024_add_msa, 1, VPX_BITS_8))); INSTANTIATE_TEST_CASE_P(MSA, PartialTrans32x32Test, - ::testing::Values(make_tuple(vpx_fdct32x32_1_msa, + ::testing::Values(make_tuple(&vpx_fdct32x32_1_msa, VPX_BITS_8))); #endif // HAVE_MSA && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE } // namespace