From 33f7307e9ee09b80e08992a73b9db9729cd3c52d Mon Sep 17 00:00:00 2001
From: Anatoly Baksheev <no@email>
Date: Fri, 18 Feb 2011 16:39:50 +0000
Subject: [PATCH] added test data for NVidia's FD tests

---
 modules/gpu/test/nvidia/main_nvidia.cpp | 24 ++++++++++++++----------
 modules/gpu/test/test_nvidia.cpp        |  8 +++++---
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/modules/gpu/test/nvidia/main_nvidia.cpp b/modules/gpu/test/nvidia/main_nvidia.cpp
index 8e31b2d39a..f2fbcfaf6f 100644
--- a/modules/gpu/test/nvidia/main_nvidia.cpp
+++ b/modules/gpu/test/nvidia/main_nvidia.cpp
@@ -21,6 +21,8 @@
 #include "NCVAutoTestLister.hpp"
 #include "NCVTestSourceProvider.hpp"
 
+static std::string path;
+
 
 template <class T_in, class T_out>
 void generateIntegralTests(NCVAutoTestLister &testLister, NCVTestSourceProvider<T_in> &src,
@@ -252,11 +254,11 @@ void generateHypothesesFiltrationTests(NCVAutoTestLister &testLister, NCVTestSou
 
 void generateHaarLoaderTests(NCVAutoTestLister &testLister)
 {
-    testLister.add(new TestHaarCascadeLoader("haarcascade_eye.xml", "haarcascade_eye.xml"));
-    testLister.add(new TestHaarCascadeLoader("haarcascade_frontalface_alt.xml", "haarcascade_frontalface_alt.xml"));
-    testLister.add(new TestHaarCascadeLoader("haarcascade_frontalface_alt2.xml", "haarcascade_frontalface_alt2.xml"));
-    testLister.add(new TestHaarCascadeLoader("haarcascade_frontalface_alt_tree.xml", "haarcascade_frontalface_alt_tree.xml"));
-    testLister.add(new TestHaarCascadeLoader("haarcascade_eye_tree_eyeglasses.xml", "haarcascade_eye_tree_eyeglasses.xml"));
+    testLister.add(new TestHaarCascadeLoader("haarcascade_eye.xml", path + "haarcascade_eye.xml"));
+    testLister.add(new TestHaarCascadeLoader("haarcascade_frontalface_alt.xml", path + "haarcascade_frontalface_alt.xml"));
+    testLister.add(new TestHaarCascadeLoader("haarcascade_frontalface_alt2.xml", path + "haarcascade_frontalface_alt2.xml"));
+    testLister.add(new TestHaarCascadeLoader("haarcascade_frontalface_alt_tree.xml", path + "haarcascade_frontalface_alt_tree.xml"));
+    testLister.add(new TestHaarCascadeLoader("haarcascade_eye_tree_eyeglasses.xml", path + "haarcascade_eye_tree_eyeglasses.xml"));
 }
 
 
@@ -269,7 +271,7 @@ void generateHaarApplicationTests(NCVAutoTestLister &testLister, NCVTestSourcePr
         {
             char testName[80];
             sprintf(testName, "HaarAppl%d_%d", i, j);
-            testLister.add(new TestHaarCascadeApplication(testName, src, "haarcascade_frontalface_alt.xml", j, i));
+            testLister.add(new TestHaarCascadeApplication(testName, src, path + "haarcascade_frontalface_alt.xml", j, i));
         }
     }
     for (Ncv32f _i=20.0; _i<maxWidth; _i*=1.1f)
@@ -277,18 +279,20 @@ void generateHaarApplicationTests(NCVAutoTestLister &testLister, NCVTestSourcePr
         Ncv32u i = (Ncv32u)_i;
         char testName[80];
         sprintf(testName, "HaarAppl%d", i);
-        testLister.add(new TestHaarCascadeApplication(testName, src, "haarcascade_frontalface_alt.xml", i, i));
+        testLister.add(new TestHaarCascadeApplication(testName, src, path + "haarcascade_frontalface_alt.xml", i, i));
     }
 }
 
-
 static void devNullOutput(const char *msg)
 {
+
 }
 
 
-bool main_nvidia()
+bool main_nvidia(const std::string& test_data_path)
 {
+	path = test_data_path;
+
     printf("Testing NVIDIA Computer Vision SDK\n");
     printf("==================================\n");
 
@@ -311,7 +315,7 @@ bool main_nvidia()
     NCVTestSourceProvider<Ncv32u> testSrcRandom_32u(2010, 0, 0xFFFFFFFF, 4096, 4096);
     NCVTestSourceProvider<Ncv8u> testSrcRandom_8u(2010, 0, 255, 4096, 4096);
     NCVTestSourceProvider<Ncv64u> testSrcRandom_64u(2010, 0, 0xFFFFFFFFFFFFFFFF, 4096, 4096);
-    NCVTestSourceProvider<Ncv8u> testSrcFacesVGA_8u("../../data/group_1_640x480_VGA.pgm");
+    NCVTestSourceProvider<Ncv8u> testSrcFacesVGA_8u(path + "group_1_640x480_VGA.pgm");
     NCVTestSourceProvider<Ncv32f> testSrcRandom_32f(2010, -1.0f, 1.0f, 4096, 4096);
 
     printf("Generating NPPST test suites\n");
diff --git a/modules/gpu/test/test_nvidia.cpp b/modules/gpu/test/test_nvidia.cpp
index 6e76b576d2..412e5fcaa8 100644
--- a/modules/gpu/test/test_nvidia.cpp
+++ b/modules/gpu/test/test_nvidia.cpp
@@ -51,12 +51,14 @@ public:
 protected:
     
 	void run( int )
-	{   		
+	{   
+		;
+
 #if defined(HAVE_CUDA)
-		bool main_nvidia();
+		bool main_nvidia(const std::string&);
 
 		// Invoke all NVIDIA Staging tests and obtain the result
-		bool passed = main_nvidia();
+		bool passed = main_nvidia(std::string(ts->get_data_path()) + "haarcascade/");
 
 		if (passed)
 		    ts->set_failed_test_info(cvtest::TS::OK);
-- 
2.34.1