From 3c0cc087d6d96db53cbd595aa223f6cd50cec21d Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Wed, 24 Nov 2010 08:39:52 +0000 Subject: [PATCH] fixed bug in StereoConstantSpaceBP - missing load max_data_term to constant memory --- modules/gpu/src/cuda/constantspacebp.cu | 1 + tests/gpu/src/gputest_main.cpp | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/gpu/src/cuda/constantspacebp.cu b/modules/gpu/src/cuda/constantspacebp.cu index 7c9e91a..1287f80 100644 --- a/modules/gpu/src/cuda/constantspacebp.cu +++ b/modules/gpu/src/cuda/constantspacebp.cu @@ -96,6 +96,7 @@ namespace cv { namespace gpu { namespace csbp { cudaSafeCall( cudaMemcpyToSymbol(cndisp, &ndisp, sizeof(int)) ); + cudaSafeCall( cudaMemcpyToSymbol(cmax_data_term, &max_data_term, sizeof(float)) ); cudaSafeCall( cudaMemcpyToSymbol(cdata_weight, &data_weight, sizeof(float)) ); cudaSafeCall( cudaMemcpyToSymbol(cmax_disc_term, &max_disc_term, sizeof(float)) ); cudaSafeCall( cudaMemcpyToSymbol(cdisc_single_jump, &disc_single_jump, sizeof(float)) ); diff --git a/tests/gpu/src/gputest_main.cpp b/tests/gpu/src/gputest_main.cpp index 54046d7..f608de8 100644 --- a/tests/gpu/src/gputest_main.cpp +++ b/tests/gpu/src/gputest_main.cpp @@ -49,12 +49,8 @@ const char* blacklist[] = "GPU-NppImageSum", // crash, probably npp bug "GPU-NppImageMinNax", // npp bug - don't find min/max near right border - "GPU-NppImageExp", - "GPU-NppImageLog", "GPU-NppImageCanny", // NPP_TEXTURE_BIND_ERROR - "GPU-NppImageIntegral", - "GPU-Histograms", 0 }; -- 2.7.4