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

rewrite cuda::cvtColor with new device layer and fix test failures

Browse Source
This commit is contained in:
Vladislav Vinogradov
2014-12-25 11:46:35 +03:00
parent 1bdd86edeb
commit 9b8c3fd675
5 changed files with 834 additions and 991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/cudev/include/opencv2/cudev/functional/detail/color_cvt.hpp
View File

@@ -156,7 +156,7 @@ namespace color_cvt_detail
const int g = src.y;
const int r = bidx == 0 ? src.z : src.x;
const int a = src.w;
return (ushort) ((b >> 3) | ((g & ~7) << 2) | ((r & ~7) << 7) | (a * 0x8000));
return (ushort) ((b >> 3) | ((g & ~7) << 2) | ((r & ~7) << 7) | (a ? 0x8000 : 0));
}
};
@@ -263,7 +263,8 @@ namespace color_cvt_detail
{
__device__ ushort operator ()(uchar src) const
{
return (ushort) (src | (src << 5) | (src << 10));
const int t = src >> 3;
return (ushort)(t | (t << 5) | (t << 10));
}
};
@@ -272,7 +273,8 @@ namespace color_cvt_detail
{
__device__ ushort operator ()(uchar src) const
{
return (ushort) ((src >> 3) | ((src & ~3) << 3) | ((src & ~7) << 8));
const int t = src;
return (ushort)((t >> 3) | ((t & ~3) << 3) | ((t & ~7) << 8));
}
};
@@ -1227,6 +1229,10 @@ namespace color_cvt_detail
float G = -0.969256f * X + 1.875991f * Y + 0.041556f * Z;
float R = 3.240479f * X - 1.537150f * Y - 0.498535f * Z;
R = ::fminf(::fmaxf(R, 0.f), 1.f);
G = ::fminf(::fmaxf(G, 0.f), 1.f);
B = ::fminf(::fmaxf(B, 0.f), 1.f);
if (srgb)
{
B = splineInterpolate(B * GAMMA_TAB_SIZE, c_sRGBInvGammaTab, GAMMA_TAB_SIZE);