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

Change min-max to clamp

Browse Source
This commit is contained in:
VBystricky 2014-08-01 19:45:11 +04:00
parent b724208510
commit 0f9b79ef64
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/imgproc/src/opencl/cvtcolor.cl
View File

@ -1796,9 +1796,9 @@ __kernel void Luv2BGR(__global const uchar * srcptr, int src_step, int src_offse
float G = fma(X, coeffs[3], fma(Y, coeffs[4], Z * coeffs[5])); float G = fma(X, coeffs[3], fma(Y, coeffs[4], Z * coeffs[5]));
float B = fma(X, coeffs[6], fma(Y, coeffs[7], Z * coeffs[8])); float B = fma(X, coeffs[6], fma(Y, coeffs[7], Z * coeffs[8]));
R = min(max(R, 0.f), 1.f); R = clamp(R, 0.f, 1.f);
G = min(max(G, 0.f), 1.f); G = clamp(G, 0.f, 1.f);
B = min(max(B, 0.f), 1.f); B = clamp(B, 0.f, 1.f);
#ifdef SRGB #ifdef SRGB
R = splineInterpolate(R*GammaTabScale, gammaTab, GAMMA_TAB_SIZE); R = splineInterpolate(R*GammaTabScale, gammaTab, GAMMA_TAB_SIZE);
@ -1857,9 +1857,9 @@ __kernel void Luv2BGR(__global const uchar * src, int src_step, int src_offset,
float G = fma(X, coeffs[3], fma(Y, coeffs[4], Z * coeffs[5])); float G = fma(X, coeffs[3], fma(Y, coeffs[4], Z * coeffs[5]));
float B = fma(X, coeffs[6], fma(Y, coeffs[7], Z * coeffs[8])); float B = fma(X, coeffs[6], fma(Y, coeffs[7], Z * coeffs[8]));
R = min(max(R, 0.f), 1.f); R = clamp(R, 0.f, 1.f);
G = min(max(G, 0.f), 1.f); G = clamp(G, 0.f, 1.f);
B = min(max(B, 0.f), 1.f); B = clamp(B, 0.f, 1.f);
#ifdef SRGB #ifdef SRGB
R = splineInterpolate(R*GammaTabScale, gammaTab, GAMMA_TAB_SIZE); R = splineInterpolate(R*GammaTabScale, gammaTab, GAMMA_TAB_SIZE);