Skip to content

O
opencv
Commit 119b7a29 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #933 from pengx17:2.4_macfix_cont

parents 2d88f20c fdc133d8
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
modules/ocl/src/opencl/pyr_up.cl
View file @ 119b7a29
...@@ -389,8 +389,8 @@ __kernel void pyrUp_C4_D0(__global uchar4* src,__global uchar4* dst, ...@@ -389,8 +389,8 @@ __kernel void pyrUp_C4_D0(__global uchar4* src,__global uchar4* dst,
float4 sum = (float4)(0,0,0,0); float4 sum = (float4)(0,0,0,0);
const int evenFlag = (int)((tidx & 1) == 0); const float4 evenFlag = (float4)((tidx & 1) == 0);
const int oddFlag = (int)((tidx & 1) != 0); const float4 oddFlag = (float4)((tidx & 1) != 0);
const bool eveny = ((tidy & 1) == 0); const bool eveny = ((tidy & 1) == 0);
float4 co1 = (float4)(0.375f, 0.375f, 0.375f, 0.375f); float4 co1 = (float4)(0.375f, 0.375f, 0.375f, 0.375f);
...@@ -455,6 +455,7 @@ __kernel void pyrUp_C4_D0(__global uchar4* src,__global uchar4* dst, ...@@ -455,6 +455,7 @@ __kernel void pyrUp_C4_D0(__global uchar4* src,__global uchar4* dst,
dst[x + y * dstStep] = convert_uchar4_sat_rte(4.0f * sum); dst[x + y * dstStep] = convert_uchar4_sat_rte(4.0f * sum);
} }
} }
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
////////////////////////// CV_16UC4 ////////////////////////////////// ////////////////////////// CV_16UC4 //////////////////////////////////
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
...@@ -492,8 +493,8 @@ __kernel void pyrUp_C4_D2(__global ushort4* src,__global ushort4* dst, ...@@ -492,8 +493,8 @@ __kernel void pyrUp_C4_D2(__global ushort4* src,__global ushort4* dst,
float4 sum = (float4)(0,0,0,0); float4 sum = (float4)(0,0,0,0);
const int evenFlag = (int)((get_local_id(0) & 1) == 0); const float4 evenFlag = (float4)((get_local_id(0) & 1) == 0);
const int oddFlag = (int)((get_local_id(0) & 1) != 0); const float4 oddFlag = (float4)((get_local_id(0) & 1) != 0);
const bool eveny = ((get_local_id(1) & 1) == 0); const bool eveny = ((get_local_id(1) & 1) == 0);
const int tidx = get_local_id(0); const int tidx = get_local_id(0);
...@@ -604,8 +605,8 @@ __kernel void pyrUp_C4_D5(__global float4* src,__global float4* dst, ...@@ -604,8 +605,8 @@ __kernel void pyrUp_C4_D5(__global float4* src,__global float4* dst,
float4 sum = (float4)(0,0,0,0); float4 sum = (float4)(0,0,0,0);
const int evenFlag = (int)((tidx & 1) == 0); const float4 evenFlag = (float4)((tidx & 1) == 0);
const int oddFlag = (int)((tidx & 1) != 0); const float4 oddFlag = (float4)((tidx & 1) != 0);
const bool eveny = ((tidy & 1) == 0); const bool eveny = ((tidy & 1) == 0);
float4 co1 = (float4)(0.375f, 0.375f, 0.375f, 0.375f); float4 co1 = (float4)(0.375f, 0.375f, 0.375f, 0.375f);
...@@ -669,4 +670,4 @@ __kernel void pyrUp_C4_D5(__global float4* src,__global float4* dst, ...@@ -669,4 +670,4 @@ __kernel void pyrUp_C4_D5(__global float4* src,__global float4* dst,
{ {
dst[x + y * dstStep] = 4.0f * sum; dst[x + y * dstStep] = 4.0f * sum;
} }
} }
\ No newline at end of file
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