Skip to content

O
opencv
Commit 5732da95 authored by Anatoly Baksheev's avatar Anatoly Baksheev
Browse files
Options

fixed bug with loading to constant memory

parent 22f5376e
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 4 deletions
modules/gpu/src/cuda/matrix_operations.cu
View file @ 5732da95
...@@ -325,7 +325,12 @@ namespace cv ...@@ -325,7 +325,12 @@ namespace cv
extern "C" void set_to_without_mask(DevMem2D mat, int depth, const double *scalar, int channels, const cudaStream_t & stream) extern "C" void set_to_without_mask(DevMem2D mat, int depth, const double *scalar, int channels, const cudaStream_t & stream)
{ {
cudaSafeCall( cudaMemcpyToSymbol(mat_operators::scalar_d, &scalar, sizeof(double) * 4)); double data[4];
data[0] = scalar[0];
data[1] = scalar[1];
data[2] = scalar[2];
data[3] = scalar[3];
cudaSafeCall( cudaMemcpyToSymbol(mat_operators::scalar_d, &data, sizeof(data)));
static SetToFunc_without_mask tab[8] = static SetToFunc_without_mask tab[8] =
{ {
...@@ -348,9 +353,14 @@ namespace cv ...@@ -348,9 +353,14 @@ namespace cv
} }
extern "C" void set_to_with_mask(DevMem2D mat, int depth, const double *scalar, const DevMem2D& mask, int channels, const cudaStream_t & stream) extern "C" void set_to_with_mask(DevMem2D mat, int depth, const double * scalar, const DevMem2D& mask, int channels, const cudaStream_t & stream)
{ {
cudaSafeCall( cudaMemcpyToSymbol(mat_operators::scalar_d, &scalar, sizeof(double) * 4)); double data[4];
data[0] = scalar[0];
data[1] = scalar[1];
data[2] = scalar[2];
data[3] = scalar[3];
cudaSafeCall( cudaMemcpyToSymbol(mat_operators::scalar_d, &data, sizeof(data)));
static SetToFunc_with_mask tab[8] = static SetToFunc_with_mask tab[8] =
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment