added test data for NVidia's FD tests

diff --git a/modules/gpu/test/nvidia/main_nvidia.cpp b/modules/gpu/test/nvidia/main_nvidia.cpp
index 8e31b2d..f2fbcfa 100644 (file)
--- a/modules/gpu/test/nvidia/main_nvidia.cpp
+++ b/modules/gpu/test/nvidia/main_nvidia.cpp
@@ -21,6 +21,8 @@
 #include "NCVAutoTestLister.hpp"\r
 #include "NCVTestSourceProvider.hpp"\r
 \r
+static std::string path;\r
+\r
 \r
 template <class T_in, class T_out>\r
 void generateIntegralTests(NCVAutoTestLister &testLister, NCVTestSourceProvider<T_in> &src,\r
@@ -252,11 +254,11 @@ void generateHypothesesFiltrationTests(NCVAutoTestLister &testLister, NCVTestSou
 \r
 void generateHaarLoaderTests(NCVAutoTestLister &testLister)\r
 {\r
-    testLister.add(new TestHaarCascadeLoader("haarcascade_eye.xml", "haarcascade_eye.xml"));\r
-    testLister.add(new TestHaarCascadeLoader("haarcascade_frontalface_alt.xml", "haarcascade_frontalface_alt.xml"));\r
-    testLister.add(new TestHaarCascadeLoader("haarcascade_frontalface_alt2.xml", "haarcascade_frontalface_alt2.xml"));\r
-    testLister.add(new TestHaarCascadeLoader("haarcascade_frontalface_alt_tree.xml", "haarcascade_frontalface_alt_tree.xml"));\r
-    testLister.add(new TestHaarCascadeLoader("haarcascade_eye_tree_eyeglasses.xml", "haarcascade_eye_tree_eyeglasses.xml"));\r
+    testLister.add(new TestHaarCascadeLoader("haarcascade_eye.xml", path + "haarcascade_eye.xml"));\r
+    testLister.add(new TestHaarCascadeLoader("haarcascade_frontalface_alt.xml", path + "haarcascade_frontalface_alt.xml"));\r
+    testLister.add(new TestHaarCascadeLoader("haarcascade_frontalface_alt2.xml", path + "haarcascade_frontalface_alt2.xml"));\r
+    testLister.add(new TestHaarCascadeLoader("haarcascade_frontalface_alt_tree.xml", path + "haarcascade_frontalface_alt_tree.xml"));\r
+    testLister.add(new TestHaarCascadeLoader("haarcascade_eye_tree_eyeglasses.xml", path + "haarcascade_eye_tree_eyeglasses.xml"));\r
 }\r
 \r
 \r
@@ -269,7 +271,7 @@ void generateHaarApplicationTests(NCVAutoTestLister &testLister, NCVTestSourcePr
         {\r
             char testName[80];\r
             sprintf(testName, "HaarAppl%d_%d", i, j);\r
-            testLister.add(new TestHaarCascadeApplication(testName, src, "haarcascade_frontalface_alt.xml", j, i));\r
+            testLister.add(new TestHaarCascadeApplication(testName, src, path + "haarcascade_frontalface_alt.xml", j, i));\r
         }\r
     }\r
     for (Ncv32f _i=20.0; _i<maxWidth; _i*=1.1f)\r
@@ -277,18 +279,20 @@ void generateHaarApplicationTests(NCVAutoTestLister &testLister, NCVTestSourcePr
         Ncv32u i = (Ncv32u)_i;\r
         char testName[80];\r
         sprintf(testName, "HaarAppl%d", i);\r
-        testLister.add(new TestHaarCascadeApplication(testName, src, "haarcascade_frontalface_alt.xml", i, i));\r
+        testLister.add(new TestHaarCascadeApplication(testName, src, path + "haarcascade_frontalface_alt.xml", i, i));\r
     }\r
 }\r
 \r
-\r
 static void devNullOutput(const char *msg)\r
 {\r
+\r
 }\r
 \r
 \r
-bool main_nvidia()\r
+bool main_nvidia(const std::string& test_data_path)\r
 {\r
+       path = test_data_path;\r
+\r
     printf("Testing NVIDIA Computer Vision SDK\n");\r
     printf("==================================\n");\r
 \r
@@ -311,7 +315,7 @@ bool main_nvidia()
     NCVTestSourceProvider<Ncv32u> testSrcRandom_32u(2010, 0, 0xFFFFFFFF, 4096, 4096);\r
     NCVTestSourceProvider<Ncv8u> testSrcRandom_8u(2010, 0, 255, 4096, 4096);\r
     NCVTestSourceProvider<Ncv64u> testSrcRandom_64u(2010, 0, 0xFFFFFFFFFFFFFFFF, 4096, 4096);\r
-    NCVTestSourceProvider<Ncv8u> testSrcFacesVGA_8u("../../data/group_1_640x480_VGA.pgm");\r
+    NCVTestSourceProvider<Ncv8u> testSrcFacesVGA_8u(path + "group_1_640x480_VGA.pgm");\r
     NCVTestSourceProvider<Ncv32f> testSrcRandom_32f(2010, -1.0f, 1.0f, 4096, 4096);\r
 \r
     printf("Generating NPPST test suites\n");\r

diff --git a/modules/gpu/test/test_nvidia.cpp b/modules/gpu/test/test_nvidia.cpp
index 6e76b57..412e5fc 100644 (file)
--- a/modules/gpu/test/test_nvidia.cpp
+++ b/modules/gpu/test/test_nvidia.cpp
@@ -51,12 +51,14 @@ public:
 protected:\r
     \r
        void run( int )\r
-       {               \r
+       {   \r
+               ;\r
+\r
 #if defined(HAVE_CUDA)\r
-               bool main_nvidia();\r
+               bool main_nvidia(const std::string&);\r
 \r
                // Invoke all NVIDIA Staging tests and obtain the result\r
-               bool passed = main_nvidia();\r
+               bool passed = main_nvidia(std::string(ts->get_data_path()) + "haarcascade/");\r
 \r
                if (passed)\r
                    ts->set_failed_test_info(cvtest::TS::OK);\r