generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1417 from ilya-lavrenov:merge_fix

Browse Source
This commit is contained in:
Roman Donchenko
2013-09-10 11:33:24 +04:00
committed by OpenCV Buildbot
parent 68901ab471 7d8bde3330
commit 747f7178ca
2 changed files with 96 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ocl/src/opencl/merge_mat.cl
View File

@@ -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 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,
@@ -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 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);
}
}