merged bug fix from r8174 (GPU_NVidia/NCV.Visualization test)

13 years ago · e467ece19c
parent 916d07cf2c
commit e467ece19c
2 changed files with 29 additions and 29 deletions
--- a/modules/gpu/test/nvidia/main_nvidia.cpp
+++ b/modules/gpu/test/nvidia/main_nvidia.cpp
@ -440,7 +440,7 @@ bool nvidia_NCV_Visualization(const std::string& test_data_path, OutputLevel out
    NCVAutoTestLister testListerVisualize("Visualization", outputLevel);

    NCVTestSourceProvider<Ncv8u> testSrcRandom_8u(2010, 0, 255, 4096, 4096);
-    NCVTestSourceProvider<Ncv32u> testSrcRandom_32u(2010, 0, 0xFFFFFFFF, 4096, 4096);
+    NCVTestSourceProvider<Ncv32u> testSrcRandom_32u(2010, 0, RAND_MAX, 4096, 4096);

    generateDrawRectsTests(testListerVisualize, testSrcRandom_8u, testSrcRandom_32u, 4096, 4096);
    generateDrawRectsTests(testListerVisualize, testSrcRandom_32u, testSrcRandom_32u, 4096, 4096);
--- a/modules/gpu/test/test_nvidia.cpp
+++ b/modules/gpu/test/test_nvidia.cpp
@ -156,7 +156,7 @@ TEST_P(NCV, HypothesesFiltration)
    ASSERT_TRUE(res);
 }

-TEST_P(NCV, DISABLED_Visualization)
+TEST_P(NCV, Visualization)
 {
    // this functionality doesn't used in gpu module
    bool res = nvidia_NCV_Visualization(path, nvidiaTestOutputLevel);