shithub: libvpx

Download patch

ref: 8e9c9f118cda45013f14cce7961dcc8df78ffebf
parent: 03d75182f7d345b54ceec3ac32df887af8a02d82
parent: 9d7080e9f6bba3e840a98e5d9b73c538e30b5f05
author: Tom Finegan <tomfinegan@google.com>
date: Thu Mar 20 11:17:48 EDT 2014 

Merge "intrapred_test: fix inheritance"


--- a/test/intrapred_test.cc
+++ b/test/intrapred_test.cc
@@ -26,12 +26,8 @@
 
 class IntraPredBase {
  public:
-  virtual ~IntraPredBase() {}
+  virtual ~IntraPredBase() { libvpx_test::ClearSystemState(); }
 
-  virtual void TearDown() {
-    libvpx_test::ClearSystemState();
-  }
-
  protected:
   void SetupMacroblock(MACROBLOCKD *mbptr,
                        MODE_INFO *miptr,
@@ -227,8 +223,9 @@
                                   uint8_t *ypred_ptr,
                                   int y_stride);
 
-class IntraPredYTest : public ::testing::TestWithParam<intra_pred_y_fn_t>,
-    protected IntraPredBase {
+class IntraPredYTest
+    : public IntraPredBase,
+      public ::testing::TestWithParam<intra_pred_y_fn_t> {
  public:
   static void SetUpTestCase() {
     mb_ = reinterpret_cast<MACROBLOCKD*>(
@@ -308,8 +305,9 @@
                                    uint8_t *vpred_ptr,
                                    int pred_stride);
 
-class IntraPredUVTest : public ::testing::TestWithParam<intra_pred_uv_fn_t>,
-    protected IntraPredBase {
+class IntraPredUVTest
+    : public IntraPredBase,
+      public ::testing::TestWithParam<intra_pred_uv_fn_t> {
  public:
   static void SetUpTestCase() {
     mb_ = reinterpret_cast<MACROBLOCKD*>(
-- 
⑨