minor changes in gpu performance sample

diff --git a/samples/gpu/performance/performance.cpp b/samples/gpu/performance/performance.cpp
index 01623ff..b9bbc85 100644 (file)
--- a/samples/gpu/performance/performance.cpp
+++ b/samples/gpu/performance/performance.cpp
@@ -6,19 +6,6 @@
 using namespace std;\r
 using namespace cv;\r
 \r
-\r
-void TestSystem::setWorkingDir(const string& val)\r
-{\r
-    working_dir_ = val;\r
-}\r
-\r
-\r
-void TestSystem::setTestFilter(const string& val)\r
-{\r
-    test_filter_ = val;\r
-}\r
-\r
-\r
 void TestSystem::run()\r
 {\r
     // Run test initializers\r

diff --git a/samples/gpu/performance/performance.h b/samples/gpu/performance/performance.h
index 31931e7..2a39664 100644 (file)
--- a/samples/gpu/performance/performance.h
+++ b/samples/gpu/performance/performance.h
@@ -12,8 +12,11 @@
 class Runnable\r
 {\r
 public:\r
-    explicit Runnable(const std::string& name): name_(name) {}\r
-    const std::string& name() const { return name_; }\r
+    explicit Runnable(const std::string& name): name_(name) {}  \r
+    virtual ~Runnable() {}\r
+    \r
+    const std::string& name() const { return name_; }    \r
+    \r
     virtual void run() = 0;\r
 \r
 private:\r
@@ -30,10 +33,10 @@ public:
         return me;\r
     }\r
 \r
-    void setWorkingDir(const std::string& val);\r
+    void setWorkingDir(const std::string& val) { working_dir_ = val; }\r
     const std::string& workingDir() const { return working_dir_; }\r
 \r
-    void setTestFilter(const std::string& val);\r
+    void setTestFilter(const std::string& val) { test_filter_ = val; }\r
     const std::string& testFilter() const { return test_filter_; }\r
 \r
     void addInit(Runnable* init) { inits_.push_back(init); }\r