Skip to content

O
opencv
Commit 7d8bde33 authored by Ilya Lavrenov's avatar Ilya Lavrenov
Browse files
Options

fixed ocl::merge in case of 2 and types CV_32S and CV_32F

parent ff1eb0d5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/ocl/src/opencl/merge_mat.cl
View file @ 7d8bde33
...@@ -204,7 +204,7 @@ __kernel void merge_vector_C2_D4(__global int *mat_dst, int dst_step, int dst_ ...@@ -204,7 +204,7 @@ __kernel void merge_vector_C2_D4(__global int *mat_dst, int dst_step, int dst_
int src0 = *((__global int *)((__global uchar *)mat_src0 + src0_index + (x << 2))); int src0 = *((__global int *)((__global uchar *)mat_src0 + src0_index + (x << 2)));
int src1 = *((__global int *)((__global uchar *)mat_src1 + src1_index + (x << 2))); int src1 = *((__global int *)((__global uchar *)mat_src1 + src1_index + (x << 2)));
*((__global int2 *)((__global uchar *)mat_dst + dst_index + (x << 4))) = (int2)(src0, src1); *((__global int2 *)((__global uchar *)mat_dst + dst_index + (x << 3))) = (int2)(src0, src1);
} }
} }
__kernel void merge_vector_C2_D5(__global float *mat_dst, int dst_step, int dst_offset, __kernel void merge_vector_C2_D5(__global float *mat_dst, int dst_step, int dst_offset,
...@@ -224,7 +224,7 @@ __kernel void merge_vector_C2_D5(__global float *mat_dst, int dst_step, int ds ...@@ -224,7 +224,7 @@ __kernel void merge_vector_C2_D5(__global float *mat_dst, int dst_step, int ds
float src0 = *((__global float *)((__global uchar *)mat_src0 + src0_index + (x << 2))); float src0 = *((__global float *)((__global uchar *)mat_src0 + src0_index + (x << 2)));
float src1 = *((__global float *)((__global uchar *)mat_src1 + src1_index + (x << 2))); float src1 = *((__global float *)((__global uchar *)mat_src1 + src1_index + (x << 2)));
*((__global float2 *)((__global uchar *)mat_dst + dst_index + (x << 4))) = (float2)(src0, src1); *((__global float2 *)((__global uchar *)mat_dst + dst_index + (x << 3))) = (float2)(src0, src1);
} }
} }
......
modules/ocl/test/test_split_merge.cpp
View file @ 7d8bde33
This diff is collapsed.
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