From b8b3dd91de267035ca29240b684f6fc1d1e07cc3 Mon Sep 17 00:00:00 2001 From: James Zern Date: Wed, 16 Jul 2014 18:55:40 -0700 Subject: [PATCH] fdct4x4_test: drop '_t' from local typenames _t is reserved by posix + switch to camelcase http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Type_Names Change-Id: I796252a6f7f749b4faa969bbe7fe83eae64fa393 --- test/fdct4x4_test.cc | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/test/fdct4x4_test.cc b/test/fdct4x4_test.cc index ab636bf29..bea19f188 100644 --- a/test/fdct4x4_test.cc +++ b/test/fdct4x4_test.cc @@ -30,15 +30,15 @@ using libvpx_test::ACMRandom; namespace { const int kNumCoeffs = 16; -typedef void (*fdct_t)(const int16_t *in, int16_t *out, int stride); -typedef void (*idct_t)(const int16_t *in, uint8_t *out, int stride); -typedef void (*fht_t) (const int16_t *in, int16_t *out, int stride, - int tx_type); -typedef void (*iht_t) (const int16_t *in, uint8_t *out, int stride, - int tx_type); +typedef void (*FdctFunc)(const int16_t *in, int16_t *out, int stride); +typedef void (*IdctFunc)(const int16_t *in, uint8_t *out, int stride); +typedef void (*FhtFunc)(const int16_t *in, int16_t *out, int stride, + int tx_type); +typedef void (*IhtFunc)(const int16_t *in, uint8_t *out, int stride, + int tx_type); -typedef std::tr1::tuple dct_4x4_param_t; -typedef std::tr1::tuple ht_4x4_param_t; +typedef std::tr1::tuple Dct4x4Param; +typedef std::tr1::tuple Ht4x4Param; void fdct4x4_ref(const int16_t *in, int16_t *out, int stride, int tx_type) { vp9_fdct4x4_c(in, out, stride); @@ -189,12 +189,12 @@ class Trans4x4TestBase { int pitch_; int tx_type_; - fht_t fwd_txfm_ref; + FhtFunc fwd_txfm_ref; }; class Trans4x4DCT : public Trans4x4TestBase, - public ::testing::TestWithParam { + public ::testing::TestWithParam { public: virtual ~Trans4x4DCT() {} @@ -215,8 +215,8 @@ class Trans4x4DCT inv_txfm_(out, dst, stride); } - fdct_t fwd_txfm_; - idct_t inv_txfm_; + FdctFunc fwd_txfm_; + IdctFunc inv_txfm_; }; TEST_P(Trans4x4DCT, AccuracyCheck) { @@ -237,7 +237,7 @@ TEST_P(Trans4x4DCT, InvAccuracyCheck) { class Trans4x4HT : public Trans4x4TestBase, - public ::testing::TestWithParam { + public ::testing::TestWithParam { public: virtual ~Trans4x4HT() {} @@ -259,8 +259,8 @@ class Trans4x4HT inv_txfm_(out, dst, stride, tx_type_); } - fht_t fwd_txfm_; - iht_t inv_txfm_; + FhtFunc fwd_txfm_; + IhtFunc inv_txfm_; }; TEST_P(Trans4x4HT, AccuracyCheck) { @@ -281,7 +281,7 @@ TEST_P(Trans4x4HT, InvAccuracyCheck) { class Trans4x4WHT : public Trans4x4TestBase, - public ::testing::TestWithParam { + public ::testing::TestWithParam { public: virtual ~Trans4x4WHT() {} @@ -302,8 +302,8 @@ class Trans4x4WHT inv_txfm_(out, dst, stride); } - fdct_t fwd_txfm_; - idct_t inv_txfm_; + FdctFunc fwd_txfm_; + IdctFunc inv_txfm_; }; TEST_P(Trans4x4WHT, AccuracyCheck) {